Move graphics-only object file sources into gfx/

Previously this wasn't working, but now the Makefile uses pokegold's technique for running scan_includes.

It also enables and fixes some rgbds warnings ("Non-local labels without a colon are deprecated").
This commit is contained in:
Rangi 2020-07-03 17:32:21 -04:00
parent 62e137f6ce
commit 64da1f5d6b
7 changed files with 33 additions and 18 deletions

63
gfx/tilesets.asm Normal file
View file

@ -0,0 +1,63 @@
SECTION "Tilesets 1", ROMX
Overworld_GFX:: INCBIN "gfx/tilesets/overworld.2bpp"
Overworld_Block:: INCBIN "gfx/blocksets/overworld.bst"
RedsHouse1_GFX::
RedsHouse2_GFX:: INCBIN "gfx/tilesets/reds_house.2bpp"
RedsHouse1_Block::
RedsHouse2_Block:: INCBIN "gfx/blocksets/reds_house.bst"
House_GFX:: INCBIN "gfx/tilesets/house.2bpp"
House_Block:: INCBIN "gfx/blocksets/house.bst"
Mansion_GFX:: INCBIN "gfx/tilesets/mansion.2bpp"
Mansion_Block:: INCBIN "gfx/blocksets/mansion.bst"
ShipPort_GFX:: INCBIN "gfx/tilesets/ship_port.2bpp"
ShipPort_Block:: INCBIN "gfx/blocksets/ship_port.bst"
Interior_GFX:: INCBIN "gfx/tilesets/interior.2bpp"
Interior_Block:: INCBIN "gfx/blocksets/interior.bst"
Plateau_GFX:: INCBIN "gfx/tilesets/plateau.2bpp"
Plateau_Block:: INCBIN "gfx/blocksets/plateau.bst"
SECTION "Tilesets 2", ROMX
Dojo_GFX::
Gym_GFX:: INCBIN "gfx/tilesets/gym.2bpp"
Dojo_Block::
Gym_Block:: INCBIN "gfx/blocksets/gym.bst"
Mart_GFX::
Pokecenter_GFX:: INCBIN "gfx/tilesets/pokecenter.2bpp"
Mart_Block::
Pokecenter_Block:: INCBIN "gfx/blocksets/pokecenter.bst"
ForestGate_GFX::
Museum_GFX::
Gate_GFX:: INCBIN "gfx/tilesets/gate.2bpp"
ForestGate_Block::
Museum_Block::
Gate_Block:: INCBIN "gfx/blocksets/gate.bst"
Forest_GFX:: INCBIN "gfx/tilesets/forest.2bpp"
Forest_Block:: INCBIN "gfx/blocksets/forest.bst"
Facility_GFX:: INCBIN "gfx/tilesets/facility.2bpp"
Facility_Block:: INCBIN "gfx/blocksets/facility.bst"
SECTION "Tilesets 3", ROMX
Cemetery_GFX:: INCBIN "gfx/tilesets/cemetery.2bpp"
Cemetery_Block:: INCBIN "gfx/blocksets/cemetery.bst"
Cavern_GFX:: INCBIN "gfx/tilesets/cavern.2bpp"
Cavern_Block:: INCBIN "gfx/blocksets/cavern.bst"
Lobby_GFX:: INCBIN "gfx/tilesets/lobby.2bpp"
Lobby_Block:: INCBIN "gfx/blocksets/lobby.bst"
Ship_GFX:: INCBIN "gfx/tilesets/ship.2bpp"
Ship_Block:: INCBIN "gfx/blocksets/ship.bst"
Lab_GFX:: INCBIN "gfx/tilesets/lab.2bpp"
Lab_Block:: INCBIN "gfx/blocksets/lab.bst"
Club_GFX:: INCBIN "gfx/tilesets/club.2bpp"
Club_Block:: INCBIN "gfx/blocksets/club.bst"
Underground_GFX:: INCBIN "gfx/tilesets/underground.2bpp"
Underground_Block:: INCBIN "gfx/blocksets/underground.bst"