more debugging

8 files changed, 294 insertions, 230 deletions

diff --git a/basys3/basys3.srcs/ppu_pceg.vhd b/basys3/basys3.srcs/ppu_pceg.vhd
index f87c60d..a491244 100644
--- a/basys3/basys3.srcs/ppu_pceg.vhd
+++ b/basys3/basys3.srcs/ppu_pceg.vhd
@@ -25,9 +25,16 @@ begin
 			SPRITE_FG <= PL_FG_IDLE;
 			DISPCTL_BWEN <= '0';
 		elsif falling_edge(CLK) then
+			-- increment clock counter
+			CLK_IDX := CLK_IDX + 1;
+			if CLK_IDX = PPU_PCEG_TOTAL_STAGES then
+				CLK_IDX := 0;
+			end if;
+
+			CLK_IDX_T <= CLK_IDX;
+
 			case CLK_IDX is
 				when 0 =>
-					DISPCTL_BWEN <= '0';
 					SPRITE_BG <= PL_BG_IDLE;
 					SPRITE_FG <= PL_FG_IDLE;
 					SPRITE_FG_HIT <= PL_HIT_INACCURATE;
@@ -38,27 +45,26 @@ begin
 					SPRITE_BG <= PL_BG_BAM_DATA;
 					SPRITE_FG <= PL_FG_TMM_DATA;
 				when 3 =>
-					SPRITE_BG <= PL_BG_TMM_ADDR;
+					SPRITE_BG <= PL_BG_IDLE;
 					SPRITE_FG <= PL_FG_IDLE;
 					SPRITE_FG_HIT <= PL_HIT_ACCURATE;
-				when 4 =>
+				when 4 => null;
+				when 5 => null;
+				when 6 =>
+					SPRITE_BG <= PL_BG_TMM_ADDR;
+				when 7 =>
 					SPRITE_BG <= PL_BG_TMM_DATA;
-				when 5 =>
+				when 8 =>
 					SPRITE_BG <= PL_BG_IDLE;
-				when 6 =>
+				when 9 => null;
+				when 10 => null;
+				when 11 =>
 					DISPCTL_BWEN <= '1';
-				when 7 =>
+				when 12 => null;
+				when 13 =>
 					DISPCTL_BWEN <= '0';
 				when others => null;
 			end case;
-
-			-- increment clock counter
-			CLK_IDX := CLK_IDX + 1;
-			if CLK_IDX = PPU_PCEG_TOTAL_STAGES then
-				CLK_IDX := 0;
-			end if;
-
-			CLK_IDX_T <= CLK_IDX;
 		end if;
 	end process;
 end Behavioral;
diff --git a/basys3/basys3.srcs/ppu_pceg_consts.vhd b/basys3/basys3.srcs/ppu_pceg_consts.vhd
index 3a9775a..395c386 100644
--- a/basys3/basys3.srcs/ppu_pceg_consts.vhd
+++ b/basys3/basys3.srcs/ppu_pceg_consts.vhd
@@ -1,6 +1,5 @@
 library ieee;
 use ieee.std_logic_1164.all;
-use work.ppu_consts.all;
 
 package ppu_pceg_consts is
 	constant PPU_PCEG_TOTAL_STAGES : natural := 16;
diff --git a/basys3/basys3.srcs/ppu_sprite_bg.vhd b/basys3/basys3.srcs/ppu_sprite_bg.vhd
index 9b6643e..a0c4ba8 100644
--- a/basys3/basys3.srcs/ppu_sprite_bg.vhd
+++ b/basys3/basys3.srcs/ppu_sprite_bg.vhd
@@ -110,28 +110,33 @@ begin
 	begin
 		if RESET = '1' then
 			-- reset internal pipeline registers
-			R_BAM_ADDR <= (others => '0');
 			R_BAM_DATA <= (others => '0');
-			R_TMM_ADDR <= (others => '0');
 			R_TMM_DATA <= (others => '0');
 		elsif falling_edge(CLK) then
-			BAM_ADDR_EN <= true when PL_STAGE = PL_BG_BAM_ADDR else false;
-			TMM_ADDR_EN <= true when PL_STAGE = PL_BG_TMM_ADDR else false;
-			-- R_BAM_ADDR <= T_BAM_ADDR;
-			-- R_BAM_DATA <= T_BAM_DATA;
-			-- R_TMM_ADDR <= T_TMM_ADDR;
-			-- R_TMM_DATA <= T_TMM_DATA;
 			case PL_STAGE is
-				when PL_BG_BAM_ADDR =>
-					R_BAM_ADDR <= T_BAM_ADDR;
 				when PL_BG_BAM_DATA =>
 					R_BAM_DATA <= T_BAM_DATA;
-				when PL_BG_TMM_ADDR =>
-					R_TMM_ADDR <= T_TMM_ADDR;
 				when PL_BG_TMM_DATA =>
 					R_TMM_DATA <= T_TMM_DATA;
 				when others => null;
 			end case;
 		end if;
 	end process;
+
+	process(CLK, RESET)
+	begin
+		if RESET = '1' then
+			BAM_ADDR_EN <= false;
+
+			R_BAM_ADDR <= (others => '0');
+			R_TMM_ADDR <= (others => '0');
+			TMM_ADDR_EN <= false;
+		elsif rising_edge(CLK) then
+			BAM_ADDR_EN <= true when PL_STAGE = PL_BG_BAM_ADDR else false;
+			TMM_ADDR_EN <= true when PL_STAGE = PL_BG_TMM_ADDR else false;
+
+			R_BAM_ADDR <= T_BAM_ADDR;
+			R_TMM_ADDR <= T_TMM_ADDR;
+		end if;
+	end process;
 end Behavioral;
