Move data/palettes/ .pal files into gfx/

This commit is contained in:
Remy Oukaour 2018-01-09 23:21:32 -05:00
parent efd91fe3db
commit 5c5f8b325f
102 changed files with 97 additions and 102 deletions

View File

@ -1,15 +0,0 @@
db $ab, $03, $57, $24, $ac, $0e, $13, $32
db $be, $30, $5b, $4c, $47, $60, $ed, $f2
db $ab, $03, $55, $26, $aa, $0a, $13, $3a
db $be, $28, $33, $24, $6e, $71, $df, $b0
db $a8, $00, $e5, $e0, $9a, $fc, $f4, $2c
db $fe, $4c, $a3, $5e, $c6, $3a, $ab, $4d
db $a8, $00, $b5, $b0, $de, $e8, $fc, $1c
db $ba, $66, $f7, $0e, $ba, $5e, $43, $bd

View File

@ -1662,7 +1662,7 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37)
; e0c93 (38:4c93)
.palettes ; e0c93
INCLUDE "data/palettes/card_flip.pal"
INCLUDE "gfx/card_flip/card_flip.pal"
; e0cdb
CardFlipLZ03: ; e0cdb

View File

@ -891,11 +891,11 @@ _CGB_PackPals: ; 93d3
; 9439
.ChrisPackPals: ; 9439
INCLUDE "data/palettes/pack.pal"
INCLUDE "gfx/pack/pack.pal"
; 9469
.KrisPackPals: ; 9469
INCLUDE "data/palettes/pack_f.pal"
INCLUDE "gfx/pack/pack_f.pal"
; 9499
_CGB_Pokepic: ; 9499

View File

@ -451,7 +451,7 @@ LoadMailPalettes:
ret
.MailPals:
INCLUDE "data/palettes/mail.pal"
INCLUDE "gfx/mail/mail.pal"
INCLUDE "engine/cgb_layouts.asm"
@ -766,7 +766,7 @@ Function9779: mobile
ret
BattleObjectPals:
INCLUDE "data/palettes/battle_objects.pal"
INCLUDE "gfx/battle_anims/battle_anims.pal"
Function97cc:
; XXX
@ -1197,27 +1197,27 @@ SGBDelayCycles:
jr nz, .wait
ret
INCLUDE "data/palettes/blk_packets.asm"
INCLUDE "gfx/sgb/blk_packets.asm"
INCLUDE "data/palettes/pal_packets.asm"
INCLUDE "gfx/sgb/pal_packets.asm"
PredefPals:
INCLUDE "data/palettes/predef.pal"
INCLUDE "gfx/sgb/predef.pal"
SGBBorderMap:
INCBIN "gfx/sgb/sgb_border.tilemap"
SGBBorderPalettes:
INCLUDE "data/palettes/sgb_border.pal"
INCLUDE "gfx/sgb/sgb_border.pal"
SGBBorder:
INCBIN "gfx/sgb/sgb_border.2bpp"
HPBarPals:
INCLUDE "data/palettes/hp_bar.pal"
INCLUDE "gfx/battle/hp_bar.pal"
ExpBarPalette:
INCLUDE "data/palettes/exp_bar.pal"
INCLUDE "gfx/battle/exp_bar.pal"
INCLUDE "data/pokemon/palettes.asm"
@ -1338,34 +1338,34 @@ Palette_b311: ; b311 not mobile
RGB 00, 00, 00
TilesetBGPalette:
INCLUDE "data/palettes/overworld/tileset_bg.pal"
INCLUDE "gfx/tilesets/bg_tiles.pal"
MapObjectPals::
INCLUDE "data/palettes/overworld/map_objects.pal"
INCLUDE "gfx/sprites/map_objects.pal"
RoofPals:
INCLUDE "data/palettes/overworld/roofs.pal"
INCLUDE "gfx/tilesets/roofs.pal"
DiplomaPalettes:
INCLUDE "data/palettes/diploma.pal"
INCLUDE "gfx/diploma/diploma.pal"
PartyMenuOBPals:
INCLUDE "data/palettes/party_menu.pal"
INCLUDE "gfx/icons/party_menu.pal"
Palettes_b6f1:
INCLUDE "data/palettes/unknown/b6f1.pal"
INCLUDE "gfx/unknown/b6f1.pal"
Palettes_b719:
INCLUDE "data/palettes/unknown/b719.pal"
INCLUDE "gfx/unknown/b719.pal"
MalePokegearPals:
INCLUDE "data/palettes/pokegear.pal"
INCLUDE "gfx/pokegear/pokegear.pal"
FemalePokegearPals:
INCLUDE "data/palettes/pokegear_f.pal"
INCLUDE "gfx/pokegear/pokegear_f.pal"
Palettes_b789:
INCLUDE "data/palettes/unknown/b789.pal"
INCLUDE "gfx/unknown/b789.pal"
SlotMachinePals:
INCLUDE "data/palettes/slot_machine.pal"
INCLUDE "gfx/slots/slots.pal"

