mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-14 02:50:23 +00:00
Code Issues Projects Releases Wiki Activity

variables.h: migrate all remaining varaibles, remove other dependencies except z64.h (#2505)

Browse source 
* move remaining variables from variables.h

* fix other dependencies

* extra newline

* fix and adjust comment

* is this the problem

* fix bss
This commit is contained in:
fig02 2025-04-16 08:22:42 -04:00 • committed by GitHub
parent 0c5282ba66
commit 655ec77138
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
35 changed files with 92 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Xc/z_en_xc.c
View file

@ -1412,7 +1412,7 @@ void func_80B3F3D8(void) {
Sfx_PlaySfxCentered2(NA_SE_PL_SKIP);
}
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
#pragma increment_block_number "gc-eu:128 gc-eu-mq:64 gc-jp:128 gc-jp-ce:128 gc-jp-mq:64 gc-us:128 gc-us-mq:64" \
"ique-cn:64 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) {

1
src/overlays/gamestates/ovl_title/z_title.c
View file

@ -11,6 +11,7 @@
#endif
#include "alloca.h"
#include "build.h"
#include "console_logo_state.h"
#include "gfx.h"
#include "gfx_setupdl.h"

2
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
View file

@ -37,7 +37,7 @@
#endif
#include "assets/textures/icon_item_gameover_static/icon_item_gameover_static.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 ntsc-1.0:0 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:0 pal-1.1:0"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:0 pal-1.1:0"
#if !PLATFORM_GC
#define KALEIDO_PROMPT_CURSOR_R 100