mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-14 03:44:34 +00:00
[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
This commit is contained in:
parent
09c1816e2d
commit
f089adf20c
32 changed files with 191 additions and 142 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue