diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 11:51:00 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 11:51:00 -0400 |
| commit | b29e5ee203b6fa4592180ef6cca732462cca9af6 (patch) | |
| tree | 7634ed34bcc174f6df004a473b277d1cc3f8f218 /engine/movie | |
| parent | Merge pull request #256 from Rangi42/master (diff) | |
| download | pokeyellow-b29e5ee203b6fa4592180ef6cca732462cca9af6.tar.gz pokeyellow-b29e5ee203b6fa4592180ef6cca732462cca9af6.tar.xz pokeyellow-b29e5ee203b6fa4592180ef6cca732462cca9af6.zip | |
Add subdirectories to data/ similar to pokecrystal
Top level text/ is now solely for the former text/maps/ files, and other files are in their respective subdirectories in data/.
Diffstat (limited to 'engine/movie')
| -rwxr-xr-x | engine/movie/credits.asm | 6 | ||||
| -rwxr-xr-x | engine/movie/oak_speech/oak_speech2.asm | 4 | ||||
| -rwxr-xr-x | engine/movie/title.asm (renamed from engine/movie/titlescreen.asm) | 2 | ||||
| -rwxr-xr-x | engine/movie/title2.asm (renamed from engine/movie/titlescreen2.asm) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index f820aae3..f6900602 100755 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -104,7 +104,7 @@ DisplayCreditsMon: ld [rBGP], a ret -INCLUDE "data/credit_mons.asm" +INCLUDE "data/credits/credits_mons.asm" ScrollCreditsMonLeft: ld h, b @@ -261,9 +261,9 @@ TheEndTextString: db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@" db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@" -INCLUDE "data/credits_order.asm" +INCLUDE "data/credits/credits_order.asm" -INCLUDE "text/credits_text.asm" +INCLUDE "data/credits/credits_text.asm" TheEndGfx: INCBIN "gfx/intro_credits/the_end.2bpp" diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm index fdc9ffa3..d7112440 100755 --- a/engine/movie/oak_speech/oak_speech2.asm +++ b/engine/movie/oak_speech/oak_speech2.asm @@ -187,7 +187,7 @@ DisplayIntroNameTextBox: .namestring db "NAME@" -INCLUDE "text/player_names.asm" +INCLUDE "data/player_names.asm" GetDefaultName: ; a = name index @@ -213,7 +213,7 @@ GetDefaultName: ld bc, $14 jp CopyData -INCLUDE "text/player_names_list.asm" +INCLUDE "data/player_names_list.asm" TextTerminator_6b20: db "@" diff --git a/engine/movie/titlescreen.asm b/engine/movie/title.asm index c30f83a9..4bdbb05d 100755 --- a/engine/movie/titlescreen.asm +++ b/engine/movie/title.asm @@ -382,7 +382,7 @@ CopyrightTextString: next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc. db "@" -INCLUDE "data/title_mons.asm" +INCLUDE "data/pokemon/title_mons.asm" ; prints version text (red, blue) PrintGameVersionOnTitleScreen: diff --git a/engine/movie/titlescreen2.asm b/engine/movie/title2.asm index 2346fcc5..2346fcc5 100755 --- a/engine/movie/titlescreen2.asm +++ b/engine/movie/title2.asm |