Filename & line number args cleanup (#1891)

* Filename & line number args cleanup

* Use int for line number args over s32/u32

* Add missing const qualifiers from filename args

* Fix gcc warning in game.c

* Add comment to weird assignments in GameState_Init

1 files changed, 4 insertions, 4 deletions

diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c
index 41685a60e..f4910479d 100644
--- a/src/code/z_malloc.c
+++ b/src/code/z_malloc.c
@@ -35,7 +35,7 @@ void* ZeldaArena_Malloc(u32 size) {
 }
 
 #if OOT_DEBUG
-void* ZeldaArena_MallocDebug(u32 size, const char* file, s32 line) {
+void* ZeldaArena_MallocDebug(u32 size, const char* file, int line) {
     void* ptr = __osMallocDebug(&sZeldaArena, size, file, line);
 
     ZELDA_ARENA_CHECK_POINTER(ptr, size, "zelda_malloc_DEBUG", "確保"); // "Secure"
@@ -51,7 +51,7 @@ void* ZeldaArena_MallocR(u32 size) {
 }
 
 #if OOT_DEBUG
-void* ZeldaArena_MallocRDebug(u32 size, const char* file, s32 line) {
+void* ZeldaArena_MallocRDebug(u32 size, const char* file, int line) {
     void* ptr = __osMallocRDebug(&sZeldaArena, size, file, line);
 
     ZELDA_ARENA_CHECK_POINTER(ptr, size, "zelda_malloc_r_DEBUG", "確保"); // "Secure"
@@ -66,7 +66,7 @@ void* ZeldaArena_Realloc(void* ptr, u32 newSize) {
 }
 
 #if OOT_DEBUG
-void* ZeldaArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) {
+void* ZeldaArena_ReallocDebug(void* ptr, u32 newSize, const char* file, int line) {
     ptr = __osReallocDebug(&sZeldaArena, ptr, newSize, file, line);
     ZELDA_ARENA_CHECK_POINTER(ptr, newSize, "zelda_realloc_DEBUG", "再確保"); // "Re-securing"
     return ptr;
@@ -78,7 +78,7 @@ void ZeldaArena_Free(void* ptr) {
 }
 
 #if OOT_DEBUG
-void ZeldaArena_FreeDebug(void* ptr, const char* file, s32 line) {
+void ZeldaArena_FreeDebug(void* ptr, const char* file, int line) {
     __osFreeDebug(&sZeldaArena, ptr, file, line);
 }
 #endif