pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Group miscellaneous graphics from main.asm into their own object file

Browse Source 
Fixes #824
This commit is contained in:
Rangi 2021-04-13 12:51:27 -04:00
parent af4558f0df
commit a90d7bed73
4 changed files with 75 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -12,6 +12,7 @@ data/pokemon/egg_moves.o \
data/pokemon/evos_attacks.o \ data/pokemon/evos_attacks.o \
engine/movie/credits.o \ engine/movie/credits.o \
engine/overworld/events.o \ engine/overworld/events.o \
gfx/misc.o \
gfx/pics.o \ gfx/pics.o \
gfx/sprites.o \ gfx/sprites.o \
gfx/tilesets.o \ gfx/tilesets.o \

58
gfx/misc.asm Normal file
View File

@ -0,0 +1,58 @@
SECTION "Trainer Backpics", ROMX
ChrisBackpic::
INCBIN "gfx/player/chris_back.2bpp.lz"
DudeBackpic::
INCBIN "gfx/battle/dude.2bpp.lz"
SECTION "Shrink Pics", ROMX
Shrink1Pic::
INCBIN "gfx/new_game/shrink1.2bpp.lz"
Shrink2Pic::
INCBIN "gfx/new_game/shrink2.2bpp.lz"
SECTION "Unused Egg Pic", ROMX
UnusedEggPic::
; The G/S Egg pic. This is shifted up a few pixels.
INCBIN "gfx/pokemon/egg/unused_front.2bpp.lz"
SECTION "The End", ROMX
TheEndGFX::
INCBIN "gfx/credits/theend.2bpp"
SECTION "Font Inversed", ROMX
FontInversed::
INCBIN "gfx/font/font_inversed.1bpp"
SECTION "Copyright", ROMX
CopyrightGFX::
INCBIN "gfx/splash/copyright.2bpp"
SECTION "Intro Logo", ROMX
GameFreakDittoGFX::
INCBIN "gfx/splash/ditto.2bpp.lz"
SECTION "Unown Font", ROMX
UnownFont::
INCBIN "gfx/font/unown_font.2bpp"
SECTION "Pokégear GFX", ROMX
PokegearGFX::
INCBIN "gfx/pokegear/pokegear.2bpp.lz"

13
layout.link
View File

@ -53,6 +53,7 @@ ROMX $09
"bank9" "bank9"
ROMX $0a ROMX $0a
"bankA" "bankA"
"Trainer Backpics"
ROMX $0b ROMX $0b
"bankB" "bankB"
ROMX $0c ROMX $0c
@ -72,8 +73,11 @@ ROMX $12
"Crystal Features 1" "Crystal Features 1"
ROMX $13 ROMX $13
"bank13" "bank13"
"Shrink Pics"
"bank13_2"
ROMX $14 ROMX $14
"bank14" "bank14"
"Unused Egg Pic"
ROMX $15 ROMX $15
"Map Scripts 1" "Map Scripts 1"
ROMX $16 ROMX $16
@ -135,6 +139,7 @@ ROMX $31
"Sprites 2" "Sprites 2"
ROMX $32 ROMX $32
"bank32" "bank32"
"The End"
ROMX $33 ROMX $33
"Move Animations" "Move Animations"
"Extra Songs 2" "Extra Songs 2"
@ -150,6 +155,7 @@ ROMX $37
ROMX $38 ROMX $38
"bank38" "bank38"
ROMX $39 ROMX $39
"Copyright"
"bank39" "bank39"
ROMX $3a ROMX $3a
"Audio" "Audio"
@ -290,9 +296,12 @@ ROMX $73
ROMX $74 ROMX $74
"Pokedex Entries 193-251" "Pokedex Entries 193-251"
ROMX $77 ROMX $77
"bank77" "Unown Font"
"Print Party"
"Tileset Data 7" "Tileset Data 7"
"bank77_2" "bank77"
"Pokégear GFX"
"European Mail"
ROMX $78 ROMX $78
"Debug Room" "Debug Room"
"Tileset Data 8" "Tileset Data 8"

44
main.asm
View File

