Add missing :req, remove old macros

2022-01-23 18:51:56 -05:00
parent 9f2b6ab2f2
commit 2495d18132
15 changed files with 87 additions and 298 deletions
@@ -138,4 +138,13 @@
 #define DIR_NORTHWEST   7
 #define DIR_NORTHEAST   8

+#define CONNECTION_INVALID -1
+#define CONNECTION_NONE     0
+#define CONNECTION_SOUTH    1
+#define CONNECTION_NORTH    2
+#define CONNECTION_WEST     3
+#define CONNECTION_EAST     4
+#define CONNECTION_DIVE     5
+#define CONNECTION_EMERGE   6
+
 #endif // GUARD_CONSTANTS_GLOBAL_H
@@ -349,7 +349,7 @@ struct MusicPlayer
 {
    struct MusicPlayerInfo *info;
    struct MusicPlayerTrack *track;
-    u8 unk_8;
+    u8 numTracks;
    u16 unk_A;
 };

@@ -16,18 +16,6 @@
 // for constructing large tiles, such as the Battle Pike's curtain tile.
 #define METATILE_ROW_WIDTH 8

-enum
-{
-    CONNECTION_INVALID = -1,
-    CONNECTION_NONE,
-    CONNECTION_SOUTH,
-    CONNECTION_NORTH,
-    CONNECTION_WEST,
-    CONNECTION_EAST,
-    CONNECTION_DIVE,
-    CONNECTION_EMERGE
-};
-
 typedef void (*TilesetCB)(void);

 struct Tileset