diff options
| author | fig02 <fig02srl@gmail.com> | 2024-12-15 11:07:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-15 11:07:21 -0500 |
| commit | ff78b1263b8d16da70031d04ff14af3431380b13 (patch) | |
| tree | bc36ce42fc75809c7495e227658294d4bf74e65a /src/code/game.c | |
| parent | 2eb0b9151675c056b46c629ee10aca2331903866 (diff) | |
Add macros for line number differences (#2365)
* initial work, think I got all of them
* cleanup line_numbers.h
* fix gc-eu-mq-dbg
* fix matching problems
* remove old lines
* format
* missed some stuff
* comment fixes
* other
* review changes
Diffstat (limited to 'src/code/game.c')
| -rw-r--r-- | src/code/game.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/code/game.c b/src/code/game.c index bf7a4ce7c..2bed93e96 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -3,6 +3,7 @@ #include "libc64/os_malloc.h" #include "terminal.h" #include "versions.h" +#include "line_numbers.h" #if PLATFORM_N64 #include "n64dd.h" #endif @@ -390,15 +391,7 @@ void GameState_InitArena(GameState* gameState, size_t size) { } else { THA_Init(&gameState->tha, NULL, 0); PRINTF(T("ハイラル確保失敗\n", "Failure to secure Hyrule\n")); -#if OOT_VERSION < NTSC_1_1 - HUNGUP_AND_CRASH("../game.c", 895); -#elif OOT_VERSION < PAL_1_0 - HUNGUP_AND_CRASH("../game.c", 898); -#elif OOT_VERSION < GC_JP - HUNGUP_AND_CRASH("../game.c", 985); -#else - HUNGUP_AND_CRASH("../game.c", 999); -#endif + HUNGUP_AND_CRASH("../game.c", LN4(895, 898, 985, 999)); } } @@ -439,15 +432,7 @@ void GameState_Realloc(GameState* gameState, size_t size) { SystemArena_Display(); #endif -#if OOT_VERSION < NTSC_1_1 - HUNGUP_AND_CRASH("../game.c", 940); -#elif OOT_VERSION < PAL_1_0 - HUNGUP_AND_CRASH("../game.c", 943); -#elif OOT_VERSION < GC_JP - HUNGUP_AND_CRASH("../game.c", 1030); -#else - HUNGUP_AND_CRASH("../game.c", 1044); -#endif + HUNGUP_AND_CRASH("../game.c", LN4(940, 943, 1030, 1044)); } } |