@ -130,12 +130,6 @@ INCLUDE "engine/link/link.asm"
INCLUDE "engine/overworld/wildmons.asm" INCLUDE "engine/overworld/wildmons.asm"
INCLUDE "engine/battle/link_result.asm" INCLUDE "engine/battle/link_result.asm"
ChrisBackpic:
INCBIN "gfx/player/chris_back.2bpp.lz"
DudeBackpic:
INCBIN "gfx/battle/dude.2bpp.lz"
SECTION "bankB", ROMX SECTION "bankB", ROMX
@ -211,11 +205,8 @@ INCLUDE "data/maps/scenes.asm"
INCLUDE "engine/overworld/load_map_part.asm" INCLUDE "engine/overworld/load_map_part.asm"
INCLUDE "engine/phone/phonering_copytilemapatonce.asm" INCLUDE "engine/phone/phonering_copytilemapatonce.asm"
Shrink1Pic:
INCBIN "gfx/new_game/shrink1.2bpp.lz"
Shrink2Pic: SECTION "bank13_2", ROMX
INCBIN "gfx/new_game/shrink2.2bpp.lz"
INCLUDE "engine/link/link_2.asm" INCLUDE "engine/link/link_2.asm"
INCLUDE "engine/rtc/reset_password.asm" INCLUDE "engine/rtc/reset_password.asm"
@ -261,10 +252,6 @@ INCLUDE "data/pokemon/base_stats.asm"
INCLUDE "data/pokemon/names.asm" INCLUDE "data/pokemon/names.asm"
INCLUDE "data/pokemon/unused_pic_banks.asm" INCLUDE "data/pokemon/unused_pic_banks.asm"
UnusedEggPic::
; The G/S Egg pic. This is shifted up a few pixels.
INCBIN "gfx/pokemon/egg/unused_front.2bpp.lz"
SECTION "Crystal Phone Text", ROMX SECTION "Crystal Phone Text", ROMX
@ -425,9 +412,6 @@ INCLUDE "engine/battle_anims/bg_effects.asm"
INCLUDE "data/moves/animations.asm" INCLUDE "data/moves/animations.asm"
INCLUDE "engine/events/poisonstep_pals.asm" INCLUDE "engine/events/poisonstep_pals.asm"
TheEndGFX::
INCBIN "gfx/credits/theend.2bpp"
SECTION "Move Animations", ROMX SECTION "Move Animations", ROMX
@ -461,12 +445,6 @@ INCLUDE "gfx/pokemon/frame_pointers.asm"
INCLUDE "gfx/pokemon/kanto_frames.asm" INCLUDE "gfx/pokemon/kanto_frames.asm"
SECTION "Font Inversed", ROMX
FontInversed:
INCBIN "gfx/font/font_inversed.1bpp"
SECTION "Pic Animations 3", ROMX SECTION "Pic Animations 3", ROMX
INCLUDE "gfx/pokemon/johto_frames.asm" INCLUDE "gfx/pokemon/johto_frames.asm"
@ -485,9 +463,6 @@ INCLUDE "engine/pokemon/bills_pc.asm"
SECTION "bank39", ROMX SECTION "bank39", ROMX
CopyrightGFX::
INCBIN "gfx/splash/copyright.2bpp"
INCLUDE "engine/menus/options_menu.asm" INCLUDE "engine/menus/options_menu.asm"
INCLUDE "engine/movie/splash.asm" INCLUDE "engine/movie/splash.asm"
INCLUDE "engine/movie/intro.asm" INCLUDE "engine/movie/intro.asm"
@ -535,12 +510,6 @@ SECTION "mobile42", ROMX
INCLUDE "mobile/mobile_42.asm" INCLUDE "mobile/mobile_42.asm"
SECTION "Intro Logo", ROMX
GameFreakDittoGFX:
INCBIN "gfx/splash/ditto.2bpp.lz"
SECTION "Title", ROMX SECTION "Title", ROMX
INCLUDE "engine/movie/unused_title.asm" INCLUDE "engine/movie/unused_title.asm"
@ -671,15 +640,12 @@ INCLUDE "data/moves/names.asm"
INCLUDE "engine/overworld/landmarks.asm" INCLUDE "engine/overworld/landmarks.asm"
SECTION "bank77", ROMX SECTION "Print Party", ROMX
UnownFont:
INCBIN "gfx/font/unown_font.2bpp"
INCLUDE "engine/printer/print_party.asm" INCLUDE "engine/printer/print_party.asm"
SECTION "bank77_2", ROMX SECTION "bank77", ROMX
INCLUDE "engine/rtc/print_hours_mins.asm" INCLUDE "engine/rtc/print_hours_mins.asm"
INCLUDE "engine/events/diploma.asm" INCLUDE "engine/events/diploma.asm"
@ -687,8 +653,8 @@ INCLUDE "engine/pokedex/pokedex_3.asm"
INCLUDE "engine/events/catch_tutorial_input.asm" INCLUDE "engine/events/catch_tutorial_input.asm"
INCLUDE "engine/pokegear/townmap_convertlinebreakcharacters.asm" INCLUDE "engine/pokegear/townmap_convertlinebreakcharacters.asm"
PokegearGFX:
INCBIN "gfx/pokegear/pokegear.2bpp.lz" SECTION "European Mail", ROMX
INCLUDE "engine/pokemon/european_mail.asm" INCLUDE "engine/pokemon/european_mail.asm"