From fe3ef73a8c2d22da6067bdeab1686a24d527a65e Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Mon, 15 Jan 2018 00:44:40 -0500
Subject: [PATCH] Group unused data

---
 constants/sprite_anim_constants.asm                           | 2 +-
 data/sprite_anims/oam.asm                                     | 2 +-
 data/{unused_text => unused}/dakutens.asm                     | 0
 .../gen_1_trainers.asm => unused/gen_1_trainer_names.asm}     | 0
 .../sweet_honey.asm => unused/sweet_honey_text.asm}           | 0
 data/{unknown_table.asm => unused/unknown_53d84.asm}          | 0
 engine/namingscreen.asm                                       | 2 +-
 main.asm                                                      | 4 ++--
 maps/GoldenrodNameRater.asm                                   | 2 +-
 9 files changed, 6 insertions(+), 6 deletions(-)
 rename data/{unused_text => unused}/dakutens.asm (100%)
 rename data/{unused_text/gen_1_trainers.asm => unused/gen_1_trainer_names.asm} (100%)
 rename data/{unused_text/sweet_honey.asm => unused/sweet_honey_text.asm} (100%)
 rename data/{unknown_table.asm => unused/unknown_53d84.asm} (100%)

diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm
index f1cf6a6c4..2aeb5027a 100644
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -189,7 +189,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
 	const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3          ; 0a
 	const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4          ; 0b
 	const SPRITE_ANIM_OAMSET_GS_INTRO_NOTE              ; 0c
-	const SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_NOTE        ; 0d
+	const SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE    ; 0d
 	const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1      ; 0e
 	const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2      ; 0f
 	const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3      ; 10
diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm
index 31bb3fe15..bfd5cbcd3 100644
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -14,7 +14,7 @@ SpriteAnimOAMData: ; 8d94d
 	dbw $00, .OAMData_GSIntroLapras            ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3
 	dbw $06, .OAMData_GSIntroLapras            ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4
 	dbw $0c, .OAMData_GSIntroNote              ; SPRITE_ANIM_OAMSET_GS_INTRO_NOTE
-	dbw $0d, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_NOTE
+	dbw $0d, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE
 	dbw $00, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1
 	dbw $04, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2
 	dbw $08, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3
diff --git a/data/unused_text/dakutens.asm b/data/unused/dakutens.asm
similarity index 100%
rename from data/unused_text/dakutens.asm
rename to data/unused/dakutens.asm
diff --git a/data/unused_text/gen_1_trainers.asm b/data/unused/gen_1_trainer_names.asm
similarity index 100%
rename from data/unused_text/gen_1_trainers.asm
rename to data/unused/gen_1_trainer_names.asm
diff --git a/data/unused_text/sweet_honey.asm b/data/unused/sweet_honey_text.asm
similarity index 100%
rename from data/unused_text/sweet_honey.asm
rename to data/unused/sweet_honey_text.asm
diff --git a/data/unknown_table.asm b/data/unused/unknown_53d84.asm
similarity index 100%
rename from data/unknown_table.asm
rename to data/unused/unknown_53d84.asm
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index f16f7176f..75d25179c 100755
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -771,7 +771,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
 
 ; 11b56
 
-INCLUDE "data/unused_text/dakutens.asm"
+INCLUDE "data/unused/dakutens.asm"
 
 ; 11bbc
 
diff --git a/main.asm b/main.asm
index f13481e2c..174063b50 100644
--- a/main.asm
+++ b/main.asm
@@ -253,7 +253,7 @@ INCLUDE "engine/events/basement_key.asm"
 INCLUDE "engine/events/sacred_ash.asm"
 INCLUDE "engine/tempmon.asm"
 INCLUDE "engine/types.asm"
-INCLUDE "data/unused_text/gen_1_trainers.asm"
+INCLUDE "data/unused/gen_1_trainer_names.asm"
 INCLUDE "engine/mon_stats.asm"
 INCLUDE "engine/routines/initlist.asm"
 INCLUDE "engine/experience.asm"
@@ -262,7 +262,7 @@ INCLUDE "gfx/load_pics.asm"
 INCLUDE "engine/move_mon_wo_mail.asm"
 INCLUDE "data/pokemon/base_stats.asm"
 INCLUDE "data/pokemon/names.asm"
-INCLUDE "data/unknown_table.asm"
+INCLUDE "data/unused/unknown_53d84.asm"
 
 UnknownEggPic:: ; 53d9c
 ; Another egg pic. This is shifted up a few pixels.
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index 65873f94c..a9effc92d 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf:
 GoldenrodNameRaterRadio:
 	jumpstd radio2
 
-INCLUDE "data/unused_text/sweet_honey.asm"
+INCLUDE "data/unused/sweet_honey_text.asm"
 
 GoldenrodNameRater_MapEventHeader:
 	; filler