summaryrefslogtreecommitdiff
path: root/src/boot_O2_g3
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-05-29 19:57:14 -0400
committerGitHub <noreply@github.com>2023-05-30 09:57:14 +1000
commit4143097c5a6080a1ebbb3d328b85178ab13ab8e6 (patch)
tree417951257bf68c371d5e9bd2641a36035955d59f /src/boot_O2_g3
parent65d72a54cf712292f0bb97af8eeaa10c2eeb2e8c (diff)
Scene table (#1207)
* scene_table.h * Move restriction flgs to scene_table.h * format * rename D_801C5FC0 to sPersistentCycleFlags * format * move persistent flags to table * cleanups * review * PERSISTENT_CYCLE_FLAGS_SET * PERSISTENT_CYCLE_FLAGS_NONE * move comment above the scene * bss * tons of bss * whoops * bss * bss * bss * Update include/tables/scene_table.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_scene_table.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * SCENE_MAX * bss * bss * bss --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'src/boot_O2_g3')
-rw-r--r--src/boot_O2_g3/CIC6105.c1
-rw-r--r--src/boot_O2_g3/yaz0.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/boot_O2_g3/CIC6105.c b/src/boot_O2_g3/CIC6105.c
index 4745ad5c8..78eed1a77 100644
--- a/src/boot_O2_g3/CIC6105.c
+++ b/src/boot_O2_g3/CIC6105.c
@@ -1,4 +1,3 @@
-#include "prevent_bss_reordering.h"
#include "global.h"
UNK_TYPE4 D_8009BE30;
diff --git a/src/boot_O2_g3/yaz0.c b/src/boot_O2_g3/yaz0.c
index 3517b97ae..aa7ecdfe1 100644
--- a/src/boot_O2_g3/yaz0.c
+++ b/src/boot_O2_g3/yaz0.c
@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
#include "global.h"
u8 sYaz0DataBuffer[0x400];