diff options
| -rw-r--r-- | .gitignore | 11 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | data/maps/blocks.asm | 56 | ||||
| -rwxr-xr-x | data/sprite_anims/framesets.asm (renamed from data/sprite_engine.asm) | 0 | ||||
| -rwxr-xr-x | engine/gfx/sprite_anims.asm (renamed from engine/sprite_anims.asm) | 0 | ||||
| -rwxr-xr-x | engine/gfx/sprites.asm (renamed from engine/sprites.asm) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaCapsuleHouse.blk (renamed from maps/unused/BetaPokecenterTradeStation.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaCeladonMansion1F.blk (renamed from maps/unused/BetaHouse2.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaCeladonMansion2F.blk (renamed from maps/unused/BetaCeladonMansion.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaPlayersHouse2F.blk (renamed from maps/unused/BetaHerosHouse.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaPokecenter.blk (renamed from maps/unused/BetaPokecenterMainHouse.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaRocketHideout1F.blk (renamed from maps/unused/BetaEmptyHouse.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaRocketHideoutB1F.blk (renamed from maps/unused/BetaRocketHideout2.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaRocketHideoutB2F.blk (renamed from maps/unused/BetaRocketHideout1.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaRocketHideoutB3F.blk (renamed from maps/unused/BetaRocketHideout3.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaRoute23.blk (renamed from maps/unused/BetaRoute23EarlyVersion.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaSilverCaveOutside.blk (renamed from maps/unused/BetaIlexForest.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaSlowpokeWell1F.blk (renamed from maps/unused/BetaCave2.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaUnionCave.blk (renamed from maps/unused/BetaCave.blk) | 0 | ||||
| -rw-r--r-- | maps/unused/BetaUnknownGym.blk (renamed from maps/unused/BetaUnknown.blk) | 0 | ||||
| -rwxr-xr-x | tools/unused_sources.sh | 2 |
21 files changed, 39 insertions, 37 deletions
@@ -43,7 +43,16 @@ used_space.png # osx files .DS_STORE -# compiled graphics (include for now) +# compiled graphics (include for now ... #*.lz #*.2bpp #*.1bpp + +# ... except for specific 2bpp files generated from lz's) +gfx/pokemon/**/*.2bpp +gfx/trainers/*.2bpp +gfx/battle/dude.2bpp +gfx/player/chris_back.2bpp +gfx/trade/game_boy.2bpp +gfx/pokegear/pokegear_sprites.2bpp +gfx/slots/slots_*.2bpp @@ -119,10 +119,3 @@ pngs: find gfx -iname "*.[12]bpp" -exec $(gfx) png {} + find gfx -iname "*.[12]bpp" -exec touch {} + find gfx -iname "*.lz" -exec touch {} + - find gfx/pokemon gfx/trainers -iname "*.[1,2]bpp" -delete - rm \ - gfx/battle/dude.2bpp \ - gfx/player/chris_back.2bpp \ - gfx/trade/game_boy.2bpp \ - gfx/pokegear/pokegear_sprites.2bpp \ - gfx/slots/slots_*.2bpp diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 7df01575..e93719de 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -15,8 +15,8 @@ Route44_Blocks: Route28_Blocks: INCBIN "maps/Route28.blk" -BetaHerosHouse_Blocks: - INCBIN "maps/unused/BetaHerosHouse.blk" +BetaPlayersHouse2F_Blocks: + INCBIN "maps/unused/BetaPlayersHouse2F.blk" CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk" @@ -103,8 +103,8 @@ Route3_Blocks: PewterCity_Blocks: INCBIN "maps/PewterCity.blk" -BetaIlexForest_Blocks: - INCBIN "maps/unused/BetaIlexForest.blk" +BetaSilverCaveOutside_Blocks: + INCBIN "maps/unused/BetaSilverCaveOutside.blk" BetaSproutTower2_Blocks: INCBIN "maps/unused/BetaSproutTower2.blk" @@ -121,8 +121,8 @@ Route20_Blocks: BetaSproutTower6_Blocks: INCBIN "maps/unused/BetaSproutTower6.blk" -BetaPokecenterMainHouse_Blocks: - INCBIN "maps/unused/BetaPokecenterMainHouse.blk" +BetaPokecenter_Blocks: + INCBIN "maps/unused/BetaPokecenter.blk" Route30_Blocks: INCBIN "maps/Route30.blk" @@ -446,8 +446,8 @@ VioletNicknameSpeechHouse_Blocks: VioletKylesHouse_Blocks: INCBIN "maps/House2.blk" -BetaCave_Blocks: - INCBIN "maps/unused/BetaCave.blk" +BetaUnionCave_Blocks: + INCBIN "maps/unused/BetaUnionCave.blk" UnionCaveB1F_Blocks: INCBIN "maps/UnionCaveB1F.blk" @@ -466,8 +466,8 @@ Route5UndergroundPathEntrance_Blocks: Route6UndergroundPathEntrance_Blocks: INCBIN "maps/UndergroundPathEntrance.blk" -BetaPokecenterTradeStation_Blocks: - INCBIN "maps/unused/BetaPokecenterTradeStation.blk" +BetaCapsuleHouse_Blocks: + INCBIN "maps/unused/BetaCapsuleHouse.blk" KurtsHouse_Blocks: INCBIN "maps/KurtsHouse.blk" @@ -685,17 +685,17 @@ SilverCaveRoom2_Blocks: SilverCaveRoom3_Blocks: INCBIN "maps/SilverCaveRoom3.blk" -BetaRocketHideout1_Blocks: - INCBIN "maps/unused/BetaRocketHideout1.blk" +BetaRocketHideoutB2F_Blocks: + INCBIN "maps/unused/BetaRocketHideoutB2F.blk" -BetaRocketHideout2_Blocks: - INCBIN "maps/unused/BetaRocketHideout2.blk" +BetaRocketHideoutB1F_Blocks: + INCBIN "maps/unused/BetaRocketHideoutB1F.blk" -BetaEmptyHouse_Blocks: - INCBIN "maps/unused/BetaEmptyHouse.blk" +BetaRocketHideout1F_Blocks: + INCBIN "maps/unused/BetaRocketHideout1F.blk" -BetaRocketHideout3_Blocks: - INCBIN "maps/unused/BetaRocketHideout3.blk" +BetaRocketHideoutB3F_Blocks: + INCBIN "maps/unused/BetaRocketHideoutB3F.blk" MahoganyMart1F_Blocks: MountMoonGiftShop_Blocks: @@ -710,8 +710,8 @@ TeamRocketBaseB2F_Blocks: TeamRocketBaseB3F_Blocks: INCBIN "maps/TeamRocketBaseB3F.blk" -BetaRoute23EarlyVersion_Blocks: - INCBIN "maps/unused/BetaRoute23EarlyVersion.blk" +BetaRoute23_Blocks: + INCBIN "maps/unused/BetaRoute23.blk" IndigoPlateauPokecenter1F_Blocks: INCBIN "maps/IndigoPlateauPokecenter1F.blk" @@ -746,8 +746,8 @@ MahoganyGym_Blocks: OlivineGym_Blocks: INCBIN "maps/OlivineGym.blk" -BetaUnknown_Blocks: - INCBIN "maps/unused/BetaUnknown.blk" +BetaUnknownGym_Blocks: + INCBIN "maps/unused/BetaUnknownGym.blk" CianwoodGym_Blocks: INCBIN "maps/CianwoodGym.blk" @@ -779,8 +779,8 @@ OlivineLighthouse6F_Blocks: SECTION "Map Blocks 3", ROMX -BetaCave2_Blocks: - INCBIN "maps/unused/BetaCave2.blk" +BetaSlowpokeWell1F_Blocks: + INCBIN "maps/unused/BetaSlowpokeWell1F.blk" SlowpokeWellB1F_Blocks: INCBIN "maps/SlowpokeWellB1F.blk" @@ -913,14 +913,14 @@ PewterGym_Blocks: CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk" -BetaHouse2_Blocks: - INCBIN "maps/unused/BetaHouse2.blk" +BetaCeladonMansion1F_Blocks: + INCBIN "maps/unused/BetaCeladonMansion1F.blk" CeladonCafe_Blocks: INCBIN "maps/CeladonCafe.blk" -BetaCeladonMansion_Blocks: - INCBIN "maps/unused/BetaCeladonMansion.blk" +BetaCeladonMansion2F_Blocks: + INCBIN "maps/unused/BetaCeladonMansion2F.blk" RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk" diff --git a/data/sprite_engine.asm b/data/sprite_anims/framesets.asm index e53b1c47..e53b1c47 100755 --- a/data/sprite_engine.asm +++ b/data/sprite_anims/framesets.asm diff --git a/engine/sprite_anims.asm b/engine/gfx/sprite_anims.asm index 2877539d..2877539d 100755 --- a/engine/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm diff --git a/engine/sprites.asm b/engine/gfx/sprites.asm index b9267d66..b9267d66 100755 --- a/engine/sprites.asm +++ b/engine/gfx/sprites.asm diff --git a/maps/unused/BetaPokecenterTradeStation.blk b/maps/unused/BetaCapsuleHouse.blk index 555abfa0..555abfa0 100644 --- a/maps/unused/BetaPokecenterTradeStation.blk +++ b/maps/unused/BetaCapsuleHouse.blk diff --git a/maps/unused/BetaHouse2.blk b/maps/unused/BetaCeladonMansion1F.blk index 993ea3a8..993ea3a8 100644 --- a/maps/unused/BetaHouse2.blk +++ b/maps/unused/BetaCeladonMansion1F.blk diff --git a/maps/unused/BetaCeladonMansion.blk b/maps/unused/BetaCeladonMansion2F.blk index 8d3e219d..8d3e219d 100644 --- a/maps/unused/BetaCeladonMansion.blk +++ b/maps/unused/BetaCeladonMansion2F.blk diff --git a/maps/unused/BetaHerosHouse.blk b/maps/unused/BetaPlayersHouse2F.blk index b5b53b4b..b5b53b4b 100644 --- a/maps/unused/BetaHerosHouse.blk +++ b/maps/unused/BetaPlayersHouse2F.blk diff --git a/maps/unused/BetaPokecenterMainHouse.blk b/maps/unused/BetaPokecenter.blk index 26135073..26135073 100644 --- a/maps/unused/BetaPokecenterMainHouse.blk +++ b/maps/unused/BetaPokecenter.blk diff --git a/maps/unused/BetaEmptyHouse.blk b/maps/unused/BetaRocketHideout1F.blk index dcec6279..dcec6279 100644 --- a/maps/unused/BetaEmptyHouse.blk +++ b/maps/unused/BetaRocketHideout1F.blk diff --git a/maps/unused/BetaRocketHideout2.blk b/maps/unused/BetaRocketHideoutB1F.blk index b17106cc..b17106cc 100644 --- a/maps/unused/BetaRocketHideout2.blk +++ b/maps/unused/BetaRocketHideoutB1F.blk diff --git a/maps/unused/BetaRocketHideout1.blk b/maps/unused/BetaRocketHideoutB2F.blk index 98820807..98820807 100644 --- a/maps/unused/BetaRocketHideout1.blk +++ b/maps/unused/BetaRocketHideoutB2F.blk diff --git a/maps/unused/BetaRocketHideout3.blk b/maps/unused/BetaRocketHideoutB3F.blk index b73d3afe..b73d3afe 100644 --- a/maps/unused/BetaRocketHideout3.blk +++ b/maps/unused/BetaRocketHideoutB3F.blk diff --git a/maps/unused/BetaRoute23EarlyVersion.blk b/maps/unused/BetaRoute23.blk index a62533dd..a62533dd 100644 --- a/maps/unused/BetaRoute23EarlyVersion.blk +++ b/maps/unused/BetaRoute23.blk diff --git a/maps/unused/BetaIlexForest.blk b/maps/unused/BetaSilverCaveOutside.blk index 3cde1400..3cde1400 100644 --- a/maps/unused/BetaIlexForest.blk +++ b/maps/unused/BetaSilverCaveOutside.blk diff --git a/maps/unused/BetaCave2.blk b/maps/unused/BetaSlowpokeWell1F.blk index a2722d01..a2722d01 100644 --- a/maps/unused/BetaCave2.blk +++ b/maps/unused/BetaSlowpokeWell1F.blk diff --git a/maps/unused/BetaCave.blk b/maps/unused/BetaUnionCave.blk index b103c253..b103c253 100644 --- a/maps/unused/BetaCave.blk +++ b/maps/unused/BetaUnionCave.blk diff --git a/maps/unused/BetaUnknown.blk b/maps/unused/BetaUnknownGym.blk index c3063adc..c3063adc 100644 --- a/maps/unused/BetaUnknown.blk +++ b/maps/unused/BetaUnknownGym.blk diff --git a/tools/unused_sources.sh b/tools/unused_sources.sh index 2b8cc59b..24fbc27d 100755 --- a/tools/unused_sources.sh +++ b/tools/unused_sources.sh @@ -12,6 +12,6 @@ for asm in $toplevel; do python tools/scan_includes.py "$asm" echo done | tr ' ' '\n' | sort -u > includes.txt -git ls-files | grep -E '\.(asm|pal|lz|[1,2]bpp|blk|bin|rle|tilemap)$' | sort -u > sources.txt +git ls-files | grep -E '\.(asm|gbcpal|pal|lz|[1,2]bpp|blk|bin|rle|attrmap|tilemap|dimensions)$' | sort -u > sources.txt comm -23 sources.txt includes.txt rm sources.txt includes.txt |