Match ntsc-1.2 z_scene_table.c (#2050)

* Match z_scene_table.c

* Attempt to fix bss ordering

* Forward declare PlayState instead

* Untangle circular includes in z64scene.h

include/n64dd.h

@@ -1,10 +1,16 @@
 #ifndef N64DD_H
 #define N64DD_H
 
+#include "z64scene.h"
+
+struct PlayState;
+
 typedef struct n64ddStruct_80121AF0 {
     char unk_00[0x3C];
     void (*unk_3C)(void);
     void (*unk_40)(void);
+    char unk_44[0x28];
+    void (*unk_6C)(struct PlayState*, SceneDrawConfigFunc*);
 } n64ddStruct_80121AF0; // size = ?
 
 extern n64ddStruct_80121AF0* B_80121AF0;

include/z64interface.h

@@ -1,6 +1,8 @@
 #ifndef Z64INTERFACE_H
 #define Z64INTERFACE_H
 
+#include "z64view.h"
+
 extern u8 _icon_item_staticSegmentRomStart[];
 extern u8 _icon_item_24_staticSegmentRomStart[];
 

include/z64scene.h

@@ -1,11 +1,18 @@
 #ifndef Z64SCENE_H
 #define Z64SCENE_H
 
-#include "z64.h"
-#include "z64dma.h" // for RomFile
+#include "macros.h"
+#include "ultra64.h"
+#include "z64bgcheck.h"
+#include "z64dma.h"
+#include "z64environment.h"
+#include "z64light.h"
+#include "z64math.h"
 
 #include "command_macros_base.h"
 
+struct PlayState;
+
 typedef struct SceneTableEntry {
     /* 0x00 */ RomFile sceneFile;
     /* 0x08 */ RomFile titleFile;
@@ -499,6 +506,8 @@ typedef enum SceneDrawConfig {
     /* 53 */ SDC_MAX
 } SceneDrawConfig;
 
+typedef void (*SceneDrawConfigFunc)(struct PlayState*);
+
 // R_SCENE_CAM_TYPE values
 #define SCENE_CAM_TYPE_DEFAULT 0
 #define SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT 0x10 // Camera exhibits fixed behaviors and viewpoint changing is handled by shops