From a4a55ce2b3d7026323a3e16e5a612672309195a8 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 13 Feb 2022 11:38:43 -0500 Subject: [PATCH] Renamed unknown_09F8F0 to game_ui & unknown_06B2B0 to game --- .../{unknown_06B2B0 => game}/func_8006A6B0.s | 0 .../{unknown_06B2B0 => game}/func_8006AC00.s | 0 .../{unknown_06B2B0 => game}/func_8006AE2C.s | 0 .../{unknown_06B2B0 => game}/func_8006CCF0.s | 0 .../{unknown_06B2B0 => game}/func_8006DCF8.s | 0 .../{unknown_06B2B0 => game}/func_8006ECFC.s | 0 .../{unknown_06B2B0 => game}/func_8006EFDC.s | 0 .../{unknown_06B2B0 => game}/load_level.s | 0 .../func_8009ECF0.s | 0 .../func_8009F034.s | 0 .../func_800A003C.s | 0 .../func_800A01A0.s | 0 .../func_800A0BD4.s | 0 .../func_800A0EB4.s | 0 .../func_800A1248.s | 0 .../func_800A14F0.s | 0 .../func_800A19A4.s | 0 .../func_800A1C04.s | 0 .../func_800A1E48.s | 0 .../func_800A22F4.s | 0 .../func_800A277C.s | 0 .../func_800A36CC.s | 0 .../func_800A3884.s | 0 .../func_800A3CE4.s | 0 .../func_800A4154.s | 0 .../func_800A45F0.s | 0 .../func_800A47A0.s | 0 .../func_800A497C.s | 0 .../func_800A4C44.s | 0 .../func_800A4F50.s | 0 .../func_800A5A64.s | 0 .../func_800A5F18.s | 0 .../func_800A6254.s | 0 .../func_800A6E30.s | 0 .../func_800A718C.s | 0 .../func_800A7520.s | 0 .../func_800A7A60.s | 0 .../func_800A7B68.s | 0 .../func_800A7FBC.s | 0 .../func_800A8474.s | 0 .../func_800AA3EC.s | 0 .../func_800AA600.s | 0 .../func_800AAFD0.s | 0 .../func_800AB1F0.s | 0 .../func_800AB35C.s | 0 .../func_800AB4A8.s | 0 .../func_800ABB34.s | 0 .../func_800ABC5C.s | 0 .../func_800ABE68.s | 0 .../func_800AC0C8.s | 0 .../func_800AC21C.s | 0 .../func_800AC5A4.s | 0 .../func_800AC8A8.s | 0 .../func_800ACA20.s | 0 .../func_800AD030.s | 0 .../func_800AD144.s | 0 .../func_800AD658.s | 0 .../func_800ADCBC.s | 0 include/level_object_entries.h | 2 +- src/camera.c | 2 +- src/controller_pak.c | 2 +- src/{unknown_06B2B0.c => game.c} | 18 ++--- src/{unknown_06B2B0.h => game.h} | 0 src/game_text.c | 2 +- src/{unknown_09F8F0.c => game_ui.c} | 74 +++++++++---------- src/{unknown_09F8F0.h => game_ui.h} | 0 src/main.c | 2 +- src/menu.c | 2 +- src/object_functions.c | 4 +- src/racer.c | 2 +- src/thread0_epc.c | 2 +- src/thread30.c | 2 +- src/unknown_00BC20.c | 2 +- src/unknown_0255E0.c | 2 +- src/unknown_0ABDF0.c | 30 ++++---- 75 files changed, 74 insertions(+), 74 deletions(-) rename asm/non_matchings/{unknown_06B2B0 => game}/func_8006A6B0.s (100%) rename asm/non_matchings/{unknown_06B2B0 => game}/func_8006AC00.s (100%) rename asm/non_matchings/{unknown_06B2B0 => game}/func_8006AE2C.s (100%) rename asm/non_matchings/{unknown_06B2B0 => game}/func_8006CCF0.s (100%) rename asm/non_matchings/{unknown_06B2B0 => game}/func_8006DCF8.s (100%) rename asm/non_matchings/{unknown_06B2B0 => game}/func_8006ECFC.s (100%) rename asm/non_matchings/{unknown_06B2B0 => game}/func_8006EFDC.s (100%) rename asm/non_matchings/{unknown_06B2B0 => game}/load_level.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_8009ECF0.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_8009F034.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A003C.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A01A0.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A0BD4.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A0EB4.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A1248.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A14F0.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A19A4.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A1C04.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A1E48.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A22F4.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A277C.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A36CC.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A3884.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A3CE4.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A4154.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A45F0.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A47A0.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A497C.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A4C44.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A4F50.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A5A64.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A5F18.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A6254.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A6E30.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A718C.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A7520.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A7A60.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A7B68.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A7FBC.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800A8474.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AA3EC.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AA600.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AAFD0.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AB1F0.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AB35C.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AB4A8.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800ABB34.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800ABC5C.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800ABE68.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AC0C8.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AC21C.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AC5A4.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AC8A8.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800ACA20.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AD030.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AD144.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800AD658.s (100%) rename asm/non_matchings/{unknown_09F8F0 => game_ui}/func_800ADCBC.s (100%) rename src/{unknown_06B2B0.c => game.c} (99%) rename src/{unknown_06B2B0.h => game.h} (100%) rename src/{unknown_09F8F0.c => game_ui.c} (83%) rename src/{unknown_09F8F0.h => game_ui.h} (100%) diff --git a/asm/non_matchings/unknown_06B2B0/func_8006A6B0.s b/asm/non_matchings/game/func_8006A6B0.s similarity index 100% rename from asm/non_matchings/unknown_06B2B0/func_8006A6B0.s rename to asm/non_matchings/game/func_8006A6B0.s diff --git a/asm/non_matchings/unknown_06B2B0/func_8006AC00.s b/asm/non_matchings/game/func_8006AC00.s similarity index 100% rename from asm/non_matchings/unknown_06B2B0/func_8006AC00.s rename to asm/non_matchings/game/func_8006AC00.s diff --git a/asm/non_matchings/unknown_06B2B0/func_8006AE2C.s b/asm/non_matchings/game/func_8006AE2C.s similarity index 100% rename from asm/non_matchings/unknown_06B2B0/func_8006AE2C.s rename to asm/non_matchings/game/func_8006AE2C.s diff --git a/asm/non_matchings/unknown_06B2B0/func_8006CCF0.s b/asm/non_matchings/game/func_8006CCF0.s similarity index 100% rename from asm/non_matchings/unknown_06B2B0/func_8006CCF0.s rename to asm/non_matchings/game/func_8006CCF0.s diff --git a/asm/non_matchings/unknown_06B2B0/func_8006DCF8.s b/asm/non_matchings/game/func_8006DCF8.s similarity index 100% rename from asm/non_matchings/unknown_06B2B0/func_8006DCF8.s rename to asm/non_matchings/game/func_8006DCF8.s diff --git a/asm/non_matchings/unknown_06B2B0/func_8006ECFC.s b/asm/non_matchings/game/func_8006ECFC.s similarity index 100% rename from asm/non_matchings/unknown_06B2B0/func_8006ECFC.s rename to asm/non_matchings/game/func_8006ECFC.s diff --git a/asm/non_matchings/unknown_06B2B0/func_8006EFDC.s b/asm/non_matchings/game/func_8006EFDC.s similarity index 100% rename from asm/non_matchings/unknown_06B2B0/func_8006EFDC.s rename to asm/non_matchings/game/func_8006EFDC.s diff --git a/asm/non_matchings/unknown_06B2B0/load_level.s b/asm/non_matchings/game/load_level.s similarity index 100% rename from asm/non_matchings/unknown_06B2B0/load_level.s rename to asm/non_matchings/game/load_level.s diff --git a/asm/non_matchings/unknown_09F8F0/func_8009ECF0.s b/asm/non_matchings/game_ui/func_8009ECF0.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_8009ECF0.s rename to asm/non_matchings/game_ui/func_8009ECF0.s diff --git a/asm/non_matchings/unknown_09F8F0/func_8009F034.s b/asm/non_matchings/game_ui/func_8009F034.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_8009F034.s rename to asm/non_matchings/game_ui/func_8009F034.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A003C.s b/asm/non_matchings/game_ui/func_800A003C.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A003C.s rename to asm/non_matchings/game_ui/func_800A003C.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s b/asm/non_matchings/game_ui/func_800A01A0.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A01A0.s rename to asm/non_matchings/game_ui/func_800A01A0.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s b/asm/non_matchings/game_ui/func_800A0BD4.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A0BD4.s rename to asm/non_matchings/game_ui/func_800A0BD4.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s b/asm/non_matchings/game_ui/func_800A0EB4.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A0EB4.s rename to asm/non_matchings/game_ui/func_800A0EB4.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1248.s b/asm/non_matchings/game_ui/func_800A1248.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A1248.s rename to asm/non_matchings/game_ui/func_800A1248.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s b/asm/non_matchings/game_ui/func_800A14F0.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A14F0.s rename to asm/non_matchings/game_ui/func_800A14F0.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A19A4.s b/asm/non_matchings/game_ui/func_800A19A4.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A19A4.s rename to asm/non_matchings/game_ui/func_800A19A4.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1C04.s b/asm/non_matchings/game_ui/func_800A1C04.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A1C04.s rename to asm/non_matchings/game_ui/func_800A1C04.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s b/asm/non_matchings/game_ui/func_800A1E48.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A1E48.s rename to asm/non_matchings/game_ui/func_800A1E48.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A22F4.s b/asm/non_matchings/game_ui/func_800A22F4.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A22F4.s rename to asm/non_matchings/game_ui/func_800A22F4.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A277C.s b/asm/non_matchings/game_ui/func_800A277C.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A277C.s rename to asm/non_matchings/game_ui/func_800A277C.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A36CC.s b/asm/non_matchings/game_ui/func_800A36CC.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A36CC.s rename to asm/non_matchings/game_ui/func_800A36CC.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A3884.s b/asm/non_matchings/game_ui/func_800A3884.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A3884.s rename to asm/non_matchings/game_ui/func_800A3884.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s b/asm/non_matchings/game_ui/func_800A3CE4.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A3CE4.s rename to asm/non_matchings/game_ui/func_800A3CE4.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A4154.s b/asm/non_matchings/game_ui/func_800A4154.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A4154.s rename to asm/non_matchings/game_ui/func_800A4154.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A45F0.s b/asm/non_matchings/game_ui/func_800A45F0.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A45F0.s rename to asm/non_matchings/game_ui/func_800A45F0.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A47A0.s b/asm/non_matchings/game_ui/func_800A47A0.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A47A0.s rename to asm/non_matchings/game_ui/func_800A47A0.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A497C.s b/asm/non_matchings/game_ui/func_800A497C.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A497C.s rename to asm/non_matchings/game_ui/func_800A497C.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A4C44.s b/asm/non_matchings/game_ui/func_800A4C44.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A4C44.s rename to asm/non_matchings/game_ui/func_800A4C44.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A4F50.s b/asm/non_matchings/game_ui/func_800A4F50.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A4F50.s rename to asm/non_matchings/game_ui/func_800A4F50.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A5A64.s b/asm/non_matchings/game_ui/func_800A5A64.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A5A64.s rename to asm/non_matchings/game_ui/func_800A5A64.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s b/asm/non_matchings/game_ui/func_800A5F18.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A5F18.s rename to asm/non_matchings/game_ui/func_800A5F18.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6254.s b/asm/non_matchings/game_ui/func_800A6254.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A6254.s rename to asm/non_matchings/game_ui/func_800A6254.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6E30.s b/asm/non_matchings/game_ui/func_800A6E30.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A6E30.s rename to asm/non_matchings/game_ui/func_800A6E30.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A718C.s b/asm/non_matchings/game_ui/func_800A718C.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A718C.s rename to asm/non_matchings/game_ui/func_800A718C.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A7520.s b/asm/non_matchings/game_ui/func_800A7520.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A7520.s rename to asm/non_matchings/game_ui/func_800A7520.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A7A60.s b/asm/non_matchings/game_ui/func_800A7A60.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A7A60.s rename to asm/non_matchings/game_ui/func_800A7A60.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A7B68.s b/asm/non_matchings/game_ui/func_800A7B68.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A7B68.s rename to asm/non_matchings/game_ui/func_800A7B68.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A7FBC.s b/asm/non_matchings/game_ui/func_800A7FBC.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A7FBC.s rename to asm/non_matchings/game_ui/func_800A7FBC.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/game_ui/func_800A8474.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800A8474.s rename to asm/non_matchings/game_ui/func_800A8474.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AA3EC.s b/asm/non_matchings/game_ui/func_800AA3EC.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AA3EC.s rename to asm/non_matchings/game_ui/func_800AA3EC.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AA600.s b/asm/non_matchings/game_ui/func_800AA600.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AA600.s rename to asm/non_matchings/game_ui/func_800AA600.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AAFD0.s b/asm/non_matchings/game_ui/func_800AAFD0.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AAFD0.s rename to asm/non_matchings/game_ui/func_800AAFD0.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AB1F0.s b/asm/non_matchings/game_ui/func_800AB1F0.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AB1F0.s rename to asm/non_matchings/game_ui/func_800AB1F0.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AB35C.s b/asm/non_matchings/game_ui/func_800AB35C.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AB35C.s rename to asm/non_matchings/game_ui/func_800AB35C.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AB4A8.s b/asm/non_matchings/game_ui/func_800AB4A8.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AB4A8.s rename to asm/non_matchings/game_ui/func_800AB4A8.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800ABB34.s b/asm/non_matchings/game_ui/func_800ABB34.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800ABB34.s rename to asm/non_matchings/game_ui/func_800ABB34.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800ABC5C.s b/asm/non_matchings/game_ui/func_800ABC5C.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800ABC5C.s rename to asm/non_matchings/game_ui/func_800ABC5C.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800ABE68.s b/asm/non_matchings/game_ui/func_800ABE68.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800ABE68.s rename to asm/non_matchings/game_ui/func_800ABE68.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AC0C8.s b/asm/non_matchings/game_ui/func_800AC0C8.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AC0C8.s rename to asm/non_matchings/game_ui/func_800AC0C8.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AC21C.s b/asm/non_matchings/game_ui/func_800AC21C.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AC21C.s rename to asm/non_matchings/game_ui/func_800AC21C.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AC5A4.s b/asm/non_matchings/game_ui/func_800AC5A4.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AC5A4.s rename to asm/non_matchings/game_ui/func_800AC5A4.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AC8A8.s b/asm/non_matchings/game_ui/func_800AC8A8.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AC8A8.s rename to asm/non_matchings/game_ui/func_800AC8A8.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800ACA20.s b/asm/non_matchings/game_ui/func_800ACA20.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800ACA20.s rename to asm/non_matchings/game_ui/func_800ACA20.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD030.s b/asm/non_matchings/game_ui/func_800AD030.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AD030.s rename to asm/non_matchings/game_ui/func_800AD030.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD144.s b/asm/non_matchings/game_ui/func_800AD144.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AD144.s rename to asm/non_matchings/game_ui/func_800AD144.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD658.s b/asm/non_matchings/game_ui/func_800AD658.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800AD658.s rename to asm/non_matchings/game_ui/func_800AD658.s diff --git a/asm/non_matchings/unknown_09F8F0/func_800ADCBC.s b/asm/non_matchings/game_ui/func_800ADCBC.s similarity index 100% rename from asm/non_matchings/unknown_09F8F0/func_800ADCBC.s rename to asm/non_matchings/game_ui/func_800ADCBC.s diff --git a/include/level_object_entries.h b/include/level_object_entries.h index b6d1821b..d63dc741 100644 --- a/include/level_object_entries.h +++ b/include/level_object_entries.h @@ -85,7 +85,7 @@ typedef struct LevelObjectEntry_16 { typedef struct LevelObjectEntry_WeaponBalloon { /* 0x00 */ LevelObjectEntryCommon common; /* 0x08 */ u8 unk8; // Unused? - /* 0x09 */ u8 balloonType; + /* 0x09 */ u8 balloonType; /* 0x0A */ u8 scale; // This is divided by 64 to get actual scale. } LevelObjectEntry_WeaponBalloon; diff --git a/src/camera.c b/src/camera.c index a6e4ae14..a9c07ac9 100644 --- a/src/camera.c +++ b/src/camera.c @@ -4,7 +4,7 @@ #include "camera.h" #include "audio.h" #include "unknown_00BC20.h" -#include "unknown_06B2B0.h" +#include "game.h" #include "unknown_0255E0.h" #include "video.h" #include "lib/src/libc/rmonPrintf.h" diff --git a/src/controller_pak.c b/src/controller_pak.c index 5395d590..f5ab99e8 100644 --- a/src/controller_pak.c +++ b/src/controller_pak.c @@ -9,7 +9,7 @@ #include "structs.h" #include "camera.h" #include "unknown_00BC20.h" -#include "unknown_06B2B0.h" +#include "game.h" #include "unknown_0CEC50.h" /************ .data ************/ diff --git a/src/unknown_06B2B0.c b/src/game.c similarity index 99% rename from src/unknown_06B2B0.c rename to src/game.c index 5d753acf..171f08d1 100644 --- a/src/unknown_06B2B0.c +++ b/src/game.c @@ -1,7 +1,7 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x8006A6B0 */ -#include "unknown_06B2B0.h" +#include "game.h" #include #include @@ -249,7 +249,7 @@ void func_8006A6B0(void) { } } #else -GLOBAL_ASM("asm/non_matchings/unknown_06B2B0/func_8006A6B0.s") +GLOBAL_ASM("asm/non_matchings/game/func_8006A6B0.s") #endif // Unused. @@ -264,10 +264,10 @@ s16 func_8006ABB4(s32 arg0) { } // Unused? -GLOBAL_ASM("asm/non_matchings/unknown_06B2B0/func_8006AC00.s") +GLOBAL_ASM("asm/non_matchings/game/func_8006AC00.s") // Unused? -GLOBAL_ASM("asm/non_matchings/unknown_06B2B0/func_8006AE2C.s") +GLOBAL_ASM("asm/non_matchings/game/func_8006AE2C.s") // Unused. s32 func_8006B018(s8 arg0) { @@ -590,7 +590,7 @@ void load_level(s32 levelId, s32 numberOfPlayers, s32 entranceId, s32 vehicleId, func_8007AB24(gCurrentLevelHeader->unk4[numberOfPlayers]); } #else -GLOBAL_ASM("asm/non_matchings/unknown_06B2B0/load_level.s") +GLOBAL_ASM("asm/non_matchings/game/load_level.s") #endif void func_8006BD10(f32 arg0) { @@ -1368,7 +1368,7 @@ void func_8006CCF0(s32 updateRate) { } } #else -GLOBAL_ASM("asm/non_matchings/unknown_06B2B0/func_8006CCF0.s") +GLOBAL_ASM("asm/non_matchings/game/func_8006CCF0.s") #endif void func_8006D8A4(void) { @@ -1623,7 +1623,7 @@ void func_8006DCF8(s32 updateRate) { } #else -GLOBAL_ASM("asm/non_matchings/unknown_06B2B0/func_8006DCF8.s") +GLOBAL_ASM("asm/non_matchings/game/func_8006DCF8.s") #endif void load_level_for_menu(s32 levelId, s32 numberOfPlayers, s32 cutsceneId) { @@ -1862,7 +1862,7 @@ void func_8006ECE0(void) { D_800DD37C |= 0x200; } -GLOBAL_ASM("asm/non_matchings/unknown_06B2B0/func_8006ECFC.s") +GLOBAL_ASM("asm/non_matchings/game/func_8006ECFC.s") s32 func_8006EFB8(void) { //Could be SP_DMEM_START / CACHERR_EE / SR_FR / M_K0 / LEO_STATUS_BUFFER_MANAGER_INTERRUPT @@ -1902,7 +1902,7 @@ void func_8006EFDC(void) { gCurrNumHudVertsPerPlayer = gNumHudVertsPerPlayer[3]; } #else -GLOBAL_ASM("asm/non_matchings/unknown_06B2B0/func_8006EFDC.s") +GLOBAL_ASM("asm/non_matchings/game/func_8006EFDC.s") #endif void func_8006F140(s32 arg0) { diff --git a/src/unknown_06B2B0.h b/src/game.h similarity index 100% rename from src/unknown_06B2B0.h rename to src/game.h diff --git a/src/game_text.c b/src/game_text.c index 65ee3db7..5644816a 100644 --- a/src/game_text.c +++ b/src/game_text.c @@ -5,7 +5,7 @@ #include "menu.h" #include "unknown_00BC20.h" #include "racer.h" -#include "unknown_06B2B0.h" +#include "game.h" /************ .data ************/ diff --git a/src/unknown_09F8F0.c b/src/game_ui.c similarity index 83% rename from src/unknown_09F8F0.c rename to src/game_ui.c index 1f834b47..cddbdce5 100644 --- a/src/unknown_09F8F0.c +++ b/src/game_ui.c @@ -1,13 +1,13 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x8009ECF0 */ -#include "unknown_09F8F0.h" +#include "game_ui.h" #include "types.h" #include "macros.h" #include "structs.h" #include "f3ddkr.h" #include "camera.h" -#include "unknown_06B2B0.h" +#include "game.h" extern u32 osTvType; @@ -243,15 +243,15 @@ s32 D_801271B0[640]; /******************************/ -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_8009ECF0.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_8009F034.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A003C.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_8009ECF0.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_8009F034.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A003C.s") u8 func_800A0190(void) { return D_80126D34; } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A01A0.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A01A0.s") void func_800A0B74(void) { s32 i; @@ -264,7 +264,7 @@ void func_800A0B74(void) { } } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A0BD4.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A0BD4.s") void func_800A0DC0(s32 arg0, unk800A0DC0 *arg1, s32 arg2) { unk800A0DC0_2 *temp = arg1->unk64; @@ -291,8 +291,8 @@ void func_800A0DC0(s32 arg0, unk800A0DC0 *arg1, s32 arg2) { func_80068508(0); } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A0EB4.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A1248.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A0EB4.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A1248.s") void func_800A1428(s32 arg0, unk800A0DC0 *arg1, s32 arg2) { unk800A0DC0_2 *temp = arg1->unk64; @@ -312,11 +312,11 @@ void func_800A1428(s32 arg0, unk800A0DC0 *arg1, s32 arg2) { } } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A14F0.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A19A4.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A1C04.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A1E48.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A22F4.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A14F0.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A19A4.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A1C04.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A1E48.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A22F4.s") void func_800A258C(s32 arg0, unk800A0DC0 *arg1, s32 arg2) { LevelHeader *level; @@ -369,24 +369,24 @@ void func_800A26C8(Object *obj, s32 arg1) { } } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A277C.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A36CC.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A277C.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A36CC.s") void func_800A3870(void) { D_80126CDC->unk4C4 = 0x6490; } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A3884.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A3CE4.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A4154.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A45F0.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A47A0.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A497C.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A4C44.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A4F50.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A5A64.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A5F18.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A6254.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A3884.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A3CE4.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A4154.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A45F0.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A47A0.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A497C.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A4C44.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A4F50.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A5A64.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A5F18.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A6254.s") void func_800A6DB4(s16 *arg0) { Settings *settings = get_settings(); @@ -400,8 +400,8 @@ void func_800A6DB4(s16 *arg0) { } } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A6E30.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A718C.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A6E30.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A718C.s") void func_800A7484(u16 arg0, f32 arg1, s32 arg2) { if (D_80126D74 == 0) { @@ -417,10 +417,10 @@ void func_800A74EC(u16 arg0, s32 arg1) { } } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A7520.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A7A60.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A7B68.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A7FBC.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A7520.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A7A60.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A7B68.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A7FBC.s") void func_800A83B4(LevelModel *model) { s32 sp2C; @@ -436,10 +436,10 @@ s8 func_800A8458(void) { return D_800E27A4[D_80126D0C]; } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A8474.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AA3EC.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AA600.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AAFD0.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800A8474.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AA3EC.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AA600.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AAFD0.s") void func_800AB194(s32 arg0) { D_80126CD1 = 1; diff --git a/src/unknown_09F8F0.h b/src/game_ui.h similarity index 100% rename from src/unknown_09F8F0.h rename to src/game_ui.h diff --git a/src/main.c b/src/main.c index 6ad5d4ee..09dca4de 100644 --- a/src/main.c +++ b/src/main.c @@ -3,7 +3,7 @@ #include "main.h" #include "thread0_epc.h" -#include "unknown_06B2B0.h" +#include "game.h" #include "lib/src/libc/rmonPrintf.h" /************ .rodata ************/ diff --git a/src/menu.c b/src/menu.c index 6d93b6f2..07ce9d0c 100644 --- a/src/menu.c +++ b/src/menu.c @@ -21,7 +21,7 @@ #include "textures_sprites.h" #include "thread30.h" #include "unknown_00BC20.h" -#include "unknown_06B2B0.h" +#include "game.h" #include "unknown_078050.h" #include "controller_pak.h" #include "object_functions.h" diff --git a/src/object_functions.c b/src/object_functions.c index 98d9dcb4..676b5e1b 100644 --- a/src/object_functions.c +++ b/src/object_functions.c @@ -12,7 +12,7 @@ #include "menu.h" // For cheats #include "unknown_0ABDF0.h" #include "racer.h" -#include "unknown_06B2B0.h" +#include "game.h" #include "audio.h" #include "unknown_008C40.h" #include "unknown_00BC20.h" @@ -20,7 +20,7 @@ #include "unknown_0255E0.h" #include "font.h" #include "unknown_032760.h" -#include "unknown_09F8F0.h" +#include "game_ui.h" #include "waves.h" #include "unknown_003260.h" diff --git a/src/racer.c b/src/racer.c index d656a51b..be69b842 100644 --- a/src/racer.c +++ b/src/racer.c @@ -15,7 +15,7 @@ #include "unknown_00BC20.h" #include "audio.h" #include "object_functions.h" -#include "unknown_06B2B0.h" +#include "game.h" #define MAX_NUMBER_OF_GHOST_NODES 360 diff --git a/src/thread0_epc.c b/src/thread0_epc.c index d0c00bed..0796e90b 100644 --- a/src/thread0_epc.c +++ b/src/thread0_epc.c @@ -9,7 +9,7 @@ #include "printf.h" #include "unknown_00BC20.h" #include "controller.h" -#include "unknown_06B2B0.h" +#include "game.h" /************ .rodata ************/ diff --git a/src/thread30.c b/src/thread30.c index 814a52d0..fc721486 100644 --- a/src/thread30.c +++ b/src/thread30.c @@ -4,7 +4,7 @@ #include "thread30.h" #include "macros.h" #include "libultra_internal.h" -#include "unknown_06B2B0.h" +#include "game.h" #include "stacks.h" /************ .data ************/ diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 17557803..fb17c6dc 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -13,7 +13,7 @@ #include "thread0_epc.h" #include "controller_pak.h" #include "menu.h" -#include "unknown_06B2B0.h" +#include "game.h" #include "racer.h" /************ .data ************/ diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index bbe554a1..c0de9fea 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -10,7 +10,7 @@ #include "PR/gu.h" #include "textures_sprites.h" #include "unknown_00BC20.h" -#include "unknown_06B2B0.h" +#include "game.h" #include "memory.h" #include "racer.h" #include "camera.h" diff --git a/src/unknown_0ABDF0.c b/src/unknown_0ABDF0.c index 1a5b41d9..487d2e3e 100644 --- a/src/unknown_0ABDF0.c +++ b/src/unknown_0ABDF0.c @@ -166,7 +166,7 @@ Object *D_80127C40[16]; /******************************/ -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AB1F0.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AB1F0.s") void func_800AB308(s16 arg0, s16 arg1) { if (D_80127BF8.unk2 < D_80127BF8.unk0) { @@ -178,14 +178,14 @@ void func_800AB308(s16 arg0, s16 arg1) { } } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AB35C.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AB4A8.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800ABB34.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800ABC5C.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800ABE68.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AC0C8.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AC21C.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AC5A4.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AB35C.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AB4A8.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800ABB34.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800ABC5C.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800ABE68.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AC0C8.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AC21C.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AC5A4.s") void func_800AC880(s32 arg0) { if (arg0 == D_800E2A80) { @@ -194,8 +194,8 @@ void func_800AC880(s32 arg0) { } } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AC8A8.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800ACA20.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AC8A8.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800ACA20.s") void func_800ACF60(Object *arg0) { if (D_800E2A88 < 0x10) { @@ -224,8 +224,8 @@ void func_800ACF98(Object* arg0) { } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AD030.s") -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AD144.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AD030.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AD144.s") void func_800AD220(void) { if (D_800E2C2C[0].tex != NULL) { @@ -304,7 +304,7 @@ void func_800AD4B8(s32 arg0) { } } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AD658.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800AD658.s") void func_800ADAB8(s32 arg0) { if (D_800E2C80 > 0) { @@ -348,4 +348,4 @@ void func_800ADBC8(UNUSED s32 arg0) { } } -GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800ADCBC.s") +GLOBAL_ASM("asm/non_matchings/game_ui/func_800ADCBC.s")