Separate new_game graphics

This commit is contained in:
Remy Oukaour 2018-01-21 13:58:16 -05:00
parent 732bb36c86
commit a8eb44b6e3
21 changed files with 17 additions and 17 deletions

View File

@ -140,8 +140,8 @@ gfx/pokemon/%/front.animated.tilemap: gfx/pokemon/%/front.2bpp gfx/pokemon/%/fro
### Misc file-specific graphics rules ### Misc file-specific graphics rules
gfx/shrink/shrink1.2bpp: rgbgfx += -h gfx/new_game/shrink1.2bpp: rgbgfx += -h
gfx/shrink/shrink2.2bpp: rgbgfx += -h gfx/new_game/shrink2.2bpp: rgbgfx += -h
gfx/trainers/%.2bpp: rgbgfx += -h gfx/trainers/%.2bpp: rgbgfx += -h
gfx/trainers/%.pal: gfx/trainers/%.gbcpal gfx/trainers/%.pal: gfx/trainers/%.gbcpal

View File

@ -96,7 +96,7 @@ LoadGenderScreenPal: ; 48e47 (12:4e47)
; 48e5c (12:4e5c) ; 48e5c (12:4e5c)
.Palette: ; 48e5c .Palette: ; 48e5c
INCLUDE "gfx/intro/gender_screen.pal" INCLUDE "gfx/new_game/gender_screen.pal"
; 48e64 ; 48e64
LoadGenderScreenLightBlueTile: ; 48e64 (12:4e64) LoadGenderScreenLightBlueTile: ; 48e64 (12:4e64)
@ -108,4 +108,4 @@ LoadGenderScreenLightBlueTile: ; 48e64 (12:4e64)
; 48e71 (12:4e71) ; 48e71 (12:4e71)
.LightBlueTile: ; 48e71 .LightBlueTile: ; 48e71
INCBIN "gfx/intro/gender_screen.2bpp" INCBIN "gfx/new_game/gender_screen.2bpp"

View File

@ -938,26 +938,26 @@ LoadNamingScreenGFX: ; 11c51
; 11cb7 ; 11cb7
NamingScreenGFX_Border: ; 11cb7 NamingScreenGFX_Border: ; 11cb7
INCBIN "gfx/namingscreen/border.2bpp" INCBIN "gfx/naming_screen/border.2bpp"
; 11cc7 ; 11cc7
NamingScreenGFX_Cursor: ; 11cc7 NamingScreenGFX_Cursor: ; 11cc7
INCBIN "gfx/namingscreen/cursor.2bpp" INCBIN "gfx/naming_screen/cursor.2bpp"
; 11ce7 ; 11ce7
INCLUDE "data/name_input_chars.asm" INCLUDE "data/name_input_chars.asm"
; 11e5d ; 11e5d
NamingScreenGFX_End: ; unused NamingScreenGFX_End: ; unused
INCBIN "gfx/namingscreen/end.1bpp" INCBIN "gfx/naming_screen/end.1bpp"
; 11e6d ; 11e6d
NamingScreenGFX_MiddleLine: NamingScreenGFX_MiddleLine:
INCBIN "gfx/namingscreen/middle_line.1bpp" INCBIN "gfx/naming_screen/middle_line.1bpp"
; 11e6d ; 11e6d
NamingScreenGFX_UnderLine: ; 11e6d NamingScreenGFX_UnderLine: ; 11e6d
INCBIN "gfx/namingscreen/underline.1bpp" INCBIN "gfx/naming_screen/underline.1bpp"
; 11e75 ; 11e75
_ComposeMailMessage: ; 11e75 (mail?) _ComposeMailMessage: ; 11e75 (mail?)
@ -1033,7 +1033,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
; 11ef4 (4:5ef4) ; 11ef4 (4:5ef4)
.MailIcon: ; 11ef4 .MailIcon: ; 11ef4
INCBIN "gfx/icons/mail2.2bpp" INCBIN "gfx/icons/mail_big.2bpp"
; 11f74 ; 11f74
.initwNamingScreenMaxNameLength ; 11f74 (4:5f74) .initwNamingScreenMaxNameLength ; 11f74 (4:5f74)

View File

