Move snes_regs.h

snesrev · snesrev · commit 2c5078c44348 · 2022-09-04T01:06:05.000+02:00
diff --git a/attract.c b/attract.c
@@ -1,7 +1,7 @@
 #include "zelda_rtl.h"
 #include "variables.h"
 #include "variables_attract.h"
-#include "snes_regs.h"
+#include "snes/snes_regs.h"
 #include "load_gfx.h"
 #include "dungeon.h"
 #include "sprite.h"
diff --git a/dungeon.c b/dungeon.c
@@ -1,8 +1,7 @@
 #include "zelda_rtl.h"
-
+#include "snes/snes_regs.h"
 #include "variables.h"
 #include "dungeon.h"
-#include "snes_regs.h"
 #include "nmi.h"
 #include "hud.h"
 #include "load_gfx.h"
diff --git a/ending.c b/ending.c
@@ -1,4 +1,5 @@
 #include "zelda_rtl.h"
+#include "snes/snes_regs.h"
 #include "variables.h"
 #include "load_gfx.h"
 #include "dungeon.h"
diff --git a/load_gfx.c b/load_gfx.c
@@ -1,6 +1,6 @@
 #include "zelda_rtl.h"
 #include "variables.h"
-#include "snes_regs.h"
+#include "snes/snes_regs.h"
 #include "overworld.h"
 #include "load_gfx.h"
 #include "player.h"
diff --git a/messaging.c b/messaging.c
@@ -1,7 +1,7 @@
 #include "messaging.h"
 #include "zelda_rtl.h"
 #include "variables.h"
-#include "snes_regs.h"
+#include "snes/snes_regs.h"
 #include "dungeon.h"
 #include "hud.h"
 #include "load_gfx.h"
diff --git a/misc.c b/misc.c
@@ -15,6 +15,7 @@
 #include "messaging.h"
 #include "ending.h"
 #include "attract.h"
+#include "snes/snes_regs.h"
 #include "tables/generated_predefined_tiles.h"
 #include "tables/generated_sound_banks.h"
 
diff --git a/nmi.c b/nmi.c
@@ -1,11 +1,12 @@
 #include "nmi.h"
 #include "zelda_rtl.h"
 #include "variables.h"
-#include "snes_regs.h"
-#include "tables/generated_bg_tilemaps.h"
-#include "tables/generated_link_graphics.h"
 #include "messaging.h"
+#include "snes/snes_regs.h"
 #include "snes/ppu.h"