View File

@ -540,7 +540,7 @@ GetCreditsPalette: ; 109b2c
ret
CreditsPalettes:
INCLUDE "data/palettes/credits.pal"
INCLUDE "gfx/credits/credits.pal"
; 109bca
Credits_LoadBorderGFX: ; 109bca (42:5bca)

View File

@ -113,7 +113,7 @@ MG_Mobile_Layout_CreatePalBoxes: ; 49384 (12:5384)
; 493e1 (12:53e1)
Palette_493e1: ; 493e1
INCLUDE "data/palettes/mg_mobile.pal"
INCLUDE "gfx/mystery_gift/mg_mobile.pal"
; 49409
LoadOW_BGPal7:: ; 49409
@ -126,7 +126,7 @@ LoadOW_BGPal7:: ; 49409
; 49418
Palette_TextBG7: ; 49418
INCLUDE "data/palettes/overworld/bg_text.pal"
INCLUDE "gfx/font/bg_text.pal"
; 49420
Function49420:: ; 49420 (12:5420)
@ -248,7 +248,7 @@ Function49742: ; 49742
; 49757
.Palette_49757: ; 49757
INCLUDE "data/palettes/unknown/49757.pal"
INCLUDE "gfx/unknown/49757.pal"
; 49797
_InitMG_Mobile_LinkTradePalMap: ; 49797
@ -314,7 +314,7 @@ LoadTradeRoomBGPals: ; 49811
; 49826
TradeRoomPalette: ; 49826
INCLUDE "data/palettes/trade_room.pal"
INCLUDE "gfx/trade/border.pal"
; 49856
InitMG_Mobile_LinkTradePalMap: ; 49856
@ -323,4 +323,4 @@ InitMG_Mobile_LinkTradePalMap: ; 49856
; 4985a
Unknown_4985a: ; unreferenced
INCLUDE "data/palettes/unknown/4985a.asm"
INCLUDE "gfx/unknown/4985a.asm"

View File