diff --git a/basys3/basys3.srcs/ppu_sprite_bg_tb.vhd b/basys3/basys3.srcs/ppu_sprite_bg_tb.vhd
index 65da15c..5074103 100644
--- a/basys3/basys3.srcs/ppu_sprite_bg_tb.vhd
+++ b/basys3/basys3.srcs/ppu_sprite_bg_tb.vhd
@@ -6,6 +6,7 @@ use ieee.std_logic_1164.all;
 use ieee.numeric_std.all;
 use unisim.vcomponents.all;
 use work.ppu_consts.all;
+use work.ppu_pceg_consts.all;
 
 entity ppu_sprite_bg_tb is
 end ppu_sprite_bg_tb;
@@ -13,8 +14,9 @@ end ppu_sprite_bg_tb;
 architecture Behavioral of ppu_sprite_bg_tb is
 	component ppu_sprite_bg port(
 		-- inputs
-		CLK : in std_logic; -- pipeline clock
+		CLK : in std_logic; -- system clock
 		RESET : in std_logic; -- reset clock counter
+		PL_STAGE : in ppu_sprite_bg_pl_state; -- pipeline stage
 		OE : in std_logic; -- output enable (of CIDX)
 		X : in std_logic_vector(PPU_POS_H_WIDTH-1 downto 0); -- current screen pixel x
 		Y : in std_logic_vector(PPU_POS_V_WIDTH-1 downto 0); -- current screen pixel y
@@ -44,10 +46,12 @@ architecture Behavioral of ppu_sprite_bg_tb is
 	signal TMM_ADDR : std_logic_vector(PPU_TMM_ADDR_WIDTH-1 downto 0);
 	signal TMM_DATA : std_logic_vector(PPU_TMM_DATA_WIDTH-1 downto 0) := (others => '0');
 	signal CIDX : std_logic_vector(PPU_PALETTE_CIDX_WIDTH-1 downto 0); -- output color
+	signal PL_STAGE : ppu_sprite_bg_pl_state;
 begin
 	uut : ppu_sprite_bg port map(
 		CLK => CLK,
 		RESET => RESET,
+		PL_STAGE => PL_BG_IDLE,
 		OE => OE,
 		X => X,
 		Y => Y,
diff --git a/basys3/basys3.srcs/ppu_sprite_fg.vhd b/basys3/basys3.srcs/ppu_sprite_fg.vhd
index 9aabd88..94fecaa 100644
--- a/basys3/basys3.srcs/ppu_sprite_fg.vhd
+++ b/basys3/basys3.srcs/ppu_sprite_fg.vhd
@@ -82,10 +82,8 @@ architecture Behavioral of ppu_sprite_fg is
 	signal TILEMAP_WORD : unsigned(PPU_TMM_ADDR_WIDTH-1 downto 0) := (others => '0');
 	signal TILEMAP_WORD_OFFSET : integer := 0; -- word offset from tile start address in TMM
 	signal TMM_DATA_COL_IDX : std_logic_vector(PPU_PALETTE_COLOR_WIDTH-1 downto 0); -- color of palette
-
 	
-	signal PL_STAGE_NOW : ppu_sprite_fg_pl_state;
-	signal PL_HIT_NOW : ppu_sprite_fg_hit_pl_state;
+	signal TMM_ADDR_EN : boolean := false;
 begin
 	-- FAM memory
 	FAM : component er_ram
@@ -137,10 +135,10 @@ begin
 	inaccurate_occlusion_shims: if IDX >= PPU_ACCURATE_FG_SPRITE_COUNT generate
 		-- state machine for synchronizing pipeline stages
 	begin
-		HIT <= (SPRITE_ACTIVE) when PL_HIT_NOW = PL_HIT_INACCURATE else
-					 (SPRITE_ACTIVE and (or TMM_DATA_COL_IDX)) when PL_HIT_NOW = PL_HIT_ACCURATE else '0';
+		HIT <= (SPRITE_ACTIVE) when PL_HIT = PL_HIT_INACCURATE else
+					 (SPRITE_ACTIVE and (or TMM_DATA_COL_IDX)) when PL_HIT = PL_HIT_ACCURATE else '0';
 		-- only fetch if OE is high, and during the second pipeline stage
-		TMM_ADDR <= R_TMM_ADDR when OE = '1' and PL_STAGE_NOW = PL_FG_TMM_ADDR else (others => 'Z');
+		TMM_ADDR <= R_TMM_ADDR when OE = '1' and TMM_ADDR_EN else (others => 'Z');
 		T_TMM_ADDR <= std_logic_vector(TILEMAP_WORD + to_unsigned(TILEMAP_WORD_OFFSET, PPU_TMM_ADDR_WIDTH)); -- TMM address
 
 		-- TMM DATA
@@ -152,28 +150,15 @@ begin
 													R_TMM_DATA(14 downto 12) when 4,
 													(others => '0') when others;
 
-		-- rising edge clock process (buffer pipeline stage)
-		process(CLK, RESET)
-		begin
-			if rising_edge(CLK) then
-				PL_HIT_NOW <= PL_HIT;
-				PL_STAGE_NOW <= PL_STAGE;
-			end if;
-		end process;
-
-		-- falling edge clock process (read buffered pipeline stage)
+		-- rising edge process (read/write)
 		process(CLK, RESET)
 		begin
 			if RESET = '1' then
-				-- reset internal pipeline registers
-				R_TMM_ADDR <= (others => '0');
 				R_TMM_DATA <= (others => '0');
 			elsif OE = '0' then
 				null; -- don't read/write if current sprite is not the top sprite
 			elsif falling_edge(CLK) then
-				case PL_STAGE_NOW is
-					when PL_FG_TMM_ADDR =>
-						R_TMM_ADDR <= T_TMM_ADDR;
+				case PL_STAGE is
 					when PL_FG_TMM_DATA =>
 						R_TMM_DATA <= T_TMM_DATA;
 					when others => null;
@@ -181,6 +166,19 @@ begin
 			end if;
 		end process;
 	end generate;
+	-- falling edge process (TMM ADDR master control)
+	process(CLK, RESET)
+	begin
+		if RESET = '1' then
+			TMM_ADDR_EN <= false;
+
+			R_TMM_ADDR <= (others => '0');
+		elsif rising_edge(CLK) then
+			TMM_ADDR_EN <= true when PL_STAGE = PL_FG_TMM_ADDR else false;
+
+			R_TMM_ADDR <= T_TMM_ADDR;
+		end if;
+	end process;
 
 	accurate_occlusion_logic: if IDX < PPU_ACCURATE_FG_SPRITE_COUNT generate
 		-- TMM cache lines
diff --git a/basys3/basys3.xpr b/basys3/basys3.xpr
index 0bc96a1..45547d3 100644
--- a/basys3/basys3.xpr
+++ b/basys3/basys3.xpr
@@ -44,7 +44,6 @@
     <Option Name="SimulatorGccVersionActiveHdl" Val="9.3.0"/>
     <Option Name="BoardPart" Val="digilentinc.com:basys3:part0:1.2"/>
     <Option Name="BoardPartRepoPaths" Val="$PPRDIR/../../../../.Xilinx/Vivado/2022.2/xhub/board_store/xilinx_board_store"/>
-    <Option Name="SourceMgmtMode" Val="DisplayOnly"/>
     <Option Name="ActiveSimSet" Val="sim_1"/>
     <Option Name="DefaultLib" Val="xil_defaultlib"/>
     <Option Name="ProjectType" Val="Default"/>
@@ -60,20 +59,20 @@
     <Option Name="IPStaticSourceDir" Val="$PIPUSERFILESDIR/ipstatic"/>
     <Option Name="EnableBDX" Val="FALSE"/>
     <Option Name="DSABoardId" Val="basys3"/>
-    <Option Name="WTXSimLaunchSim" Val="213"/>
+    <Option Name="WTXSimLaunchSim" Val="249"/>
     <Option Name="WTModelSimLaunchSim" Val="0"/>
     <Option Name="WTQuestaLaunchSim" Val="0"/>
     <Option Name="WTIesLaunchSim" Val="0"/>
     <Option Name="WTVcsLaunchSim" Val="0"/>
     <Option Name="WTRivieraLaunchSim" Val="0"/>
     <Option Name="WTActivehdlLaunchSim" Val="0"/>
-    <Option Name="WTXSimExportSim" Val="11"/>
-    <Option Name="WTModelSimExportSim" Val="11"/>
-    <Option Name="WTQuestaExportSim" Val="11"/>
+    <Option Name="WTXSimExportSim" Val="12"/>
+    <Option Name="WTModelSimExportSim" Val="12"/>
+    <Option Name="WTQuestaExportSim" Val="12"/>
     <Option Name="WTIesExportSim" Val="0"/>
-    <Option Name="WTVcsExportSim" Val="11"/>
-    <Option Name="WTRivieraExportSim" Val="11"/>
-    <Option Name="WTActivehdlExportSim" Val="11"/>
+    <Option Name="WTVcsExportSim" Val="12"/>
+    <Option Name="WTRivieraExportSim" Val="12"/>
+    <Option Name="WTActivehdlExportSim" Val="12"/>
     <Option Name="GenerateIPUpgradeLog" Val="TRUE"/>
     <Option Name="XSimRadix" Val="hex"/>
     <Option Name="XSimTimeUnit" Val="ns"/>
@@ -91,15 +90,17 @@
   <FileSets Version="1" Minor="31">
     <FileSet Name="sources_1" Type="DesignSrcs" RelSrcDir="$PSRCDIR/sources_1" RelGenDir="$PGENDIR/sources_1">
       <Filter Type="Srcs"/>
-      <File Path="$PSRCDIR/ppu_consts.vhd">
+      <File Path="$PSRCDIR/ppu_pceg_consts.vhd">
         <FileInfo SFType="VHDL2008">
+          <Attr Name="Library" Val="work"/>
           <Attr Name="IsGlobalInclude" Val="1"/>
           <Attr Name="UsedIn" Val="synthesis"/>
           <Attr Name="UsedIn" Val="simulation"/>
         </FileInfo>
       </File>
-      <File Path="$PSRCDIR/ppu_pceg_consts.vhd">
+      <File Path="$PSRCDIR/ppu_consts.vhd">
         <FileInfo SFType="VHDL2008">
+          <Attr Name="Library" Val="work"/>
           <Attr Name="IsGlobalInclude" Val="1"/>
           <Attr Name="UsedIn" Val="synthesis"/>
           <Attr Name="UsedIn" Val="simulation"/>
@@ -211,32 +212,43 @@
     </FileSet>
     <FileSet Name="sim_1" Type="SimulationSrcs" RelSrcDir="$PSRCDIR/sim_1" RelGenDir="$PGENDIR/sim_1">
       <Filter Type="Srcs"/>
-      <File Path="$PSRCDIR/ppu_comp_tb.vhd">
+      <File Path="$PSRCDIR/ppu_tb.vhd">
         <FileInfo SFType="VHDL2008">
           <Attr Name="UsedIn" Val="synthesis"/>
           <Attr Name="UsedIn" Val="simulation"/>
         </FileInfo>
       </File>
-      <File Path="$PSRCDIR/spi_tb.vhd">
-        <FileInfo>
+      <File Path="$PSRCDIR/ppu_sprite_bg_tb.vhd">
+        <FileInfo SFType="VHDL2008">
+          <Attr Name="UserDisabled" Val="1"/>
           <Attr Name="UsedIn" Val="synthesis"/>
           <Attr Name="UsedIn" Val="simulation"/>
         </FileInfo>
       </File>
-      <File Path="$PSRCDIR/ppu_tb.vhd">
+      <File Path="$PSRCDIR/ppu_comp_tb.vhd">
         <FileInfo SFType="VHDL2008">
+          <Attr Name="UserDisabled" Val="1"/>
+          <Attr Name="UsedIn" Val="synthesis"/>
+          <Attr Name="UsedIn" Val="simulation"/>
+        </FileInfo>
+      </File>
+      <File Path="$PSRCDIR/spi_tb.vhd">
+        <FileInfo>
+          <Attr Name="UserDisabled" Val="1"/>
           <Attr Name="UsedIn" Val="synthesis"/>
           <Attr Name="UsedIn" Val="simulation"/>
         </FileInfo>
       </File>
       <File Path="$PSRCDIR/ppu_pceg_tb.vhd">
         <FileInfo>
+          <Attr Name="UserDisabled" Val="1"/>
           <Attr Name="UsedIn" Val="synthesis"/>
           <Attr Name="UsedIn" Val="simulation"/>
         </FileInfo>
       </File>
       <File Path="$PSRCDIR/ppu_addr_dec_tb.vhd">
         <FileInfo SFType="VHDL2008">
+          <Attr Name="UserDisabled" Val="1"/>
           <Attr Name="UsedIn" Val="synthesis"/>
           <Attr Name="UsedIn" Val="simulation"/>
         </FileInfo>
@@ -248,15 +260,15 @@
         <Option Name="TransportPathDelay" Val="0"/>
         <Option Name="TransportIntDelay" Val="0"/>
         <Option Name="SelectedSimModel" Val="rtl"/>
+        <Option Name="SimMode" Val="post-implementation"/>
         <Option Name="PamDesignTestbench" Val=""/>
         <Option Name="PamDutBypassFile" Val="xil_dut_bypass"/>
         <Option Name="PamSignalDriverFile" Val="xil_bypass_driver"/>
         <Option Name="PamPseudoTop" Val="pseudo_tb"/>
         <Option Name="SrcSet" Val="sources_1"/>
         <Option Name="Incremental" Val="0"/>
-        <Option Name="xsim.simulate.runtime" Val="18 ms"/>
+        <Option Name="xsim.simulate.runtime" Val="1500 us"/>
         <Option Name="xsim.simulate.log_all_signals" Val="true"/>
-        <Option Name="NLNetlistMode" Val="funcsim"/>
       </Config>
     </FileSet>
     <FileSet Name="utils_1" Type="Utils" RelSrcDir="$PSRCDIR/utils_1" RelGenDir="$PGENDIR/utils_1">
diff --git a/basys3/makefile b/basys3/makefile
new file mode 100644
index 0000000..af07e9d
--- /dev/null
+++ b/basys3/makefile
@@ -0,0 +1,9 @@
+OFL := ~/.conda/envs/xc7/bin/openFPGALoader
+
+TOP := basys3.runs/impl_4/top.bit
+BOARD := basys3
+
+program:
+	$(OFL) -b $(BOARD) $(TOP)
+
+.PHONY: program
diff --git a/basys3/ppu_tb_behav.wcfg b/basys3/ppu_tb_behav.wcfg
index df141cd..65f3f83 100644
--- a/basys3/ppu_tb_behav.wcfg
+++ b/basys3/ppu_tb_behav.wcfg
@@ -13,13 +13,13 @@
       </db_ref>
    </db_ref_list>
    <zoom_setting>
-      <ZoomStartTime time="929,912.593 ns"></ZoomStartTime>
-      <ZoomEndTime time="931,046.594 ns"></ZoomEndTime>
-      <Cursor1Time time="930,263.593 ns"></Cursor1Time>
+      <ZoomStartTime time="930,315.700 ns"></ZoomStartTime>
+      <ZoomEndTime time="930,719.701 ns"></ZoomEndTime>
+      <Cursor1Time time="930,414.700 ns"></Cursor1Time>
    </zoom_setting>
    <column_width_setting>
       <NameColumnWidth column_width="257"></NameColumnWidth>
-      <ValueColumnWidth column_width="186"></ValueColumnWidth>
+      <ValueColumnWidth column_width="174"></ValueColumnWidth>
    </column_width_setting>
    <WVObjectSize size="10" />
    <wvobject type="group" fp_name="group136">
@@ -43,7 +43,6 @@
    <wvobject type="group" fp_name="group150">
       <obj_property name="label">ppu top</obj_property>
       <obj_property name="DisplayName">label</obj_property>
-      <obj_property name="isExpanded"></obj_property>
       <wvobject type="logic" fp_name="/ppu_tb/uut/WEN">
          <obj_property name="ElementShortName">WEN</obj_property>
          <obj_property name="ObjectShortName">WEN</obj_property>
@@ -176,7 +175,6 @@
    <wvobject type="group" fp_name="group149">
       <obj_property name="label">background sprite</obj_property>
       <obj_property name="DisplayName">label</obj_property>
-      <obj_property name="isExpanded"></obj_property>
       <wvobject type="logic" fp_name="/ppu_tb/uut/background_sprite/CLK">
          <obj_property name="ElementShortName">CLK</obj_property>
          <obj_property name="ObjectShortName">CLK</obj_property>
@@ -189,114 +187,136 @@
          <obj_property name="ElementShortName">PL_STAGE</obj_property>
          <obj_property name="ObjectShortName">PL_STAGE</obj_property>
       </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/X">
-         <obj_property name="ElementShortName">X[8:0]</obj_property>
-         <obj_property name="ObjectShortName">X[8:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/Y">
-         <obj_property name="ElementShortName">Y[7:0]</obj_property>
-         <obj_property name="ObjectShortName">Y[7:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/BG_SHIFT_X">
-         <obj_property name="ElementShortName">BG_SHIFT_X[8:0]</obj_property>
-         <obj_property name="ObjectShortName">BG_SHIFT_X[8:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/BG_SHIFT_Y">
-         <obj_property name="ElementShortName">BG_SHIFT_Y[7:0]</obj_property>
-         <obj_property name="ObjectShortName">BG_SHIFT_Y[7:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/BAM_ADDR">
-         <obj_property name="ElementShortName">BAM_ADDR[10:0]</obj_property>
-         <obj_property name="ObjectShortName">BAM_ADDR[10:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/BAM_DATA">
-         <obj_property name="ElementShortName">BAM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">BAM_DATA[14:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TMM_ADDR">
-         <obj_property name="ElementShortName">TMM_ADDR[15:0]</obj_property>
-         <obj_property name="ObjectShortName">TMM_ADDR[15:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TMM_DATA">
-         <obj_property name="ElementShortName">TMM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">TMM_DATA[14:0]</obj_property>
-         <obj_property name="Radix">HEXRADIX</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/T_BAM_ADDR">
-         <obj_property name="ElementShortName">T_BAM_ADDR[10:0]</obj_property>
-         <obj_property name="ObjectShortName">T_BAM_ADDR[10:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/R_BAM_ADDR">
-         <obj_property name="ElementShortName">R_BAM_ADDR[10:0]</obj_property>
-         <obj_property name="ObjectShortName">R_BAM_ADDR[10:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/T_BAM_DATA">
-         <obj_property name="ElementShortName">T_BAM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">T_BAM_DATA[14:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/R_BAM_DATA">
-         <obj_property name="ElementShortName">R_BAM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">R_BAM_DATA[14:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/T_TMM_ADDR">
-         <obj_property name="ElementShortName">T_TMM_ADDR[15:0]</obj_property>
-         <obj_property name="ObjectShortName">T_TMM_ADDR[15:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/R_TMM_ADDR">
-         <obj_property name="ElementShortName">R_TMM_ADDR[15:0]</obj_property>
-         <obj_property name="ObjectShortName">R_TMM_ADDR[15:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/T_TMM_DATA">
-         <obj_property name="ElementShortName">T_TMM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">T_TMM_DATA[14:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/R_TMM_DATA">
-         <obj_property name="ElementShortName">R_TMM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">R_TMM_DATA[14:0]</obj_property>
-      </wvobject>
-      <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/PIXEL_ABS_X">
-         <obj_property name="ElementShortName">PIXEL_ABS_X</obj_property>
-         <obj_property name="ObjectShortName">PIXEL_ABS_X</obj_property>
-      </wvobject>
-      <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/PIXEL_ABS_Y">
-         <obj_property name="ElementShortName">PIXEL_ABS_Y</obj_property>
-         <obj_property name="ObjectShortName">PIXEL_ABS_Y</obj_property>
-      </wvobject>
-      <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/TILE_IDX_X">
-         <obj_property name="ElementShortName">TILE_IDX_X</obj_property>
-         <obj_property name="ObjectShortName">TILE_IDX_X</obj_property>
-      </wvobject>
-      <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/TILE_IDX_Y">
-         <obj_property name="ElementShortName">TILE_IDX_Y</obj_property>
-         <obj_property name="ObjectShortName">TILE_IDX_Y</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TILE_PIDX_X">
-         <obj_property name="ElementShortName">TILE_PIDX_X[3:0]</obj_property>
-         <obj_property name="ObjectShortName">TILE_PIDX_X[3:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TRANS_TILE_PIDX_X">
-         <obj_property name="ElementShortName">TRANS_TILE_PIDX_X[3:0]</obj_property>
-         <obj_property name="ObjectShortName">TRANS_TILE_PIDX_X[3:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TILE_PIDX_Y">
-         <obj_property name="ElementShortName">TILE_PIDX_Y[3:0]</obj_property>
-         <obj_property name="ObjectShortName">TILE_PIDX_Y[3:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TRANS_TILE_PIDX_Y">
-         <obj_property name="ElementShortName">TRANS_TILE_PIDX_Y[3:0]</obj_property>
-         <obj_property name="ObjectShortName">TRANS_TILE_PIDX_Y[3:0]</obj_property>
-      </wvobject>
-      <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/TRANS_TILE_PIDX">
-         <obj_property name="ElementShortName">TRANS_TILE_PIDX</obj_property>
-         <obj_property name="ObjectShortName">TRANS_TILE_PIDX</obj_property>
+      <wvobject type="group" fp_name="group518">
+         <obj_property name="label">BAM</obj_property>
+         <obj_property name="DisplayName">label</obj_property>
+         <obj_property name="isExpanded"></obj_property>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/T_BAM_ADDR">
+            <obj_property name="ElementShortName">T_BAM_ADDR[10:0]</obj_property>
+            <obj_property name="ObjectShortName">T_BAM_ADDR[10:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/R_BAM_ADDR">
+            <obj_property name="ElementShortName">R_BAM_ADDR[10:0]</obj_property>
+            <obj_property name="ObjectShortName">R_BAM_ADDR[10:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/BAM_ADDR">
+            <obj_property name="ElementShortName">BAM_ADDR[10:0]</obj_property>
+            <obj_property name="ObjectShortName">BAM_ADDR[10:0]</obj_property>
+         </wvobject>
+         <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/BAM_ADDR_EN">
+            <obj_property name="ElementShortName">BAM_ADDR_EN</obj_property>
+            <obj_property name="ObjectShortName">BAM_ADDR_EN</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/BAM_DATA">
+            <obj_property name="ElementShortName">BAM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">BAM_DATA[14:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/T_BAM_DATA">
+            <obj_property name="ElementShortName">T_BAM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">T_BAM_DATA[14:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/R_BAM_DATA">
+            <obj_property name="ElementShortName">R_BAM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">R_BAM_DATA[14:0]</obj_property>
+         </wvobject>
       </wvobject>
-      <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/TILEMAP_WORD_OFFSET">
-         <obj_property name="ElementShortName">TILEMAP_WORD_OFFSET</obj_property>
-         <obj_property name="ObjectShortName">TILEMAP_WORD_OFFSET</obj_property>
+      <wvobject type="group" fp_name="group519">
+         <obj_property name="label">TMM</obj_property>
+         <obj_property name="DisplayName">label</obj_property>
+         <obj_property name="isExpanded"></obj_property>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/T_TMM_ADDR">
+            <obj_property name="ElementShortName">T_TMM_ADDR[15:0]</obj_property>
+            <obj_property name="ObjectShortName">T_TMM_ADDR[15:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/R_TMM_ADDR">
+            <obj_property name="ElementShortName">R_TMM_ADDR[15:0]</obj_property>
+            <obj_property name="ObjectShortName">R_TMM_ADDR[15:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TMM_ADDR">
+            <obj_property name="ElementShortName">TMM_ADDR[15:0]</obj_property>
+            <obj_property name="ObjectShortName">TMM_ADDR[15:0]</obj_property>
+         </wvobject>
+         <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/TMM_ADDR_EN">
+            <obj_property name="ElementShortName">TMM_ADDR_EN</obj_property>
+            <obj_property name="ObjectShortName">TMM_ADDR_EN</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TMM_DATA">
+            <obj_property name="ElementShortName">TMM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">TMM_DATA[14:0]</obj_property>
+            <obj_property name="Radix">HEXRADIX</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/T_TMM_DATA">
+            <obj_property name="ElementShortName">T_TMM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">T_TMM_DATA[14:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/R_TMM_DATA">
+            <obj_property name="ElementShortName">R_TMM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">R_TMM_DATA[14:0]</obj_property>
+         </wvobject>
       </wvobject>
-      <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/PIXEL_BIT_OFFSET">
-         <obj_property name="ElementShortName">PIXEL_BIT_OFFSET</obj_property>
-         <obj_property name="ObjectShortName">PIXEL_BIT_OFFSET</obj_property>
+      <wvobject type="group" fp_name="group520">
+         <obj_property name="label">PIXEL</obj_property>
+         <obj_property name="DisplayName">label</obj_property>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/X">
+            <obj_property name="ElementShortName">X[8:0]</obj_property>
+            <obj_property name="ObjectShortName">X[8:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/Y">
+            <obj_property name="ElementShortName">Y[7:0]</obj_property>
+            <obj_property name="ObjectShortName">Y[7:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/BG_SHIFT_X">
+            <obj_property name="ElementShortName">BG_SHIFT_X[8:0]</obj_property>
+            <obj_property name="ObjectShortName">BG_SHIFT_X[8:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/BG_SHIFT_Y">
+            <obj_property name="ElementShortName">BG_SHIFT_Y[7:0]</obj_property>
+            <obj_property name="ObjectShortName">BG_SHIFT_Y[7:0]</obj_property>
+         </wvobject>
+         <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/PIXEL_ABS_X">
+            <obj_property name="ElementShortName">PIXEL_ABS_X</obj_property>
+            <obj_property name="ObjectShortName">PIXEL_ABS_X</obj_property>
+         </wvobject>
+         <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/PIXEL_ABS_Y">
+            <obj_property name="ElementShortName">PIXEL_ABS_Y</obj_property>
+            <obj_property name="ObjectShortName">PIXEL_ABS_Y</obj_property>
+         </wvobject>
+         <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/TILE_IDX_X">
+            <obj_property name="ElementShortName">TILE_IDX_X</obj_property>
+            <obj_property name="ObjectShortName">TILE_IDX_X</obj_property>
+         </wvobject>
+         <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/TILE_IDX_Y">
+            <obj_property name="ElementShortName">TILE_IDX_Y</obj_property>
+            <obj_property name="ObjectShortName">TILE_IDX_Y</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TILE_PIDX_X">
+            <obj_property name="ElementShortName">TILE_PIDX_X[3:0]</obj_property>
+            <obj_property name="ObjectShortName">TILE_PIDX_X[3:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TRANS_TILE_PIDX_X">
+            <obj_property name="ElementShortName">TRANS_TILE_PIDX_X[3:0]</obj_property>
+            <obj_property name="ObjectShortName">TRANS_TILE_PIDX_X[3:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TILE_PIDX_Y">
+            <obj_property name="ElementShortName">TILE_PIDX_Y[3:0]</obj_property>
+            <obj_property name="ObjectShortName">TILE_PIDX_Y[3:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TRANS_TILE_PIDX_Y">
+            <obj_property name="ElementShortName">TRANS_TILE_PIDX_Y[3:0]</obj_property>
+            <obj_property name="ObjectShortName">TRANS_TILE_PIDX_Y[3:0]</obj_property>
+         </wvobject>
+         <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/TRANS_TILE_PIDX">
+            <obj_property name="ElementShortName">TRANS_TILE_PIDX</obj_property>
+            <obj_property name="ObjectShortName">TRANS_TILE_PIDX</obj_property>
+         </wvobject>
+         <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/TILEMAP_WORD_OFFSET">
+            <obj_property name="ElementShortName">TILEMAP_WORD_OFFSET</obj_property>
+            <obj_property name="ObjectShortName">TILEMAP_WORD_OFFSET</obj_property>
+         </wvobject>
+         <wvobject type="other" fp_name="/ppu_tb/uut/background_sprite/PIXEL_BIT_OFFSET">
+            <obj_property name="ElementShortName">PIXEL_BIT_OFFSET</obj_property>
+            <obj_property name="ObjectShortName">PIXEL_BIT_OFFSET</obj_property>
+         </wvobject>
       </wvobject>
       <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/TMM_DATA_PAL_IDX">
          <obj_property name="ElementShortName">TMM_DATA_PAL_IDX[2:0]</obj_property>
@@ -309,18 +329,15 @@
       <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/CIDX">
          <obj_property name="ElementShortName">CIDX[5:0]</obj_property>
          <obj_property name="ObjectShortName">CIDX[5:0]</obj_property>
-         <obj_property name="isExpanded"></obj_property>
       </wvobject>
       <wvobject type="array" fp_name="/ppu_tb/uut/background_sprite/T_CIDX">
          <obj_property name="ElementShortName">T_CIDX[5:0]</obj_property>
          <obj_property name="ObjectShortName">T_CIDX[5:0]</obj_property>
-         <obj_property name="isExpanded"></obj_property>
       </wvobject>
    </wvobject>
    <wvobject type="group" fp_name="group142">
       <obj_property name="label">display coordinates</obj_property>
       <obj_property name="DisplayName">label</obj_property>
-      <obj_property name="isExpanded"></obj_property>
       <wvobject type="array" fp_name="/ppu_tb/uut/display_controller/T_POS_X">
          <obj_property name="ElementShortName">T_POS_X[8:0]</obj_property>
          <obj_property name="ObjectShortName">T_POS_X[8:0]</obj_property>
@@ -462,6 +479,7 @@
    <wvobject type="group" fp_name="group165">
       <obj_property name="label">sprite[0]</obj_property>
       <obj_property name="DisplayName">label</obj_property>
+      <obj_property name="isExpanded"></obj_property>
       <wvobject type="logic" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/CLK">
          <obj_property name="ElementShortName">CLK</obj_property>
          <obj_property name="ObjectShortName">CLK</obj_property>
@@ -482,6 +500,35 @@
          <obj_property name="ElementShortName">OE</obj_property>
          <obj_property name="ObjectShortName">OE</obj_property>
       </wvobject>
+      <wvobject type="group" fp_name="group1008">
+         <obj_property name="label">TMM</obj_property>
+         <obj_property name="DisplayName">label</obj_property>
+         <obj_property name="isExpanded"></obj_property>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/TMM_ADDR">
+            <obj_property name="ElementShortName">TMM_ADDR[15:0]</obj_property>
+            <obj_property name="ObjectShortName">TMM_ADDR[15:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/TMM_DATA">
+            <obj_property name="ElementShortName">TMM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">TMM_DATA[14:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/T_TMM_ADDR">
+            <obj_property name="ElementShortName">T_TMM_ADDR[15:0]</obj_property>
+            <obj_property name="ObjectShortName">T_TMM_ADDR[15:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/R_TMM_ADDR">
+            <obj_property name="ElementShortName">R_TMM_ADDR[15:0]</obj_property>
+            <obj_property name="ObjectShortName">R_TMM_ADDR[15:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/T_TMM_DATA">
+            <obj_property name="ElementShortName">T_TMM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">T_TMM_DATA[14:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/R_TMM_DATA">
+            <obj_property name="ElementShortName">R_TMM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">R_TMM_DATA[14:0]</obj_property>
+         </wvobject>
+      </wvobject>
       <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/X">
          <obj_property name="ElementShortName">X[8:0]</obj_property>
          <obj_property name="ObjectShortName">X[8:0]</obj_property>
@@ -510,39 +557,14 @@
          <obj_property name="ElementShortName">FAM_DATA[15:0]</obj_property>
          <obj_property name="ObjectShortName">FAM_DATA[15:0]</obj_property>
       </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/TMM_ADDR">
-         <obj_property name="ElementShortName">TMM_ADDR[15:0]</obj_property>
-         <obj_property name="ObjectShortName">TMM_ADDR[15:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/TMM_DATA">
-         <obj_property name="ElementShortName">TMM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">TMM_DATA[14:0]</obj_property>
-      </wvobject>
       <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/CIDX">
          <obj_property name="ElementShortName">CIDX[5:0]</obj_property>
          <obj_property name="ObjectShortName">CIDX[5:0]</obj_property>
-         <obj_property name="isExpanded"></obj_property>
       </wvobject>
       <wvobject type="logic" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/HIT">
          <obj_property name="ElementShortName">HIT</obj_property>
          <obj_property name="ObjectShortName">HIT</obj_property>
       </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/T_TMM_ADDR">
-         <obj_property name="ElementShortName">T_TMM_ADDR[15:0]</obj_property>
-         <obj_property name="ObjectShortName">T_TMM_ADDR[15:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/R_TMM_ADDR">
-         <obj_property name="ElementShortName">R_TMM_ADDR[15:0]</obj_property>
-         <obj_property name="ObjectShortName">R_TMM_ADDR[15:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/T_TMM_DATA">
-         <obj_property name="ElementShortName">T_TMM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">T_TMM_DATA[14:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/R_TMM_DATA">
-         <obj_property name="ElementShortName">R_TMM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">R_TMM_DATA[14:0]</obj_property>
-      </wvobject>
       <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(0)\/foreground_sprite/T_CIDX">
          <obj_property name="ElementShortName">T_CIDX[5:0]</obj_property>
          <obj_property name="ObjectShortName">T_CIDX[5:0]</obj_property>
@@ -607,6 +629,7 @@
    <wvobject type="group" fp_name="group166">
       <obj_property name="label">sprite[16]</obj_property>
       <obj_property name="DisplayName">label</obj_property>
+      <obj_property name="isExpanded"></obj_property>
       <wvobject type="logic" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/CLK">
          <obj_property name="ElementShortName">CLK</obj_property>
          <obj_property name="ObjectShortName">CLK</obj_property>
@@ -631,6 +654,39 @@
          <obj_property name="ElementShortName">HIT</obj_property>
          <obj_property name="ObjectShortName">HIT</obj_property>
       </wvobject>
+      <wvobject type="group" fp_name="group1018">
+         <obj_property name="label">TMM</obj_property>
+         <obj_property name="DisplayName">label</obj_property>
+         <obj_property name="isExpanded"></obj_property>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/T_TMM_ADDR">
+            <obj_property name="ElementShortName">T_TMM_ADDR[15:0]</obj_property>
+            <obj_property name="ObjectShortName">T_TMM_ADDR[15:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/R_TMM_ADDR">
+            <obj_property name="ElementShortName">R_TMM_ADDR[15:0]</obj_property>
+            <obj_property name="ObjectShortName">R_TMM_ADDR[15:0]</obj_property>
+         </wvobject>
+         <wvobject type="other" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/TMM_ADDR_EN">
+            <obj_property name="ElementShortName">TMM_ADDR_EN</obj_property>
+            <obj_property name="ObjectShortName">TMM_ADDR_EN</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/TMM_ADDR">
+            <obj_property name="ElementShortName">TMM_ADDR[15:0]</obj_property>
+            <obj_property name="ObjectShortName">TMM_ADDR[15:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/TMM_DATA">
+            <obj_property name="ElementShortName">TMM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">TMM_DATA[14:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/T_TMM_DATA">
+            <obj_property name="ElementShortName">T_TMM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">T_TMM_DATA[14:0]</obj_property>
+         </wvobject>
+         <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/R_TMM_DATA">
+            <obj_property name="ElementShortName">R_TMM_DATA[14:0]</obj_property>
+            <obj_property name="ObjectShortName">R_TMM_DATA[14:0]</obj_property>
+         </wvobject>
+      </wvobject>
       <wvobject type="logic" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/SPRITE_ACTIVE">
          <obj_property name="ElementShortName">SPRITE_ACTIVE</obj_property>
          <obj_property name="ObjectShortName">SPRITE_ACTIVE</obj_property>
@@ -663,34 +719,9 @@
          <obj_property name="ElementShortName">FAM_DATA[15:0]</obj_property>
          <obj_property name="ObjectShortName">FAM_DATA[15:0]</obj_property>
       </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/TMM_ADDR">
-         <obj_property name="ElementShortName">TMM_ADDR[15:0]</obj_property>
-         <obj_property name="ObjectShortName">TMM_ADDR[15:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/TMM_DATA">
-         <obj_property name="ElementShortName">TMM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">TMM_DATA[14:0]</obj_property>
-      </wvobject>
       <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/CIDX">
          <obj_property name="ElementShortName">CIDX[5:0]</obj_property>
          <obj_property name="ObjectShortName">CIDX[5:0]</obj_property>
-         <obj_property name="isExpanded"></obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/R_TMM_ADDR">
-         <obj_property name="ElementShortName">R_TMM_ADDR[15:0]</obj_property>
-         <obj_property name="ObjectShortName">R_TMM_ADDR[15:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/R_TMM_DATA">
-         <obj_property name="ElementShortName">R_TMM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">R_TMM_DATA[14:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/T_TMM_ADDR">
-         <obj_property name="ElementShortName">T_TMM_ADDR[15:0]</obj_property>
-         <obj_property name="ObjectShortName">T_TMM_ADDR[15:0]</obj_property>
-      </wvobject>
-      <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/T_TMM_DATA">
-         <obj_property name="ElementShortName">T_TMM_DATA[14:0]</obj_property>
-         <obj_property name="ObjectShortName">T_TMM_DATA[14:0]</obj_property>
       </wvobject>
       <wvobject type="array" fp_name="/ppu_tb/uut/\foreground_sprites(16)\/foreground_sprite/T_CIDX">
          <obj_property name="ElementShortName">T_CIDX[5:0]</obj_property>