From 64da1f5d6bf96ff7f35165476ecc8d623f76060d Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 3 Jul 2020 17:32:21 -0400 Subject: 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"). --- sprites.asm | 73 ------------------------------------------------------------- 1 file changed, 73 deletions(-) delete mode 100644 sprites.asm (limited to 'sprites.asm') diff --git a/sprites.asm b/sprites.asm deleted file mode 100644 index 4548bbe3..00000000 --- a/sprites.asm +++ /dev/null @@ -1,73 +0,0 @@ -SECTION "NPC Sprites 1", ROMX - -OakAideSprite:: INCBIN "gfx/sprites/oak_aide.2bpp" -RockerSprite:: INCBIN "gfx/sprites/rocker.2bpp" -SwimmerSprite:: INCBIN "gfx/sprites/swimmer.2bpp" -WhitePlayerSprite:: INCBIN "gfx/sprites/white_player.2bpp" -GymHelperSprite:: INCBIN "gfx/sprites/gym_helper.2bpp" -OldPersonSprite:: INCBIN "gfx/sprites/old_person.2bpp" -MartGuySprite:: INCBIN "gfx/sprites/mart_guy.2bpp" -FisherSprite:: INCBIN "gfx/sprites/fisher.2bpp" -OldMediumWomanSprite:: INCBIN "gfx/sprites/old_medium_woman.2bpp" -NurseSprite:: INCBIN "gfx/sprites/nurse.2bpp" -CableClubWomanSprite:: INCBIN "gfx/sprites/cable_club_woman.2bpp" -MrMasterballSprite:: INCBIN "gfx/sprites/mr_masterball.2bpp" -LaprasGiverSprite:: INCBIN "gfx/sprites/lapras_giver.2bpp" -WardenSprite:: INCBIN "gfx/sprites/warden.2bpp" -SsCaptainSprite:: INCBIN "gfx/sprites/ss_captain.2bpp" -Fisher2Sprite:: INCBIN "gfx/sprites/fisher2.2bpp" -BlackbeltSprite:: INCBIN "gfx/sprites/blackbelt.2bpp" -GuardSprite:: INCBIN "gfx/sprites/guard.2bpp" -BallSprite:: INCBIN "gfx/sprites/ball.2bpp" -OmanyteSprite:: INCBIN "gfx/sprites/omanyte.2bpp" -BoulderSprite:: INCBIN "gfx/sprites/boulder.2bpp" -PaperSheetSprite:: INCBIN "gfx/sprites/paper_sheet.2bpp" -BookMapDexSprite:: INCBIN "gfx/sprites/book_map_dex.2bpp" -ClipboardSprite:: INCBIN "gfx/sprites/clipboard.2bpp" -SnorlaxSprite:: INCBIN "gfx/sprites/snorlax.2bpp" -OldAmberSprite:: INCBIN "gfx/sprites/old_amber.2bpp" -LyingOldManSprite:: INCBIN "gfx/sprites/lying_old_man.2bpp" - - -SECTION "NPC Sprites 2", ROMX - -RedCyclingSprite:: INCBIN "gfx/sprites/cycling.2bpp" -RedSprite:: INCBIN "gfx/sprites/red.2bpp" -BlueSprite:: INCBIN "gfx/sprites/blue.2bpp" -OakSprite:: INCBIN "gfx/sprites/oak.2bpp" -BugCatcherSprite:: INCBIN "gfx/sprites/bug_catcher.2bpp" -SlowbroSprite:: INCBIN "gfx/sprites/slowbro.2bpp" -LassSprite:: INCBIN "gfx/sprites/lass.2bpp" -BlackHairBoy1Sprite:: INCBIN "gfx/sprites/black_hair_boy_1.2bpp" -LittleGirlSprite:: INCBIN "gfx/sprites/little_girl.2bpp" -BirdSprite:: INCBIN "gfx/sprites/bird.2bpp" -FatBaldGuySprite:: INCBIN "gfx/sprites/fat_bald_guy.2bpp" -GamblerSprite:: INCBIN "gfx/sprites/gambler.2bpp" -BlackHairBoy2Sprite:: INCBIN "gfx/sprites/black_hair_boy_2.2bpp" -GirlSprite:: INCBIN "gfx/sprites/girl.2bpp" -HikerSprite:: INCBIN "gfx/sprites/hiker.2bpp" -FoulardWomanSprite:: INCBIN "gfx/sprites/foulard_woman.2bpp" -GentlemanSprite:: INCBIN "gfx/sprites/gentleman.2bpp" -DaisySprite:: INCBIN "gfx/sprites/daisy.2bpp" -BikerSprite:: INCBIN "gfx/sprites/biker.2bpp" -SailorSprite:: INCBIN "gfx/sprites/sailor.2bpp" -CookSprite:: INCBIN "gfx/sprites/cook.2bpp" -BikeShopGuySprite:: INCBIN "gfx/sprites/bike_shop_guy.2bpp" -MrFujiSprite:: INCBIN "gfx/sprites/mr_fuji.2bpp" -GiovanniSprite:: INCBIN "gfx/sprites/giovanni.2bpp" -RocketSprite:: INCBIN "gfx/sprites/rocket.2bpp" -MediumSprite:: INCBIN "gfx/sprites/medium.2bpp" -WaiterSprite:: INCBIN "gfx/sprites/waiter.2bpp" -ErikaSprite:: INCBIN "gfx/sprites/erika.2bpp" -MomGeishaSprite:: INCBIN "gfx/sprites/mom_geisha.2bpp" -BrunetteGirlSprite:: INCBIN "gfx/sprites/brunette_girl.2bpp" -LanceSprite:: INCBIN "gfx/sprites/lance.2bpp" -MomSprite:: INCBIN "gfx/sprites/mom.2bpp" -BaldingGuySprite:: INCBIN "gfx/sprites/balding_guy.2bpp" -YoungBoySprite:: INCBIN "gfx/sprites/young_boy.2bpp" -GameboyKidSprite:: INCBIN "gfx/sprites/gameboy_kid.2bpp" -ClefairySprite:: INCBIN "gfx/sprites/clefairy.2bpp" -AgathaSprite:: INCBIN "gfx/sprites/agatha.2bpp" -BrunoSprite:: INCBIN "gfx/sprites/bruno.2bpp" -LoreleiSprite:: INCBIN "gfx/sprites/lorelei.2bpp" -SeelSprite:: INCBIN "gfx/sprites/seel.2bpp" -- cgit v1.3.1-sl0p