+#include "tables/generated_bg_tilemaps.h"
+#include "tables/generated_link_graphics.h"
+
 static const uint8 kNmiVramAddrs[] = {
   0, 0, 4, 8, 12, 8, 12, 0, 4, 0, 8, 4, 12, 4, 12, 0,
   8, 16, 20, 24, 28, 24, 28, 16, 20, 16, 24, 20, 28, 20, 28, 16,
diff --git a/overlord.h b/overlord.h
@@ -1,7 +1,5 @@
 #pragma once
-#include "zelda_rtl.h"
-#include "variables.h"
-#include "snes_regs.h"
+#include "types.h"
 
 void Overlord_StalfosFactory(int k);
 void Overlord_SetX(int k, uint16 v);
diff --git a/overworld.c b/overworld.c
@@ -9,6 +9,7 @@
 #include "misc.h"
 #include "messaging.h"
 #include "player_oam.h"
+#include "snes/snes_regs.h"
 #include "tables/generated_map32_to_map16.h"
 #include "tables/generated_map16_to_map8.h"
 #include "tables/generated_overworld_tables.h"
diff --git a/overworld.h b/overworld.h
@@ -1,10 +1,6 @@
 #pragma once
 #include "zelda_rtl.h"
 #include "variables.h"
-#include "snes_regs.h"
-
-
-
 
 const uint8 *GetMap8toTileAttr();
 const uint16 *GetMap16toMap8Table();
diff --git a/player_oam.c b/player_oam.c
@@ -1,9 +1,10 @@
 #include "player_oam.h"
 #include "zelda_rtl.h"
 #include "variables.h"
-#include "snes_regs.h"
+#include "snes/snes_regs.h"
 #include "player.h"
 #include "misc.h"
+
 static const int8 kPlayerOam_StairsOffsY[] = {
   0, -2, -3, 0, -2, -3, 0, 0, 0, 0, 0, 0, 0, -2, -3, 0,
   -2, -3, 0, 0, 0, 0, 0, 0,
diff --git a/select_file.c b/select_file.c
@@ -2,7 +2,7 @@
 #include "variables.h"
 #include "load_gfx.h"
 #include "select_file.h"
-#include "snes_regs.h"
+#include "snes/snes_regs.h"
 #include "variables_attract.h"
 #include "overworld.h"
 #include "messaging.h"
diff --git a/snes/dma.c b/snes/dma.c
@@ -7,7 +7,8 @@
 #include <stddef.h>
 #include "dma.h"
 #include "snes.h"
-#include "../snes_regs.h"
+#include "snes_regs.h"
+
 static const int bAdrOffsets[8][4] = {
   {0, 0, 0, 0},
   {0, 1, 0, 1},
diff --git a/snes/snes.c b/snes/snes.c
@@ -16,7 +16,7 @@
 #include "cart.h"
 #include "input.h"
 #include "../tracing.h"
-#include "../snes_regs.h"
+#include "snes_regs.h"
 
 static const double apuCyclesPerMaster = (32040 * 32) / (1364 * 262 * 60.0);
 
diff --git a/snes/snes_regs.h b/snes/snes_regs.h
diff --git a/tagalong.c b/tagalong.c
@@ -3,7 +3,7 @@
 #include "sprite.h"
 #include "zelda_rtl.h"
 #include "variables.h"
-#include "snes_regs.h"
+#include "snes/snes_regs.h"
 #include "dungeon.h"
 #include "overworld.h"
 #include "ancilla.h"
diff --git a/zelda3.vcxproj b/zelda3.vcxproj
@@ -224,8 +224,8 @@
     <ClInclude Include="snes\ppu.h" />
     <ClInclude Include="snes\saveload.h" />
     <ClInclude Include="snes\snes.h" />
+    <ClInclude Include="snes\snes_regs.h" />
     <ClInclude Include="snes\spc.h" />
-    <ClInclude Include="snes_regs.h" />
     <ClInclude Include="spc_player.h" />
     <ClInclude Include="sprite.h" />
     <ClInclude Include="sprite_main.h" />
diff --git a/zelda3.vcxproj.filters b/zelda3.vcxproj.filters
@@ -162,9 +162,6 @@
     <ClInclude Include="dungeon.h">
       <Filter>Zelda</Filter>
     </ClInclude>
-    <ClInclude Include="snes_regs.h">
-      <Filter>Zelda</Filter>
-    </ClInclude>
     <ClInclude Include="nmi.h">
       <Filter>Zelda</Filter>
     </ClInclude>
@@ -237,6 +234,9 @@
     <ClInclude Include="config.h">
       <Filter>Zelda</Filter>
     </ClInclude>
+    <ClInclude Include="snes\snes_regs.h">
+      <Filter>Snes</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/zelda_cpu_infra.c b/zelda_cpu_infra.c
@@ -7,7 +7,8 @@
 #include "nmi.h"
 #include "poly.h"
 #include "attract.h"
-
+#include "spc_player.h"
+#include "snes/snes_regs.h"
 #include "snes/snes.h"
 #include "snes/cpu.h"
 #include "snes/cart.h"
diff --git a/zelda_rtl.c b/zelda_rtl.c
@@ -5,6 +5,8 @@
 #include "poly.h"
 #include "attract.h"
 #include "snes/ppu.h"
+#include "snes/snes_regs.h"
+#include "spc_player.h"
 
 ZeldaEnv g_zenv;
 // These point to the rewritten instance of the emu.
diff --git a/zelda_rtl.h b/zelda_rtl.h
@@ -9,18 +9,16 @@
 #include <assert.h>
 
 #include "types.h"
-#include "snes_regs.h"
-#include "snes/dma.h"
-#include "snes/ppu.h"
-#include "spc_player.h"
+
+struct Snes;
 
 typedef struct ZeldaEnv {
   uint8 *ram;
   uint8 *sram;
   uint16 *vram;
-  Ppu *ppu;
-  SpcPlayer *player;
-  Dma *dma;
+  struct Ppu *ppu;
+  struct SpcPlayer *player;
+  struct Dma *dma;
 } ZeldaEnv;
 extern ZeldaEnv g_zenv;
 
@@ -196,6 +194,6 @@ void ClearOamBuffer();
 void Startup_InitializeMemory();
 void LoadSongBank(const uint8 *p);
 void ZeldaWriteSram();
-void ZeldaReadSram(Snes *snes);
+void ZeldaReadSram(struct Snes *snes);
 
 #endif  // ZELDA_RTL_H

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "zelda_rtl.h"`
	`2`	`+#include "snes/snes_regs.h"`
`2`	`3`	`#include "variables.h"`
`3`	`4`	`#include "load_gfx.h"`
`4`	`5`	`#include "dungeon.h"`