diff options
| author | cadmic <cadmic24@gmail.com> | 2024-09-12 11:10:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-12 14:10:43 -0400 |
| commit | f089adf20c0f285925e67800723254a80c67db6e (patch) | |
| tree | fb82055b46202c80ed0dace5bccc4d850575f457 /src/code/z_message.c | |
| parent | 09c1816e2d6c4da8468c59d69454aa3e6a9ef27f (diff) | |
[ntsc-1.2] Match ntsc-1.2 BSS and add to CI (#2187)
* Match ntsc-1.2
* Add ntsc-1.2 to CI
* Apply fixes from Jenkins
* Promote ntsc-1.2 to "supported" in Makefile
* Declare D_80858AD8 as a u64 array
* Tweak wording
* Hopefully make ntsc-1.2 bss more stable
* Restore segmented_address.h include
Diffstat (limited to 'src/code/z_message.c')
| -rw-r--r-- | src/code/z_message.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/code/z_message.c b/src/code/z_message.c index ea603ac42..86b1e2070 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -8,7 +8,8 @@ #include "n64dd.h" #endif -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ + "ntsc-1.2:112" #if !PLATFORM_GC #define OCARINA_BUTTON_A_PRIM_1_R 80 @@ -90,6 +91,9 @@ #define OCARINA_ICON_ENV_2_B 130 #endif +s32 sCharTexSize; +s32 sCharTexScale; + s16 sTextFade = false; // original name: key_off_flag ? u8 D_8014B2F4 = 0; @@ -250,8 +254,6 @@ s16 gOcarinaSongItemMap[] = { OCARINA_SONG_SARIAS, OCARINA_SONG_SUNS, OCARINA_SONG_TIME, OCARINA_SONG_STORMS, }; -s32 sCharTexSize; -s32 sCharTexScale; s16 sOcarinaButtonAPrimR; s16 sOcarinaButtonAPrimB; s16 sOcarinaButtonAPrimG; |