diff --git a/Menu/menu_gfx_table.asm b/Menu/menu_gfx_table.asm
index 0f205d2..cf0697f 100644
--- a/Menu/menu_gfx_table.asm
+++ b/Menu/menu_gfx_table.asm
@@ -2,14 +2,13 @@
 ; Item Graphics
 ; Lack of an item will be handled by the "NothingGFX" data
 ; Everything else will be used as follows:
-;   dw top left, top right, bottom left, bottom right  ; val = 1
-;   dw top left, top right, bottom left, bottom right  ; val = 2
+;   top left, top right, bottom left, bottom right
 ; =========================================================
 
 NothingGFX:
 	dw $20F5, $20F5, $20F5, $20F5
   
-; -------------------------------------
+; ---------------------------------------------------------
 
 BowsGFX:
 	dw $28BA, $28E9, $28E8, $28CB ; Empty bow
@@ -17,105 +16,105 @@ BowsGFX:
 	dw $28BA, $28E9, $28E8, $28CB ; Empty silvers bow
 	dw $28BA, $28BB, $24CA, $28CB ; Silver bow and arrows
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 BoomsGFX:
 	dw $2CB8, $2CB9, $2CC9, $ACB9 ; Blue boomerang
 	dw $24B8, $24B9, $24C9, $A4B9 ; Red boomerang
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 HookGFX:
 	dw $24F5, $24F6, $24C0, $24F5 ; Hookshot
   dw $2C17, $3531, $2D40, $3541 ; Ball & Chain
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 BombsGFX:
 	dw $2CB2, $2CB3, $2CC2, $6CC2 ; Bombs
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 PowderGFX:
 	dw $2444, $2445, $2446, $2447 ; Mushroom
 	dw $283B, $283C, $283D, $283E ; Powder
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 Fire_rodGFX:
 	dw $24B0, $24B1, $24C0, $24C1 ; Fire Rod
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 Ice_rodGFX:
 	dw $2CB0, $2CBE, $2CC0, $2CC1 ; Ice Rod
 
-; -------------------------------------
+; ---------------------------------------------------------
 ; formerly Quake
 
 DekuMaskGFX:
   dw $2066, $6066, $2076, $6076
 
-; -------------------------------------
+; ---------------------------------------------------------
 ; formerly Ether
 
 BunnyHoodGFX:
   dw $3469, $7469, $3479, $7479
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 LampGFX:
 	dw $24BC, $24BD, $24CC, $64CC
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 HammerGFX:
 	dw $24B6, $24B7, $20C6, $24C7
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 ShovelGFX:
 	dw $30D0, $20D1, $30E0, $30E1
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 OcarinaGFX:
   dw $2CD4, $2CD5, $2CE4, $2CE5
   dw $3CD4, $3CD5, $3CE4, $3CE5 ; Green
   dw $24D4, $24D5, $24E4, $24E5 ; Red
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 BigKeyGFX:
   dw $34D6, $74D6, $34E6, $34E7
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 BigChestKeyGFX:
   dw $34BF, $74BF, $34E6, $34E7
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 MapGFX:
   dw $2936, $2937, $2946, $2947 
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 TreasureChestGFX:
   dw $294B, $294C, $294D, $294E
 
-; -------------------------------------
+; ---------------------------------------------------------
 ; formerly fishing net
 
 JumpFeatherGFX:
   dw $2840, $2841, $3C42, $3C43
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 BookGFX:
 	dw $3CA5, $3CA6, $3CD8, $3CD9 
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 BottlesGFX:
   dw $2044, $2045, $2046, $2047 ; Mushroom
@@ -127,12 +126,12 @@ BottlesGFX:
 	dw $2837, $2838, $2839, $283A ; Bee
 	dw $2837, $2838, $2839, $283A ; Good bee
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 SomariaGFX:
 	dw $24DC, $24DD, $24EC, $24ED 
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 ByrnaGFX:
 	dw $2CDC, $2CDD, $2CEC, $2CED
@@ -143,13 +142,13 @@ FishingRodGFX:
 PortalRodGFX:
   dw $2CF0, $24F1, $30EC, $24F2
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 ; formerly Magic Cape
 StoneMaskGFX:
   dw $30B4, $30B5, $30C4, $30C5 
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 WolfMaskGFX:
   dw $3086, $7086, $3087, $7087
@@ -157,13 +156,13 @@ WolfMaskGFX:
   dw $3086, $7086, $3087, $7087
   dw $3086, $7086, $3087, $7087
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 ; Formerly Bombos
 ZoraMaskGFX:
   dw $2C88, $6C88, $2C89, $6C89
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 MirrorGFX:
 	dw $2C72, $2C73, $2C62, $2C63 ; Mirror
@@ -172,7 +171,7 @@ MirrorGFX:
 
 ; =============================================================================
 ;  Collectibles
-; -------------------------------------
+; ---------------------------------------------------------
 
 QuarterNoteGFX:
   dw $30AA, $306B, $307A, $306A ; Gray Note
@@ -181,7 +180,7 @@ QuarterNoteGFX:
   dw $24AA, $246B, $247A, $246A ; Red Note
   dw $34AA, $346B, $347A, $346A ; Gold Note
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 TradeQuestGFX:
   dw $3D36, $3D37, $3D46, $3D47 ; Yoshi Doll
@@ -191,30 +190,29 @@ TradeQuestGFX:
   dw $3D7E, $3D7F, $356C, $756C ; Pineapple
 
 
-; =============================================================================
+; =========================================================
 ; Equipped Items
-; -------------------------------------
 
 PegasusBootsGFX:
   dw $2429, $242A, $242B, $242C ; Pegasus Boots 
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 PowerGloveGFX:
   dw $30DA, $30DB, $30EA, $30EB ; Worn-Out Glove
   dw $28DA, $28DB, $28EA, $28EB ; Power Glove
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 FlippersGFX:
   dw $2C9A, $2C9B, $2C9D, $2C9E 
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 MoonPearlGFX:
   dw $2433, $2434, $2435, $2436 
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 SwordGFX:
   dw $2C64, $2CCE, $2C75, $EC64 ; level one 
@@ -222,14 +220,14 @@ SwordGFX:
   dw $3464, $3465, $3475, $3429 ; level three
   dw $3464, $3465, $3475, $3429 ; level four
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 ShieldGFX:
   dw $2CFD, $6CFD, $2CFE, $6CFE ; baby shield
   dw $2CFF, $6CFF, $2C9F, $6C9F ; island shield
   dw $2C80, $2C81, $2C8D, $2C8E ; mirror shield
 
-; -------------------------------------
+; ---------------------------------------------------------
 
 TunicGFX:
   dw $3C68, $7C68, $3C78, $7C78 ; green tunic