Separate new_game graphics

21 files changed, 17 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 8c3764560..d26e991b4 100644
--- a/Makefile
+++ b/Makefile
@@ -140,8 +140,8 @@ gfx/pokemon/%/front.animated.tilemap: gfx/pokemon/%/front.2bpp gfx/pokemon/%/fro
 
 ### Misc file-specific graphics rules
 
-gfx/shrink/shrink1.2bpp: rgbgfx += -h
-gfx/shrink/shrink2.2bpp: rgbgfx += -h
+gfx/new_game/shrink1.2bpp: rgbgfx += -h
+gfx/new_game/shrink2.2bpp: rgbgfx += -h
 
 gfx/trainers/%.2bpp: rgbgfx += -h
 gfx/trainers/%.pal: gfx/trainers/%.gbcpal
diff --git a/engine/crystal_colors.asm b/engine/crystal_cgb.asm
index 9fd01aac0..9fd01aac0 100755
--- a/engine/crystal_colors.asm
+++ b/engine/crystal_cgb.asm
diff --git a/engine/init_gender.asm b/engine/init_gender.asm
index 540a0b63f..76b1640d9 100755
--- a/engine/init_gender.asm
+++ b/engine/init_gender.asm
@@ -96,7 +96,7 @@ LoadGenderScreenPal: ; 48e47 (12:4e47)
 ; 48e5c (12:4e5c)
 
 .Palette: ; 48e5c
-INCLUDE "gfx/intro/gender_screen.pal"
+INCLUDE "gfx/new_game/gender_screen.pal"
 ; 48e64
 
 LoadGenderScreenLightBlueTile: ; 48e64 (12:4e64)
@@ -108,4 +108,4 @@ LoadGenderScreenLightBlueTile: ; 48e64 (12:4e64)
 ; 48e71 (12:4e71)
 
 .LightBlueTile: ; 48e71
-INCBIN "gfx/intro/gender_screen.2bpp"
+INCBIN "gfx/new_game/gender_screen.2bpp"
diff --git a/engine/namingscreen.asm b/engine/naming_screen.asm
index f9832dd98..b53a3b09d 100755
--- a/engine/namingscreen.asm
+++ b/engine/naming_screen.asm
@@ -938,26 +938,26 @@ LoadNamingScreenGFX: ; 11c51
 ; 11cb7
 
 NamingScreenGFX_Border: ; 11cb7
-INCBIN "gfx/namingscreen/border.2bpp"
+INCBIN "gfx/naming_screen/border.2bpp"
 ; 11cc7
 
 NamingScreenGFX_Cursor: ; 11cc7
-INCBIN "gfx/namingscreen/cursor.2bpp"
+INCBIN "gfx/naming_screen/cursor.2bpp"
 ; 11ce7
 
 INCLUDE "data/name_input_chars.asm"
 ; 11e5d
 
 NamingScreenGFX_End: ; unused
-INCBIN "gfx/namingscreen/end.1bpp"
+INCBIN "gfx/naming_screen/end.1bpp"
 ; 11e6d
 
 NamingScreenGFX_MiddleLine:
-INCBIN "gfx/namingscreen/middle_line.1bpp"
+INCBIN "gfx/naming_screen/middle_line.1bpp"
 ; 11e6d
 
 NamingScreenGFX_UnderLine: ; 11e6d
-INCBIN "gfx/namingscreen/underline.1bpp"
+INCBIN "gfx/naming_screen/underline.1bpp"
 ; 11e75
 
 _ComposeMailMessage: ; 11e75 (mail?)
@@ -1033,7 +1033,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
 ; 11ef4 (4:5ef4)
 
 .MailIcon: ; 11ef4
-INCBIN "gfx/icons/mail2.2bpp"
+INCBIN "gfx/icons/mail_big.2bpp"
 ; 11f74
 
 .initwNamingScreenMaxNameLength ; 11f74 (4:5f74)
diff --git a/engine/timeset.asm b/engine/timeset.asm
index b97103ed1..67aa9973e 100755
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -400,11 +400,11 @@ OakText_ResponseToSetTime: ; 0x908b8
 ; 0x908fb
 
 TimeSetBackgroundGFX: ; 908fb
-INCBIN "gfx/timeset/background.1bpp"
+INCBIN "gfx/new_game/timeset_bg.1bpp"
 TimeSetUpArrowGFX: ; 90903
-INCBIN "gfx/timeset/up_arrow.1bpp"
+INCBIN "gfx/new_game/up_arrow.1bpp"
 TimeSetDownArrowGFX: ; 9090b
-INCBIN "gfx/timeset/down_arrow.1bpp"
+INCBIN "gfx/new_game/down_arrow.1bpp"
 ; 90913
 
 Special_SetDayOfWeek: ; 90913