@ -400,11 +400,11 @@ OakText_ResponseToSetTime: ; 0x908b8
; 0x908fb ; 0x908fb
TimeSetBackgroundGFX: ; 908fb TimeSetBackgroundGFX: ; 908fb
INCBIN "gfx/timeset/background.1bpp" INCBIN "gfx/new_game/timeset_bg.1bpp"
TimeSetUpArrowGFX: ; 90903 TimeSetUpArrowGFX: ; 90903
INCBIN "gfx/timeset/up_arrow.1bpp" INCBIN "gfx/new_game/up_arrow.1bpp"
TimeSetDownArrowGFX: ; 9090b TimeSetDownArrowGFX: ; 9090b
INCBIN "gfx/timeset/down_arrow.1bpp" INCBIN "gfx/new_game/down_arrow.1bpp"
; 90913 ; 90913
Special_SetDayOfWeek: ; 90913 Special_SetDayOfWeek: ; 90913

View File

Before

Width:  |  Height:  |  Size: 135 B

After

Width:  |  Height:  |  Size: 135 B

View File

Before

Width:  |  Height:  |  Size: 82 B

After

Width:  |  Height:  |  Size: 82 B

View File

Before

Width:  |  Height:  |  Size: 78 B

After

Width:  |  Height:  |  Size: 78 B

View File

Before

Width:  |  Height:  |  Size: 82 B

After

Width:  |  Height:  |  Size: 82 B

View File

Before

Width:  |  Height:  |  Size: 76 B

After

Width:  |  Height:  |  Size: 76 B

View File

Before

Width:  |  Height:  |  Size: 74 B

After

Width:  |  Height:  |  Size: 74 B

View File

Before

Width:  |  Height:  |  Size: 82 B

After

Width:  |  Height:  |  Size: 82 B

View File

Before

Width:  |  Height:  |  Size: 71 B

After

Width:  |  Height:  |  Size: 71 B

View File

Before

Width:  |  Height:  |  Size: 188 B

After

Width:  |  Height:  |  Size: 188 B

View File

Before

Width:  |  Height:  |  Size: 156 B

After

Width:  |  Height:  |  Size: 156 B

View File

Before

Width:  |  Height:  |  Size: 68 B

After

Width:  |  Height:  |  Size: 68 B

View File

Before

Width:  |  Height:  |  Size: 82 B

After

Width:  |  Height:  |  Size: 82 B

View File

@ -49,7 +49,7 @@ SECTION "bank4", ROMX
INCLUDE "engine/pack.asm" INCLUDE "engine/pack.asm"
INCLUDE "engine/time.asm" INCLUDE "engine/time.asm"
INCLUDE "engine/tmhm.asm" INCLUDE "engine/tmhm.asm"
INCLUDE "engine/namingscreen.asm" INCLUDE "engine/naming_screen.asm"
INCLUDE "engine/events/misc_scripts.asm" INCLUDE "engine/events/misc_scripts.asm"
INCLUDE "engine/events/heal_machine_anim.asm" INCLUDE "engine/events/heal_machine_anim.asm"
INCLUDE "engine/events/whiteout.asm" INCLUDE "engine/events/whiteout.asm"
@ -194,7 +194,7 @@ SECTION "Crystal Features 1", ROMX
INCLUDE "engine/init_gender.asm" INCLUDE "engine/init_gender.asm"
INCLUDE "engine/routines/drawkrispackgfx.asm" INCLUDE "engine/routines/drawkrispackgfx.asm"
INCLUDE "engine/events/move_tutor.asm" INCLUDE "engine/events/move_tutor.asm"
INCLUDE "engine/crystal_colors.asm" INCLUDE "engine/crystal_cgb.asm"
INCLUDE "engine/events/celebi.asm" INCLUDE "engine/events/celebi.asm"
INCLUDE "engine/main_menu.asm" INCLUDE "engine/main_menu.asm"
INCLUDE "mobile/mobile_menu.asm" INCLUDE "mobile/mobile_menu.asm"
@ -216,10 +216,10 @@ INCLUDE "engine/routines/loadmappart.asm"
INCLUDE "engine/routines/phonering_copytilemapatonce.asm" INCLUDE "engine/routines/phonering_copytilemapatonce.asm"
Shrink1Pic: ; 4d249 Shrink1Pic: ; 4d249
INCBIN "gfx/shrink/shrink1.2bpp.lz" INCBIN "gfx/new_game/shrink1.2bpp.lz"
Shrink2Pic: ; 4d2d9 Shrink2Pic: ; 4d2d9
INCBIN "gfx/shrink/shrink2.2bpp.lz" INCBIN "gfx/new_game/shrink2.2bpp.lz"
INCLUDE "engine/link_2.asm" INCLUDE "engine/link_2.asm"
INCLUDE "engine/delete_save_change_clock.asm" INCLUDE "engine/delete_save_change_clock.asm"