From d9f7ad89ad018ae036b3094ab01b3790c2311a2b Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Sun, 28 Feb 2021 20:56:06 -0800
Subject: resolve sfx calls

---
 include/audio.h      | 22 ++++++++++++++++++++--
 include/fileScreen.h |  1 +
 include/flags.h      |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/audio.h b/include/audio.h
index 0f1a1b40..ad600283 100644
--- a/include/audio.h
+++ b/include/audio.h
@@ -1,6 +1,8 @@
+#ifndef AUDIO_H
+#define AUDIO_H
 
 typedef enum {
-    NONE,
+    SFX_NONE,
     BGM_CASTLE_TOURNAMENT,
     BGM_VAATI_MOTIF,
     BGM_TITLE_SCREEN,
@@ -210,6 +212,8 @@ typedef enum {
     SFX_PLY_SHRINKING = 0x16F,
     SFX_PLY_GROW,
 
+    SFX_EZLO_UI = 0x173,
+
     SFX_LAVA_TILE_STEP = 0x17B,
     SFX_LAVA_TILE_WOBBLE,
     SFX_LAVA_TILE_SINK,
@@ -240,4 +244,18 @@ typedef enum {
     SFX_VO_CUCCO3,
     SFX_VO_CUCCO4,
     SFX_VO_CUCCO5,
-} Sound;
\ No newline at end of file
+
+    SND_STOP_ALL = 0x80010000,
+    SONG_VOL_ZERO = 0x80020000,
+    SND_VOL_RESET_ALL = 0x80030000,
+    SND_VSYNC_OFF = 0x80040000,
+    SONG_STOP = 0x80050000,
+    SND_VSYNC_ON = 0x80060000,
+    SONG_VOL_FADE_OUT = 0x80080000,
+    SONG_VOL_RESET = 0x800B0000,
+    SONG_VOL_CHAN1_SILENT = 0x800D0000,
+    SONG_VOL_CHAN1_RESET = 0x800E0000,
+    SONG_RESET_UNK = 0x80100000,
+} Sound;
+
+#endif // AUDIO_H
diff --git a/include/fileScreen.h b/include/fileScreen.h
index b5782093..629dae40 100644
--- a/include/fileScreen.h
+++ b/include/fileScreen.h
@@ -1,6 +1,7 @@
 #ifndef FILESELECT_H
 #define FILESELECT_H
 
+#include "audio.h"
 #include "global.h"
 #include "functions.h"
 #include "main.h"
diff --git a/include/flags.h b/include/flags.h
index 85e6937e..c68be93e 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -29,7 +29,7 @@ extern u32 gGlobalFlags;
 extern u32 gRoomFlags;
 
 enum {
-    NONE,
+    FLAG_NONE,
     /*0x01*/ LV0_CLEAR,           /*                             */
     /*0x02*/ LV1_CLEAR,           /*                             */
     /*0x03*/ LV2_CLEAR,           /*                             */
-- 
cgit v1.2.3


From 72dbd29bb9548462898de22ae437a0981c044d77 Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Sun, 28 Feb 2021 23:11:11 -0800
Subject: Update EntityData struct

---
 include/room.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/room.h b/include/room.h
index 35ed3137..f192c164 100644
--- a/include/room.h
+++ b/include/room.h
@@ -63,13 +63,13 @@ typedef struct {
 
 // Packets used to store which entities to load in a room
 typedef struct {
-    u8 type : 4;
+    u8 kind : 4;
     u8 layer : 4;
     u8 flags : 4;
     u8 unk : 4;
-    u8 subtype;
-    u8 form;
-    u32 parameter;
+    u8 id;
+    u8 type;
+    u32 type2;
     u16 xPos;
     u16 yPos;
     u32 spritePtr;
-- 
cgit v1.2.3