@ -341,7 +341,7 @@ GameFreakLogoScene5: ; e47ab (39:47ab)
; e47ac (39:47ac)
GameFreakLogoPalettes: ; e47ac
INCLUDE "data/palettes/crystal_intro/gamefreak_logo.pal"
INCLUDE "gfx/intro/gamefreak_logo.pal"
; e47cc
GameFreakLogo: ; e47cc
@ -1550,7 +1550,7 @@ Intro_Scene24_ApplyPaletteFade: ; e5172 (39:5172)
; e519c (39:519c)
.FadePals: ; e519c
INCLUDE "data/palettes/crystal_intro/fade.pal"
INCLUDE "gfx/intro/fade.pal"
; e51dc
CrystalIntro_InitUnownAnim: ; e51dc (39:51dc)
@ -2088,7 +2088,7 @@ INCBIN "gfx/intro/003.tilemap.lz"
; e5edd
Palette_e5edd: ; e5edd
INCLUDE "data/palettes/crystal_intro/intro_1.pal"
INCLUDE "gfx/intro/intro_1.pal"
; e5f5d
IntroUnownsGFX: ; e5f5d
@ -2124,7 +2124,7 @@ INCBIN "gfx/intro/007.tilemap.lz"
; e65ad
Palette_365ad: ; e65ad
INCLUDE "data/palettes/crystal_intro/intro_2.pal"
INCLUDE "gfx/intro/intro_2.pal"
; e662d
IntroCrystalUnownsGFX: ; e662d
@ -2140,7 +2140,7 @@ INCBIN "gfx/intro/015.tilemap.lz"
; e679d
Palette_e679d: ; e679d
INCLUDE "data/palettes/crystal_intro/intro_3.pal"
INCLUDE "gfx/intro/intro_3.pal"
; e681d
IntroSuicuneCloseGFX: ; e681d
@ -2156,7 +2156,7 @@ INCBIN "gfx/intro/011.tilemap.lz"
; e6d6d
Palette_e6d6d: ; e6d6d
INCLUDE "data/palettes/crystal_intro/intro_4.pal"
INCLUDE "gfx/intro/intro_4.pal"
; e6ded
IntroSuicuneJumpGFX: ; e6ded
@ -2184,7 +2184,7 @@ INCBIN "gfx/intro/013.tilemap.lz"
; e77dd
Palette_e77dd: ; e77dd
INCLUDE "data/palettes/crystal_intro/intro_5.pal"
INCLUDE "gfx/intro/intro_5.pal"
IntroUnownBackGFX: ; e785d
INCBIN "gfx/intro/unown_back.2bpp.lz"

View File

@ -193,10 +193,10 @@ Function819a7: ; 819a7
; 819f4
Palette_819f4: ; 819f4
INCLUDE "data/palettes/debug/bg.pal"
INCLUDE "gfx/debug/bg.pal"
Palette_81a34: ; 81a34
INCLUDE "data/palettes/debug/ob.pal"
INCLUDE "gfx/debug/ob.pal"
; 81a74
Function81a74: ; 81a74

View File

@ -307,8 +307,8 @@ GetIconGFX: ; 8e9de
ret
HeldItemIcons:
INCBIN "gfx/icon/mail.2bpp"
INCBIN "gfx/icon/item.2bpp"
INCBIN "gfx/icons/mail.2bpp"
INCBIN "gfx/icons/item.2bpp"
; 8ea17
GetIcon_de: ; 8ea17

View File

@ -1041,7 +1041,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
; 11ef4 (4:5ef4)
.MailIcon: ; 11ef4
INCBIN "gfx/icon/mail2.2bpp"
INCBIN "gfx/icons/mail2.2bpp"
; 11f74
.initwNamingScreenMaxNameLength ; 11f74 (4:5f74)

View File

@ -2834,7 +2834,7 @@ TownMapPals: ; 91f13
ret
.PalMap:
INCLUDE "data/palettes/town_map_palette_map.asm"
INCLUDE "gfx/pokegear/town_map_palette_map.asm"
; 91f7b
TownMapMon: ; 91f7b

View File

@ -399,4 +399,4 @@ INCBIN "gfx/title/crystal.2bpp.lz"
; 10fede
TitleScreenPalettes:
INCLUDE "data/palettes/title.pal"
INCLUDE "gfx/title/title.pal"

View File

@ -108,7 +108,7 @@ INCBIN "gfx/title/old_bg.tilemap"
; 10d8b1
UnusedTitleBG_Palettes: ; 10d8b1
INCLUDE "data/palettes/unused_title/bg.pal"
INCLUDE "gfx/title/old_bg.pal"
; 10dab1
UnusedTitleFG_GFX: ; 10dab1
@ -116,7 +116,7 @@ INCBIN "gfx/title/old_fg.2bpp"
; 10eab1
UnusedTitleFG_Palettes: ; 10eab1
INCLUDE "data/palettes/unused_title/ob.pal"
INCLUDE "gfx/title/old_fg.pal"
; 10ecb1
UnusedTitleFG_OAM: ; 10ecb1

Some files were not shown because too many files have changed in this diff Show More