diff --git a/gfx/icons/mail2.png b/gfx/icons/mail_big.png
index 7ad25edbf..7ad25edbf 100644
--- a/gfx/icons/mail2.png
+++ b/gfx/icons/mail_big.png
diff --git a/gfx/namingscreen/border.png b/gfx/naming_screen/border.png
index 36935ab82..36935ab82 100644
--- a/gfx/namingscreen/border.png
+++ b/gfx/naming_screen/border.png
diff --git a/gfx/namingscreen/cursor.png b/gfx/naming_screen/cursor.png
index a0429a3ad..a0429a3ad 100644
--- a/gfx/namingscreen/cursor.png
+++ b/gfx/naming_screen/cursor.png
diff --git a/gfx/namingscreen/end.png b/gfx/naming_screen/end.png
index c8e132b92..c8e132b92 100644
--- a/gfx/namingscreen/end.png
+++ b/gfx/naming_screen/end.png
diff --git a/gfx/namingscreen/middle_line.png b/gfx/naming_screen/middle_line.png
index a34e82bf1..a34e82bf1 100644
--- a/gfx/namingscreen/middle_line.png
+++ b/gfx/naming_screen/middle_line.png
diff --git a/gfx/namingscreen/underline.png b/gfx/naming_screen/underline.png
index e92cd4d6a..e92cd4d6a 100644
--- a/gfx/namingscreen/underline.png
+++ b/gfx/naming_screen/underline.png
diff --git a/gfx/timeset/down_arrow.png b/gfx/new_game/down_arrow.png
index 33803e197..33803e197 100644
--- a/gfx/timeset/down_arrow.png
+++ b/gfx/new_game/down_arrow.png
diff --git a/gfx/intro/gender_screen.pal b/gfx/new_game/gender_screen.pal
index ca8ae04aa..ca8ae04aa 100644
--- a/gfx/intro/gender_screen.pal
+++ b/gfx/new_game/gender_screen.pal
diff --git a/gfx/intro/gender_screen.png b/gfx/new_game/gender_screen.png
index 726178132..726178132 100644
--- a/gfx/intro/gender_screen.png
+++ b/gfx/new_game/gender_screen.png
diff --git a/gfx/shrink/shrink1.2bpp.lz.d4443930 b/gfx/new_game/shrink1.2bpp.lz.d4443930
index 284bee8c2..284bee8c2 100644
--- a/gfx/shrink/shrink1.2bpp.lz.d4443930
+++ b/gfx/new_game/shrink1.2bpp.lz.d4443930
diff --git a/gfx/shrink/shrink1.png b/gfx/new_game/shrink1.png
index 6cf5b8077..6cf5b8077 100644
--- a/gfx/shrink/shrink1.png
+++ b/gfx/new_game/shrink1.png
diff --git a/gfx/shrink/shrink2.2bpp.lz.3f58480a b/gfx/new_game/shrink2.2bpp.lz.3f58480a
index df14d5ed4..df14d5ed4 100644
--- a/gfx/shrink/shrink2.2bpp.lz.3f58480a
+++ b/gfx/new_game/shrink2.2bpp.lz.3f58480a
diff --git a/gfx/shrink/shrink2.png b/gfx/new_game/shrink2.png
index 276b4e7c7..276b4e7c7 100644
--- a/gfx/shrink/shrink2.png
+++ b/gfx/new_game/shrink2.png
diff --git a/gfx/timeset/background.png b/gfx/new_game/timeset_bg.png
index e2bd6299c..e2bd6299c 100644
--- a/gfx/timeset/background.png
+++ b/gfx/new_game/timeset_bg.png
diff --git a/gfx/timeset/up_arrow.png b/gfx/new_game/up_arrow.png
index d8cfc7f3f..d8cfc7f3f 100644
--- a/gfx/timeset/up_arrow.png
+++ b/gfx/new_game/up_arrow.png
diff --git a/main.asm b/main.asm
index 57d0e17ec..367f519cf 100644
--- a/main.asm
+++ b/main.asm
@@ -49,7 +49,7 @@ SECTION "bank4", ROMX
 INCLUDE "engine/pack.asm"
 INCLUDE "engine/time.asm"
 INCLUDE "engine/tmhm.asm"
-INCLUDE "engine/namingscreen.asm"
+INCLUDE "engine/naming_screen.asm"
 INCLUDE "engine/events/misc_scripts.asm"
 INCLUDE "engine/events/heal_machine_anim.asm"
 INCLUDE "engine/events/whiteout.asm"
@@ -194,7 +194,7 @@ SECTION "Crystal Features 1", ROMX
 INCLUDE "engine/init_gender.asm"
 INCLUDE "engine/routines/drawkrispackgfx.asm"
 INCLUDE "engine/events/move_tutor.asm"
-INCLUDE "engine/crystal_colors.asm"
+INCLUDE "engine/crystal_cgb.asm"
 INCLUDE "engine/events/celebi.asm"
 INCLUDE "engine/main_menu.asm"
 INCLUDE "mobile/mobile_menu.asm"
@@ -216,10 +216,10 @@ INCLUDE "engine/routines/loadmappart.asm"
 INCLUDE "engine/routines/phonering_copytilemapatonce.asm"
 
 Shrink1Pic: ; 4d249
-INCBIN "gfx/shrink/shrink1.2bpp.lz"
+INCBIN "gfx/new_game/shrink1.2bpp.lz"
 
 Shrink2Pic: ; 4d2d9
-INCBIN "gfx/shrink/shrink2.2bpp.lz"
+INCBIN "gfx/new_game/shrink2.2bpp.lz"
 
 INCLUDE "engine/link_2.asm"
 INCLUDE "engine/delete_save_change_clock.asm"