From c6fefd0fe878a350a5e8cb1140d0356c78648ba5 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 00:17:39 -0500 Subject: Rename overworld sprite files, consistent with their constants --- constants/sprite_constants.asm | 4 +- engine/battle_start.asm | 2 +- engine/color.asm | 2 +- engine/events_3.asm | 4 +- engine/healmachineanim.asm | 2 +- engine/overworld.asm | 2 +- event/field_moves.asm | 6 +- gfx/overworld/000.png | Bin 300 -> 0 bytes gfx/overworld/001.png | Bin 373 -> 0 bytes gfx/overworld/002.png | Bin 209 -> 0 bytes gfx/overworld/003.png | Bin 300 -> 0 bytes gfx/overworld/004.png | Bin 305 -> 0 bytes gfx/overworld/005.png | Bin 294 -> 0 bytes gfx/overworld/006.png | Bin 321 -> 0 bytes gfx/overworld/007.png | Bin 307 -> 0 bytes gfx/overworld/008.png | Bin 319 -> 0 bytes gfx/overworld/009.png | Bin 259 -> 0 bytes gfx/overworld/010.png | Bin 309 -> 0 bytes gfx/overworld/011.png | Bin 253 -> 0 bytes gfx/overworld/012.png | Bin 304 -> 0 bytes gfx/overworld/013.png | Bin 281 -> 0 bytes gfx/overworld/014.png | Bin 277 -> 0 bytes gfx/overworld/015.png | Bin 314 -> 0 bytes gfx/overworld/016.png | Bin 216 -> 0 bytes gfx/overworld/017.png | Bin 303 -> 0 bytes gfx/overworld/018.png | Bin 298 -> 0 bytes gfx/overworld/019.png | Bin 277 -> 0 bytes gfx/overworld/020.png | Bin 282 -> 0 bytes gfx/overworld/021.png | Bin 276 -> 0 bytes gfx/overworld/022.png | Bin 293 -> 0 bytes gfx/overworld/023.png | Bin 298 -> 0 bytes gfx/overworld/024.png | Bin 350 -> 0 bytes gfx/overworld/025.png | Bin 276 -> 0 bytes gfx/overworld/026.png | Bin 207 -> 0 bytes gfx/overworld/027.png | Bin 286 -> 0 bytes gfx/overworld/028.png | Bin 274 -> 0 bytes gfx/overworld/029.png | Bin 287 -> 0 bytes gfx/overworld/030.png | Bin 277 -> 0 bytes gfx/overworld/031.png | Bin 233 -> 0 bytes gfx/overworld/032.png | Bin 253 -> 0 bytes gfx/overworld/033.png | Bin 260 -> 0 bytes gfx/overworld/034.png | Bin 286 -> 0 bytes gfx/overworld/035.png | Bin 349 -> 0 bytes gfx/overworld/036.png | Bin 237 -> 0 bytes gfx/overworld/037.png | Bin 254 -> 0 bytes gfx/overworld/038.png | Bin 281 -> 0 bytes gfx/overworld/039.png | Bin 305 -> 0 bytes gfx/overworld/040.png | Bin 283 -> 0 bytes gfx/overworld/041.png | Bin 263 -> 0 bytes gfx/overworld/042.png | Bin 293 -> 0 bytes gfx/overworld/043.png | Bin 296 -> 0 bytes gfx/overworld/044.png | Bin 289 -> 0 bytes gfx/overworld/045.png | Bin 264 -> 0 bytes gfx/overworld/046.png | Bin 338 -> 0 bytes gfx/overworld/047.png | Bin 360 -> 0 bytes gfx/overworld/048.png | Bin 303 -> 0 bytes gfx/overworld/049.png | Bin 328 -> 0 bytes gfx/overworld/050.png | Bin 183 -> 0 bytes gfx/overworld/051.png | Bin 443 -> 0 bytes gfx/overworld/052.png | Bin 247 -> 0 bytes gfx/overworld/053.png | Bin 253 -> 0 bytes gfx/overworld/054.png | Bin 210 -> 0 bytes gfx/overworld/055.png | Bin 266 -> 0 bytes gfx/overworld/056.png | Bin 292 -> 0 bytes gfx/overworld/057.png | Bin 308 -> 0 bytes gfx/overworld/058.png | Bin 269 -> 0 bytes gfx/overworld/059.png | Bin 283 -> 0 bytes gfx/overworld/060.png | Bin 305 -> 0 bytes gfx/overworld/061.png | Bin 305 -> 0 bytes gfx/overworld/062.png | Bin 250 -> 0 bytes gfx/overworld/063.png | Bin 264 -> 0 bytes gfx/overworld/064.png | Bin 279 -> 0 bytes gfx/overworld/065.png | Bin 237 -> 0 bytes gfx/overworld/066.png | Bin 285 -> 0 bytes gfx/overworld/067.png | Bin 305 -> 0 bytes gfx/overworld/068.png | Bin 139 -> 0 bytes gfx/overworld/069.png | Bin 227 -> 0 bytes gfx/overworld/070.png | Bin 193 -> 0 bytes gfx/overworld/071.png | Bin 295 -> 0 bytes gfx/overworld/072.png | Bin 307 -> 0 bytes gfx/overworld/073.png | Bin 346 -> 0 bytes gfx/overworld/074.png | Bin 292 -> 0 bytes gfx/overworld/075.png | Bin 350 -> 0 bytes gfx/overworld/076.png | Bin 317 -> 0 bytes gfx/overworld/077.png | Bin 354 -> 0 bytes gfx/overworld/078.png | Bin 327 -> 0 bytes gfx/overworld/079.png | Bin 262 -> 0 bytes gfx/overworld/080.png | Bin 142 -> 0 bytes gfx/overworld/081.png | Bin 180 -> 0 bytes gfx/overworld/082.png | Bin 355 -> 0 bytes gfx/overworld/083.png | Bin 119 -> 0 bytes gfx/overworld/084.png | Bin 121 -> 0 bytes gfx/overworld/085.png | Bin 111 -> 0 bytes gfx/overworld/086.png | Bin 127 -> 0 bytes gfx/overworld/087.png | Bin 141 -> 0 bytes gfx/overworld/088.png | Bin 146 -> 0 bytes gfx/overworld/089.png | Bin 143 -> 0 bytes gfx/overworld/090.png | Bin 109 -> 0 bytes gfx/overworld/091.png | Bin 110 -> 0 bytes gfx/overworld/092.png | Bin 148 -> 0 bytes gfx/overworld/093.png | Bin 121 -> 0 bytes gfx/overworld/094.png | Bin 120 -> 0 bytes gfx/overworld/095.png | Bin 308 -> 0 bytes gfx/overworld/096.png | Bin 414 -> 0 bytes gfx/overworld/097.png | Bin 224 -> 0 bytes gfx/overworld/098.png | Bin 140 -> 0 bytes gfx/overworld/099.png | Bin 144 -> 0 bytes gfx/overworld/100.png | Bin 145 -> 0 bytes gfx/overworld/101.png | Bin 214 -> 0 bytes gfx/overworld/boulder_dust.png | Bin 0 -> 106 bytes gfx/overworld/chris_fish.png | Bin 0 -> 190 bytes gfx/overworld/cut_grass.png | Bin 0 -> 134 bytes gfx/overworld/cut_tree.png | Bin 0 -> 140 bytes gfx/overworld/fishing_rod.png | Bin 0 -> 103 bytes gfx/overworld/grass_rustle.png | Bin 0 -> 88 bytes gfx/overworld/headbutt_tree.png | Bin 0 -> 197 bytes gfx/overworld/heal_machine.png | Bin 0 -> 93 bytes gfx/overworld/kris_fish.png | Bin 0 -> 193 bytes gfx/overworld/shadow.png | Bin 0 -> 84 bytes gfx/overworld/sprite_headers.asm | 419 ------------------------ gfx/overworld/sprites_1.asm | 44 --- gfx/overworld/sprites_2.asm | 58 ---- gfx/overworld/trainer_battle_pokeball_tiles.png | Bin 0 -> 89 bytes gfx/ow_fx/boulder_dust.png | Bin 106 -> 0 bytes gfx/ow_fx/chris_fish.png | Bin 190 -> 0 bytes gfx/ow_fx/cut_grass.png | Bin 134 -> 0 bytes gfx/ow_fx/cut_tree.png | Bin 140 -> 0 bytes gfx/ow_fx/fishing_rod.png | Bin 103 -> 0 bytes gfx/ow_fx/grass_rustle.png | Bin 88 -> 0 bytes gfx/ow_fx/headbutt_tree.png | Bin 197 -> 0 bytes gfx/ow_fx/heal_machine.png | Bin 93 -> 0 bytes gfx/ow_fx/kris_fish.png | Bin 193 -> 0 bytes gfx/ow_fx/shadow.png | Bin 84 -> 0 bytes gfx/ow_fx/trainer_battle_pokeball_tiles.png | Bin 89 -> 0 bytes gfx/pics.asm | 9 +- gfx/pics/trainer_pic_pointers.asm | 68 ---- gfx/sprite_headers.asm | 419 ++++++++++++++++++++++++ gfx/sprites.asm | 108 ++++++ gfx/sprites/big_lapras.png | Bin 0 -> 193 bytes gfx/sprites/big_onix.png | Bin 0 -> 262 bytes gfx/sprites/big_snorlax.png | Bin 0 -> 183 bytes gfx/sprites/biker.png | Bin 0 -> 346 bytes gfx/sprites/bill.png | Bin 0 -> 307 bytes gfx/sprites/bird.png | Bin 0 -> 354 bytes gfx/sprites/black_belt.png | Bin 0 -> 279 bytes gfx/sprites/blaine.png | Bin 0 -> 304 bytes gfx/sprites/blue.png | Bin 0 -> 321 bytes gfx/sprites/boulder.png | Bin 0 -> 143 bytes gfx/sprites/brock.png | Bin 0 -> 276 bytes gfx/sprites/bruno.png | Bin 0 -> 286 bytes gfx/sprites/buena.png | Bin 0 -> 263 bytes gfx/sprites/bug_catcher.png | Bin 0 -> 237 bytes gfx/sprites/bugsy.png | Bin 0 -> 277 bytes gfx/sprites/cal.png | Bin 0 -> 305 bytes gfx/sprites/captain.png | Bin 0 -> 227 bytes gfx/sprites/chris.png | Bin 0 -> 300 bytes gfx/sprites/chris_bike.png | Bin 0 -> 373 bytes gfx/sprites/chuck.png | Bin 0 -> 276 bytes gfx/sprites/clair.png | Bin 0 -> 350 bytes gfx/sprites/clerk.png | Bin 0 -> 292 bytes gfx/sprites/cooltrainer_f.png | Bin 0 -> 349 bytes gfx/sprites/cooltrainer_m.png | Bin 0 -> 286 bytes gfx/sprites/daisy.png | Bin 0 -> 277 bytes gfx/sprites/dragon.png | Bin 0 -> 327 bytes gfx/sprites/elder.png | Bin 0 -> 319 bytes gfx/sprites/elm.png | Bin 0 -> 314 bytes gfx/sprites/entei.png | Bin 0 -> 144 bytes gfx/sprites/erika.png | Bin 0 -> 233 bytes gfx/sprites/fairy.png | Bin 0 -> 317 bytes gfx/sprites/falkner.png | Bin 0 -> 303 bytes gfx/sprites/famicom.png | Bin 0 -> 110 bytes gfx/sprites/fisher.png | Bin 0 -> 308 bytes gfx/sprites/fishing_guru.png | Bin 0 -> 269 bytes gfx/sprites/fruit_tree.png | Bin 0 -> 148 bytes gfx/sprites/gameboy_kid.png | Bin 0 -> 209 bytes gfx/sprites/gentleman.png | Bin 0 -> 264 bytes gfx/sprites/gold_trophy.png | Bin 0 -> 121 bytes gfx/sprites/gramps.png | Bin 0 -> 338 bytes gfx/sprites/granny.png | Bin 0 -> 360 bytes gfx/sprites/gym_guy.png | Bin 0 -> 295 bytes gfx/sprites/janine.png | Bin 0 -> 259 bytes gfx/sprites/jasmine.png | Bin 0 -> 293 bytes gfx/sprites/karen.png | Bin 0 -> 207 bytes gfx/sprites/kimono_girl.png | Bin 0 -> 305 bytes gfx/sprites/koga.png | Bin 0 -> 253 bytes gfx/sprites/kris.png | Bin 0 -> 308 bytes gfx/sprites/kris_bike.png | Bin 0 -> 414 bytes gfx/sprites/kurt.png | Bin 0 -> 309 bytes gfx/sprites/kurt_outside.png | Bin 0 -> 224 bytes gfx/sprites/lance.png | Bin 0 -> 287 bytes gfx/sprites/lass.png | Bin 0 -> 305 bytes gfx/sprites/link_receptionist.png | Bin 0 -> 266 bytes gfx/sprites/misty.png | Bin 0 -> 274 bytes gfx/sprites/mom.png | Bin 0 -> 253 bytes gfx/sprites/monster.png | Bin 0 -> 350 bytes gfx/sprites/morty.png | Bin 0 -> 282 bytes gfx/sprites/n64.png | Bin 0 -> 142 bytes gfx/sprites/nurse.png | Bin 0 -> 210 bytes gfx/sprites/oak.png | Bin 0 -> 305 bytes gfx/sprites/officer.png | Bin 0 -> 285 bytes gfx/sprites/old_link_receptionist.png | Bin 0 -> 141 bytes gfx/sprites/paper.png | Bin 0 -> 111 bytes gfx/sprites/pharmacist.png | Bin 0 -> 292 bytes gfx/sprites/poke_ball.png | Bin 0 -> 119 bytes gfx/sprites/pokedex.png | Bin 0 -> 121 bytes gfx/sprites/pokefan_f.png | Bin 0 -> 264 bytes gfx/sprites/pokefan_m.png | Bin 0 -> 289 bytes gfx/sprites/pryce.png | Bin 0 -> 298 bytes gfx/sprites/raikou.png | Bin 0 -> 145 bytes gfx/sprites/receptionist.png | Bin 0 -> 237 bytes gfx/sprites/red.png | Bin 0 -> 294 bytes gfx/sprites/reds_mom.png | Bin 0 -> 281 bytes gfx/sprites/rock.png | Bin 0 -> 146 bytes gfx/sprites/rocker.png | Bin 0 -> 296 bytes gfx/sprites/rocket.png | Bin 0 -> 247 bytes gfx/sprites/rocket_girl.png | Bin 0 -> 253 bytes gfx/sprites/sabrina.png | Bin 0 -> 260 bytes gfx/sprites/sage.png | Bin 0 -> 305 bytes gfx/sprites/sailor.png | Bin 0 -> 307 bytes gfx/sprites/scientist.png | Bin 0 -> 283 bytes gfx/sprites/silver.png | Bin 0 -> 300 bytes gfx/sprites/silver_trophy.png | Bin 0 -> 120 bytes gfx/sprites/slowpoke.png | Bin 0 -> 139 bytes gfx/sprites/snes.png | Bin 0 -> 109 bytes gfx/sprites/standing_youngster.png | Bin 0 -> 214 bytes gfx/sprites/sudowoodo.png | Bin 0 -> 180 bytes gfx/sprites/suicune.png | Bin 0 -> 140 bytes gfx/sprites/super_nerd.png | Bin 0 -> 293 bytes gfx/sprites/surf.png | Bin 0 -> 355 bytes gfx/sprites/surfing_pikachu.png | Bin 0 -> 443 bytes gfx/sprites/surge.png | Bin 0 -> 277 bytes gfx/sprites/swimmer_girl.png | Bin 0 -> 328 bytes gfx/sprites/swimmer_guy.png | Bin 0 -> 303 bytes gfx/sprites/teacher.png | Bin 0 -> 283 bytes gfx/sprites/twin.png | Bin 0 -> 254 bytes gfx/sprites/unused_guy.png | Bin 0 -> 250 bytes gfx/sprites/virtual_boy.png | Bin 0 -> 127 bytes gfx/sprites/whitney.png | Bin 0 -> 298 bytes gfx/sprites/will.png | Bin 0 -> 216 bytes gfx/sprites/youngster.png | Bin 0 -> 281 bytes gfx/trainer_palettes.asm | 82 +++++ gfx/trainer_pic_pointers.asm | 68 ++++ gfx/trainers/palette_pointers.asm | 82 ----- main.asm | 6 +- misc/gfx_41.asm | 8 +- pokecrystal.link | 4 +- 246 files changed, 701 insertions(+), 696 deletions(-) delete mode 100644 gfx/overworld/000.png delete mode 100644 gfx/overworld/001.png delete mode 100644 gfx/overworld/002.png delete mode 100644 gfx/overworld/003.png delete mode 100644 gfx/overworld/004.png delete mode 100644 gfx/overworld/005.png delete mode 100644 gfx/overworld/006.png delete mode 100644 gfx/overworld/007.png delete mode 100644 gfx/overworld/008.png delete mode 100644 gfx/overworld/009.png delete mode 100644 gfx/overworld/010.png delete mode 100644 gfx/overworld/011.png delete mode 100644 gfx/overworld/012.png delete mode 100644 gfx/overworld/013.png delete mode 100644 gfx/overworld/014.png delete mode 100644 gfx/overworld/015.png delete mode 100644 gfx/overworld/016.png delete mode 100644 gfx/overworld/017.png delete mode 100644 gfx/overworld/018.png delete mode 100644 gfx/overworld/019.png delete mode 100644 gfx/overworld/020.png delete mode 100644 gfx/overworld/021.png delete mode 100644 gfx/overworld/022.png delete mode 100644 gfx/overworld/023.png delete mode 100644 gfx/overworld/024.png delete mode 100644 gfx/overworld/025.png delete mode 100644 gfx/overworld/026.png delete mode 100644 gfx/overworld/027.png delete mode 100644 gfx/overworld/028.png delete mode 100644 gfx/overworld/029.png delete mode 100644 gfx/overworld/030.png delete mode 100644 gfx/overworld/031.png delete mode 100644 gfx/overworld/032.png delete mode 100644 gfx/overworld/033.png delete mode 100644 gfx/overworld/034.png delete mode 100644 gfx/overworld/035.png delete mode 100644 gfx/overworld/036.png delete mode 100644 gfx/overworld/037.png delete mode 100644 gfx/overworld/038.png delete mode 100644 gfx/overworld/039.png delete mode 100644 gfx/overworld/040.png delete mode 100644 gfx/overworld/041.png delete mode 100644 gfx/overworld/042.png delete mode 100644 gfx/overworld/043.png delete mode 100644 gfx/overworld/044.png delete mode 100644 gfx/overworld/045.png delete mode 100644 gfx/overworld/046.png delete mode 100644 gfx/overworld/047.png delete mode 100644 gfx/overworld/048.png delete mode 100644 gfx/overworld/049.png delete mode 100644 gfx/overworld/050.png delete mode 100644 gfx/overworld/051.png delete mode 100644 gfx/overworld/052.png delete mode 100644 gfx/overworld/053.png delete mode 100644 gfx/overworld/054.png delete mode 100644 gfx/overworld/055.png delete mode 100644 gfx/overworld/056.png delete mode 100644 gfx/overworld/057.png delete mode 100644 gfx/overworld/058.png delete mode 100644 gfx/overworld/059.png delete mode 100644 gfx/overworld/060.png delete mode 100644 gfx/overworld/061.png delete mode 100644 gfx/overworld/062.png delete mode 100644 gfx/overworld/063.png delete mode 100644 gfx/overworld/064.png delete mode 100644 gfx/overworld/065.png delete mode 100644 gfx/overworld/066.png delete mode 100644 gfx/overworld/067.png delete mode 100644 gfx/overworld/068.png delete mode 100644 gfx/overworld/069.png delete mode 100644 gfx/overworld/070.png delete mode 100644 gfx/overworld/071.png delete mode 100644 gfx/overworld/072.png delete mode 100644 gfx/overworld/073.png delete mode 100644 gfx/overworld/074.png delete mode 100644 gfx/overworld/075.png delete mode 100644 gfx/overworld/076.png delete mode 100644 gfx/overworld/077.png delete mode 100644 gfx/overworld/078.png delete mode 100644 gfx/overworld/079.png delete mode 100644 gfx/overworld/080.png delete mode 100644 gfx/overworld/081.png delete mode 100644 gfx/overworld/082.png delete mode 100644 gfx/overworld/083.png delete mode 100644 gfx/overworld/084.png delete mode 100644 gfx/overworld/085.png delete mode 100644 gfx/overworld/086.png delete mode 100644 gfx/overworld/087.png delete mode 100644 gfx/overworld/088.png delete mode 100644 gfx/overworld/089.png delete mode 100644 gfx/overworld/090.png delete mode 100644 gfx/overworld/091.png delete mode 100644 gfx/overworld/092.png delete mode 100644 gfx/overworld/093.png delete mode 100644 gfx/overworld/094.png delete mode 100644 gfx/overworld/095.png delete mode 100644 gfx/overworld/096.png delete mode 100644 gfx/overworld/097.png delete mode 100644 gfx/overworld/098.png delete mode 100644 gfx/overworld/099.png delete mode 100644 gfx/overworld/100.png delete mode 100644 gfx/overworld/101.png create mode 100644 gfx/overworld/boulder_dust.png create mode 100644 gfx/overworld/chris_fish.png create mode 100644 gfx/overworld/cut_grass.png create mode 100644 gfx/overworld/cut_tree.png create mode 100644 gfx/overworld/fishing_rod.png create mode 100644 gfx/overworld/grass_rustle.png create mode 100644 gfx/overworld/headbutt_tree.png create mode 100644 gfx/overworld/heal_machine.png create mode 100644 gfx/overworld/kris_fish.png create mode 100644 gfx/overworld/shadow.png delete mode 100644 gfx/overworld/sprite_headers.asm delete mode 100644 gfx/overworld/sprites_1.asm delete mode 100644 gfx/overworld/sprites_2.asm create mode 100644 gfx/overworld/trainer_battle_pokeball_tiles.png delete mode 100644 gfx/ow_fx/boulder_dust.png delete mode 100644 gfx/ow_fx/chris_fish.png delete mode 100644 gfx/ow_fx/cut_grass.png delete mode 100644 gfx/ow_fx/cut_tree.png delete mode 100644 gfx/ow_fx/fishing_rod.png delete mode 100644 gfx/ow_fx/grass_rustle.png delete mode 100644 gfx/ow_fx/headbutt_tree.png delete mode 100644 gfx/ow_fx/heal_machine.png delete mode 100644 gfx/ow_fx/kris_fish.png delete mode 100644 gfx/ow_fx/shadow.png delete mode 100644 gfx/ow_fx/trainer_battle_pokeball_tiles.png delete mode 100644 gfx/pics/trainer_pic_pointers.asm create mode 100644 gfx/sprite_headers.asm create mode 100644 gfx/sprites.asm create mode 100644 gfx/sprites/big_lapras.png create mode 100644 gfx/sprites/big_onix.png create mode 100644 gfx/sprites/big_snorlax.png create mode 100644 gfx/sprites/biker.png create mode 100644 gfx/sprites/bill.png create mode 100644 gfx/sprites/bird.png create mode 100644 gfx/sprites/black_belt.png create mode 100644 gfx/sprites/blaine.png create mode 100644 gfx/sprites/blue.png create mode 100644 gfx/sprites/boulder.png create mode 100644 gfx/sprites/brock.png create mode 100644 gfx/sprites/bruno.png create mode 100644 gfx/sprites/buena.png create mode 100644 gfx/sprites/bug_catcher.png create mode 100644 gfx/sprites/bugsy.png create mode 100644 gfx/sprites/cal.png create mode 100644 gfx/sprites/captain.png create mode 100644 gfx/sprites/chris.png create mode 100644 gfx/sprites/chris_bike.png create mode 100644 gfx/sprites/chuck.png create mode 100644 gfx/sprites/clair.png create mode 100644 gfx/sprites/clerk.png create mode 100644 gfx/sprites/cooltrainer_f.png create mode 100644 gfx/sprites/cooltrainer_m.png create mode 100644 gfx/sprites/daisy.png create mode 100644 gfx/sprites/dragon.png create mode 100644 gfx/sprites/elder.png create mode 100644 gfx/sprites/elm.png create mode 100644 gfx/sprites/entei.png create mode 100644 gfx/sprites/erika.png create mode 100644 gfx/sprites/fairy.png create mode 100644 gfx/sprites/falkner.png create mode 100644 gfx/sprites/famicom.png create mode 100644 gfx/sprites/fisher.png create mode 100644 gfx/sprites/fishing_guru.png create mode 100644 gfx/sprites/fruit_tree.png create mode 100644 gfx/sprites/gameboy_kid.png create mode 100644 gfx/sprites/gentleman.png create mode 100644 gfx/sprites/gold_trophy.png create mode 100644 gfx/sprites/gramps.png create mode 100644 gfx/sprites/granny.png create mode 100644 gfx/sprites/gym_guy.png create mode 100644 gfx/sprites/janine.png create mode 100644 gfx/sprites/jasmine.png create mode 100644 gfx/sprites/karen.png create mode 100644 gfx/sprites/kimono_girl.png create mode 100644 gfx/sprites/koga.png create mode 100644 gfx/sprites/kris.png create mode 100644 gfx/sprites/kris_bike.png create mode 100644 gfx/sprites/kurt.png create mode 100644 gfx/sprites/kurt_outside.png create mode 100644 gfx/sprites/lance.png create mode 100644 gfx/sprites/lass.png create mode 100644 gfx/sprites/link_receptionist.png create mode 100644 gfx/sprites/misty.png create mode 100644 gfx/sprites/mom.png create mode 100644 gfx/sprites/monster.png create mode 100644 gfx/sprites/morty.png create mode 100644 gfx/sprites/n64.png create mode 100644 gfx/sprites/nurse.png create mode 100644 gfx/sprites/oak.png create mode 100644 gfx/sprites/officer.png create mode 100644 gfx/sprites/old_link_receptionist.png create mode 100644 gfx/sprites/paper.png create mode 100644 gfx/sprites/pharmacist.png create mode 100644 gfx/sprites/poke_ball.png create mode 100644 gfx/sprites/pokedex.png create mode 100644 gfx/sprites/pokefan_f.png create mode 100644 gfx/sprites/pokefan_m.png create mode 100644 gfx/sprites/pryce.png create mode 100644 gfx/sprites/raikou.png create mode 100644 gfx/sprites/receptionist.png create mode 100644 gfx/sprites/red.png create mode 100644 gfx/sprites/reds_mom.png create mode 100644 gfx/sprites/rock.png create mode 100644 gfx/sprites/rocker.png create mode 100644 gfx/sprites/rocket.png create mode 100644 gfx/sprites/rocket_girl.png create mode 100644 gfx/sprites/sabrina.png create mode 100644 gfx/sprites/sage.png create mode 100644 gfx/sprites/sailor.png create mode 100644 gfx/sprites/scientist.png create mode 100644 gfx/sprites/silver.png create mode 100644 gfx/sprites/silver_trophy.png create mode 100644 gfx/sprites/slowpoke.png create mode 100644 gfx/sprites/snes.png create mode 100644 gfx/sprites/standing_youngster.png create mode 100644 gfx/sprites/sudowoodo.png create mode 100644 gfx/sprites/suicune.png create mode 100644 gfx/sprites/super_nerd.png create mode 100644 gfx/sprites/surf.png create mode 100644 gfx/sprites/surfing_pikachu.png create mode 100644 gfx/sprites/surge.png create mode 100644 gfx/sprites/swimmer_girl.png create mode 100644 gfx/sprites/swimmer_guy.png create mode 100644 gfx/sprites/teacher.png create mode 100644 gfx/sprites/twin.png create mode 100644 gfx/sprites/unused_guy.png create mode 100644 gfx/sprites/virtual_boy.png create mode 100644 gfx/sprites/whitney.png create mode 100644 gfx/sprites/will.png create mode 100644 gfx/sprites/youngster.png create mode 100644 gfx/trainer_palettes.asm create mode 100644 gfx/trainer_pic_pointers.asm delete mode 100644 gfx/trainers/palette_pointers.asm diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 1a716f51b..787e130f4 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -1,5 +1,5 @@ ; sprite ids -; SpriteHeaders indexes (see gfx/overworld/sprite_headers.asm) +; SpriteHeaders indexes (see gfx/sprite_headers.asm) const_def const SPRITE_NONE ; 00 const SPRITE_CHRIS ; 01 @@ -166,7 +166,7 @@ SPRITE_VARS EQU const_value const SPRITE_COPYCAT ; fb const SPRITE_JANINE_IMPERSONATOR ; fc -; sprite_header struct members (see gfx/overworld/sprite_headers.asm) +; sprite_header struct members (see gfx/sprite_headers.asm) const_def const SPRITEHEADER_ADDR_LO const SPRITEHEADER_ADDR_HI diff --git a/engine/battle_start.asm b/engine/battle_start.asm index 962948386..b16bbbd67 100644 --- a/engine/battle_start.asm +++ b/engine/battle_start.asm @@ -141,7 +141,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf ; 8c2f4 TrainerBattlePokeballTiles: ; 8c2f4 -INCBIN "gfx/ow_fx/trainer_battle_pokeball_tiles.2bpp" +INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp" FlashyTransitionToBattle: ; 8c314 diff --git a/engine/color.asm b/engine/color.asm index 6e99e9cb7..8690d7f1c 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1877,7 +1877,7 @@ Palettes_a8ca: INCLUDE "gfx/pics/palette_pointers.asm" -INCLUDE "gfx/trainers/palette_pointers.asm" +INCLUDE "gfx/trainer_palettes.asm" LoadMapPals: callba LoadSpecialMapPalette diff --git a/engine/events_3.asm b/engine/events_3.asm index cff4eefb9..b6aaea3b7 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -850,9 +850,9 @@ LoadFishingGFX: ; b84b3 ; b84f2 FishingGFX: ; b84f2 -INCBIN "gfx/ow_fx/chris_fish.2bpp" +INCBIN "gfx/overworld/chris_fish.2bpp" ; b8582 KrisFishingGFX: ; b8582 -INCBIN "gfx/ow_fx/kris_fish.2bpp" +INCBIN "gfx/overworld/kris_fish.2bpp" ; b8612 diff --git a/engine/healmachineanim.asm b/engine/healmachineanim.asm index bea580dcd..4f543c0b3 100755 --- a/engine/healmachineanim.asm +++ b/engine/healmachineanim.asm @@ -137,7 +137,7 @@ HealMachineAnim: ; 12324 ; 123fc .HealMachineGFX: ; 123fc -INCBIN "gfx/ow_fx/heal_machine.2bpp" +INCBIN "gfx/overworld/heal_machine.2bpp" ; 1241c .HOF_OAM: ; 1241c diff --git a/engine/overworld.asm b/engine/overworld.asm index 1a49b1bfc..3ed029800 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -1477,5 +1477,5 @@ Group20Sprites: ; 1472b SpriteHeaders: ; 14736 -INCLUDE "gfx/overworld/sprite_headers.asm" +INCLUDE "gfx/sprite_headers.asm" ; 1499a diff --git a/event/field_moves.asm b/event/field_moves.asm index 2869f9be9..4c4b8cfc1 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -75,7 +75,7 @@ ShakeHeadbuttTree: ; 8c80a ; 8c893 HeadbuttTreeGFX: ; 8c893 -INCBIN "gfx/ow_fx/headbutt_tree.2bpp" +INCBIN "gfx/overworld/headbutt_tree.2bpp" ; 8c913 HideHeadbuttTree: ; 8c913 @@ -152,11 +152,11 @@ OWCutAnimation: ; 8c940 ; 8c98c CutTreeGFX: ; c898c -INCBIN "gfx/ow_fx/cut_tree.2bpp" +INCBIN "gfx/overworld/cut_tree.2bpp" ; c89cc CutGrassGFX: ; 8c9cc -INCBIN "gfx/ow_fx/cut_grass.2bpp" +INCBIN "gfx/overworld/cut_grass.2bpp" ; 8ca0c OWCutJumptable: ; 8ca0c diff --git a/gfx/overworld/000.png b/gfx/overworld/000.png deleted file mode 100644 index 1050bb02c..000000000 Binary files a/gfx/overworld/000.png and /dev/null differ diff --git a/gfx/overworld/001.png b/gfx/overworld/001.png deleted file mode 100644 index 0d18d11a6..000000000 Binary files a/gfx/overworld/001.png and /dev/null differ diff --git a/gfx/overworld/002.png b/gfx/overworld/002.png deleted file mode 100644 index 0ca4acef9..000000000 Binary files a/gfx/overworld/002.png and /dev/null differ diff --git a/gfx/overworld/003.png b/gfx/overworld/003.png deleted file mode 100644 index 7d82d400c..000000000 Binary files a/gfx/overworld/003.png and /dev/null differ diff --git a/gfx/overworld/004.png b/gfx/overworld/004.png deleted file mode 100644 index 7a76574d0..000000000 Binary files a/gfx/overworld/004.png and /dev/null differ diff --git a/gfx/overworld/005.png b/gfx/overworld/005.png deleted file mode 100644 index 018b676f5..000000000 Binary files a/gfx/overworld/005.png and /dev/null differ diff --git a/gfx/overworld/006.png b/gfx/overworld/006.png deleted file mode 100644 index 17fc2fdc6..000000000 Binary files a/gfx/overworld/006.png and /dev/null differ diff --git a/gfx/overworld/007.png b/gfx/overworld/007.png deleted file mode 100644 index d72bb7ba1..000000000 Binary files a/gfx/overworld/007.png and /dev/null differ diff --git a/gfx/overworld/008.png b/gfx/overworld/008.png deleted file mode 100644 index 90b499f16..000000000 Binary files a/gfx/overworld/008.png and /dev/null differ diff --git a/gfx/overworld/009.png b/gfx/overworld/009.png deleted file mode 100644 index b49f8e573..000000000 Binary files a/gfx/overworld/009.png and /dev/null differ diff --git a/gfx/overworld/010.png b/gfx/overworld/010.png deleted file mode 100644 index bd7fc20ea..000000000 Binary files a/gfx/overworld/010.png and /dev/null differ diff --git a/gfx/overworld/011.png b/gfx/overworld/011.png deleted file mode 100644 index 36010c92d..000000000 Binary files a/gfx/overworld/011.png and /dev/null differ diff --git a/gfx/overworld/012.png b/gfx/overworld/012.png deleted file mode 100644 index 6ce1f3092..000000000 Binary files a/gfx/overworld/012.png and /dev/null differ diff --git a/gfx/overworld/013.png b/gfx/overworld/013.png deleted file mode 100644 index 5644764c0..000000000 Binary files a/gfx/overworld/013.png and /dev/null differ diff --git a/gfx/overworld/014.png b/gfx/overworld/014.png deleted file mode 100644 index 84f330f1d..000000000 Binary files a/gfx/overworld/014.png and /dev/null differ diff --git a/gfx/overworld/015.png b/gfx/overworld/015.png deleted file mode 100644 index ed1439b69..000000000 Binary files a/gfx/overworld/015.png and /dev/null differ diff --git a/gfx/overworld/016.png b/gfx/overworld/016.png deleted file mode 100644 index 5229bb404..000000000 Binary files a/gfx/overworld/016.png and /dev/null differ diff --git a/gfx/overworld/017.png b/gfx/overworld/017.png deleted file mode 100644 index a9bc75dbd..000000000 Binary files a/gfx/overworld/017.png and /dev/null differ diff --git a/gfx/overworld/018.png b/gfx/overworld/018.png deleted file mode 100644 index ff8b28b98..000000000 Binary files a/gfx/overworld/018.png and /dev/null differ diff --git a/gfx/overworld/019.png b/gfx/overworld/019.png deleted file mode 100644 index b528045b5..000000000 Binary files a/gfx/overworld/019.png and /dev/null differ diff --git a/gfx/overworld/020.png b/gfx/overworld/020.png deleted file mode 100644 index dcee550e0..000000000 Binary files a/gfx/overworld/020.png and /dev/null differ diff --git a/gfx/overworld/021.png b/gfx/overworld/021.png deleted file mode 100644 index 54300be2d..000000000 Binary files a/gfx/overworld/021.png and /dev/null differ diff --git a/gfx/overworld/022.png b/gfx/overworld/022.png deleted file mode 100644 index 0d8be19ec..000000000 Binary files a/gfx/overworld/022.png and /dev/null differ diff --git a/gfx/overworld/023.png b/gfx/overworld/023.png deleted file mode 100644 index 69f152a3c..000000000 Binary files a/gfx/overworld/023.png and /dev/null differ diff --git a/gfx/overworld/024.png b/gfx/overworld/024.png deleted file mode 100644 index c4e721b75..000000000 Binary files a/gfx/overworld/024.png and /dev/null differ diff --git a/gfx/overworld/025.png b/gfx/overworld/025.png deleted file mode 100644 index f9f8ec431..000000000 Binary files a/gfx/overworld/025.png and /dev/null differ diff --git a/gfx/overworld/026.png b/gfx/overworld/026.png deleted file mode 100644 index 8b95fb3fc..000000000 Binary files a/gfx/overworld/026.png and /dev/null differ diff --git a/gfx/overworld/027.png b/gfx/overworld/027.png deleted file mode 100644 index 5f77217ef..000000000 Binary files a/gfx/overworld/027.png and /dev/null differ diff --git a/gfx/overworld/028.png b/gfx/overworld/028.png deleted file mode 100644 index 8b9857a85..000000000 Binary files a/gfx/overworld/028.png and /dev/null differ diff --git a/gfx/overworld/029.png b/gfx/overworld/029.png deleted file mode 100644 index 5a2372dfa..000000000 Binary files a/gfx/overworld/029.png and /dev/null differ diff --git a/gfx/overworld/030.png b/gfx/overworld/030.png deleted file mode 100644 index ae165c7ab..000000000 Binary files a/gfx/overworld/030.png and /dev/null differ diff --git a/gfx/overworld/031.png b/gfx/overworld/031.png deleted file mode 100644 index 22c157d82..000000000 Binary files a/gfx/overworld/031.png and /dev/null differ diff --git a/gfx/overworld/032.png b/gfx/overworld/032.png deleted file mode 100644 index 8afd066bd..000000000 Binary files a/gfx/overworld/032.png and /dev/null differ diff --git a/gfx/overworld/033.png b/gfx/overworld/033.png deleted file mode 100644 index ef29e27d5..000000000 Binary files a/gfx/overworld/033.png and /dev/null differ diff --git a/gfx/overworld/034.png b/gfx/overworld/034.png deleted file mode 100644 index ffd94f410..000000000 Binary files a/gfx/overworld/034.png and /dev/null differ diff --git a/gfx/overworld/035.png b/gfx/overworld/035.png deleted file mode 100644 index 53bf81b13..000000000 Binary files a/gfx/overworld/035.png and /dev/null differ diff --git a/gfx/overworld/036.png b/gfx/overworld/036.png deleted file mode 100644 index e1306b6a0..000000000 Binary files a/gfx/overworld/036.png and /dev/null differ diff --git a/gfx/overworld/037.png b/gfx/overworld/037.png deleted file mode 100644 index caa9f43af..000000000 Binary files a/gfx/overworld/037.png and /dev/null differ diff --git a/gfx/overworld/038.png b/gfx/overworld/038.png deleted file mode 100644 index 5c0d33939..000000000 Binary files a/gfx/overworld/038.png and /dev/null differ diff --git a/gfx/overworld/039.png b/gfx/overworld/039.png deleted file mode 100644 index 762108ad5..000000000 Binary files a/gfx/overworld/039.png and /dev/null differ diff --git a/gfx/overworld/040.png b/gfx/overworld/040.png deleted file mode 100644 index 2107159e9..000000000 Binary files a/gfx/overworld/040.png and /dev/null differ diff --git a/gfx/overworld/041.png b/gfx/overworld/041.png deleted file mode 100644 index af5a7e7e7..000000000 Binary files a/gfx/overworld/041.png and /dev/null differ diff --git a/gfx/overworld/042.png b/gfx/overworld/042.png deleted file mode 100644 index 6866c7b30..000000000 Binary files a/gfx/overworld/042.png and /dev/null differ diff --git a/gfx/overworld/043.png b/gfx/overworld/043.png deleted file mode 100644 index 50ac2089e..000000000 Binary files a/gfx/overworld/043.png and /dev/null differ diff --git a/gfx/overworld/044.png b/gfx/overworld/044.png deleted file mode 100644 index fea7979d3..000000000 Binary files a/gfx/overworld/044.png and /dev/null differ diff --git a/gfx/overworld/045.png b/gfx/overworld/045.png deleted file mode 100644 index aa1fbc06f..000000000 Binary files a/gfx/overworld/045.png and /dev/null differ diff --git a/gfx/overworld/046.png b/gfx/overworld/046.png deleted file mode 100644 index abe61a31d..000000000 Binary files a/gfx/overworld/046.png and /dev/null differ diff --git a/gfx/overworld/047.png b/gfx/overworld/047.png deleted file mode 100644 index 763b2a2b1..000000000 Binary files a/gfx/overworld/047.png and /dev/null differ diff --git a/gfx/overworld/048.png b/gfx/overworld/048.png deleted file mode 100644 index 4c1818b2b..000000000 Binary files a/gfx/overworld/048.png and /dev/null differ diff --git a/gfx/overworld/049.png b/gfx/overworld/049.png deleted file mode 100644 index eed753ab2..000000000 Binary files a/gfx/overworld/049.png and /dev/null differ diff --git a/gfx/overworld/050.png b/gfx/overworld/050.png deleted file mode 100644 index f53f71105..000000000 Binary files a/gfx/overworld/050.png and /dev/null differ diff --git a/gfx/overworld/051.png b/gfx/overworld/051.png deleted file mode 100644 index e6a3d7d03..000000000 Binary files a/gfx/overworld/051.png and /dev/null differ diff --git a/gfx/overworld/052.png b/gfx/overworld/052.png deleted file mode 100644 index 43a71bd6e..000000000 Binary files a/gfx/overworld/052.png and /dev/null differ diff --git a/gfx/overworld/053.png b/gfx/overworld/053.png deleted file mode 100644 index b8714ba6f..000000000 Binary files a/gfx/overworld/053.png and /dev/null differ diff --git a/gfx/overworld/054.png b/gfx/overworld/054.png deleted file mode 100644 index 4cd71fcfc..000000000 Binary files a/gfx/overworld/054.png and /dev/null differ diff --git a/gfx/overworld/055.png b/gfx/overworld/055.png deleted file mode 100644 index b6c98bbef..000000000 Binary files a/gfx/overworld/055.png and /dev/null differ diff --git a/gfx/overworld/056.png b/gfx/overworld/056.png deleted file mode 100644 index 77a5fb914..000000000 Binary files a/gfx/overworld/056.png and /dev/null differ diff --git a/gfx/overworld/057.png b/gfx/overworld/057.png deleted file mode 100644 index a84a2e371..000000000 Binary files a/gfx/overworld/057.png and /dev/null differ diff --git a/gfx/overworld/058.png b/gfx/overworld/058.png deleted file mode 100644 index 748444f8e..000000000 Binary files a/gfx/overworld/058.png and /dev/null differ diff --git a/gfx/overworld/059.png b/gfx/overworld/059.png deleted file mode 100644 index 39c44291e..000000000 Binary files a/gfx/overworld/059.png and /dev/null differ diff --git a/gfx/overworld/060.png b/gfx/overworld/060.png deleted file mode 100644 index 0ea041f5b..000000000 Binary files a/gfx/overworld/060.png and /dev/null differ diff --git a/gfx/overworld/061.png b/gfx/overworld/061.png deleted file mode 100644 index 802230467..000000000 Binary files a/gfx/overworld/061.png and /dev/null differ diff --git a/gfx/overworld/062.png b/gfx/overworld/062.png deleted file mode 100644 index d979b9a6e..000000000 Binary files a/gfx/overworld/062.png and /dev/null differ diff --git a/gfx/overworld/063.png b/gfx/overworld/063.png deleted file mode 100644 index 38a6125d2..000000000 Binary files a/gfx/overworld/063.png and /dev/null differ diff --git a/gfx/overworld/064.png b/gfx/overworld/064.png deleted file mode 100644 index 9aec228c5..000000000 Binary files a/gfx/overworld/064.png and /dev/null differ diff --git a/gfx/overworld/065.png b/gfx/overworld/065.png deleted file mode 100644 index 0d102b04a..000000000 Binary files a/gfx/overworld/065.png and /dev/null differ diff --git a/gfx/overworld/066.png b/gfx/overworld/066.png deleted file mode 100644 index f62252038..000000000 Binary files a/gfx/overworld/066.png and /dev/null differ diff --git a/gfx/overworld/067.png b/gfx/overworld/067.png deleted file mode 100644 index 9dfe77ff4..000000000 Binary files a/gfx/overworld/067.png and /dev/null differ diff --git a/gfx/overworld/068.png b/gfx/overworld/068.png deleted file mode 100644 index d651ad3e6..000000000 Binary files a/gfx/overworld/068.png and /dev/null differ diff --git a/gfx/overworld/069.png b/gfx/overworld/069.png deleted file mode 100644 index 7408cbbbc..000000000 Binary files a/gfx/overworld/069.png and /dev/null differ diff --git a/gfx/overworld/070.png b/gfx/overworld/070.png deleted file mode 100644 index 45f27649e..000000000 Binary files a/gfx/overworld/070.png and /dev/null differ diff --git a/gfx/overworld/071.png b/gfx/overworld/071.png deleted file mode 100644 index a1f74da03..000000000 Binary files a/gfx/overworld/071.png and /dev/null differ diff --git a/gfx/overworld/072.png b/gfx/overworld/072.png deleted file mode 100644 index b4d3b5f2a..000000000 Binary files a/gfx/overworld/072.png and /dev/null differ diff --git a/gfx/overworld/073.png b/gfx/overworld/073.png deleted file mode 100644 index 5d056cf42..000000000 Binary files a/gfx/overworld/073.png and /dev/null differ diff --git a/gfx/overworld/074.png b/gfx/overworld/074.png deleted file mode 100644 index ed0fa1d28..000000000 Binary files a/gfx/overworld/074.png and /dev/null differ diff --git a/gfx/overworld/075.png b/gfx/overworld/075.png deleted file mode 100644 index 80d615b2e..000000000 Binary files a/gfx/overworld/075.png and /dev/null differ diff --git a/gfx/overworld/076.png b/gfx/overworld/076.png deleted file mode 100644 index 06fe00768..000000000 Binary files a/gfx/overworld/076.png and /dev/null differ diff --git a/gfx/overworld/077.png b/gfx/overworld/077.png deleted file mode 100644 index 9e2009940..000000000 Binary files a/gfx/overworld/077.png and /dev/null differ diff --git a/gfx/overworld/078.png b/gfx/overworld/078.png deleted file mode 100644 index 3b6c621b8..000000000 Binary files a/gfx/overworld/078.png and /dev/null differ diff --git a/gfx/overworld/079.png b/gfx/overworld/079.png deleted file mode 100644 index 7996be17e..000000000 Binary files a/gfx/overworld/079.png and /dev/null differ diff --git a/gfx/overworld/080.png b/gfx/overworld/080.png deleted file mode 100644 index 6d2bdc8d7..000000000 Binary files a/gfx/overworld/080.png and /dev/null differ diff --git a/gfx/overworld/081.png b/gfx/overworld/081.png deleted file mode 100644 index 9354f928b..000000000 Binary files a/gfx/overworld/081.png and /dev/null differ diff --git a/gfx/overworld/082.png b/gfx/overworld/082.png deleted file mode 100644 index d124616b0..000000000 Binary files a/gfx/overworld/082.png and /dev/null differ diff --git a/gfx/overworld/083.png b/gfx/overworld/083.png deleted file mode 100644 index b12bf897c..000000000 Binary files a/gfx/overworld/083.png and /dev/null differ diff --git a/gfx/overworld/084.png b/gfx/overworld/084.png deleted file mode 100644 index 63846bfad..000000000 Binary files a/gfx/overworld/084.png and /dev/null differ diff --git a/gfx/overworld/085.png b/gfx/overworld/085.png deleted file mode 100644 index da171b3b2..000000000 Binary files a/gfx/overworld/085.png and /dev/null differ diff --git a/gfx/overworld/086.png b/gfx/overworld/086.png deleted file mode 100644 index dba7dc130..000000000 Binary files a/gfx/overworld/086.png and /dev/null differ diff --git a/gfx/overworld/087.png b/gfx/overworld/087.png deleted file mode 100644 index fad0eedd8..000000000 Binary files a/gfx/overworld/087.png and /dev/null differ diff --git a/gfx/overworld/088.png b/gfx/overworld/088.png deleted file mode 100644 index 5a614d7bb..000000000 Binary files a/gfx/overworld/088.png and /dev/null differ diff --git a/gfx/overworld/089.png b/gfx/overworld/089.png deleted file mode 100644 index 9b408e021..000000000 Binary files a/gfx/overworld/089.png and /dev/null differ diff --git a/gfx/overworld/090.png b/gfx/overworld/090.png deleted file mode 100644 index 4eaae4591..000000000 Binary files a/gfx/overworld/090.png and /dev/null differ diff --git a/gfx/overworld/091.png b/gfx/overworld/091.png deleted file mode 100644 index 15ff22d0a..000000000 Binary files a/gfx/overworld/091.png and /dev/null differ diff --git a/gfx/overworld/092.png b/gfx/overworld/092.png deleted file mode 100644 index b27633907..000000000 Binary files a/gfx/overworld/092.png and /dev/null differ diff --git a/gfx/overworld/093.png b/gfx/overworld/093.png deleted file mode 100644 index cc12f9f34..000000000 Binary files a/gfx/overworld/093.png and /dev/null differ diff --git a/gfx/overworld/094.png b/gfx/overworld/094.png deleted file mode 100644 index 458cda431..000000000 Binary files a/gfx/overworld/094.png and /dev/null differ diff --git a/gfx/overworld/095.png b/gfx/overworld/095.png deleted file mode 100644 index d4339470e..000000000 Binary files a/gfx/overworld/095.png and /dev/null differ diff --git a/gfx/overworld/096.png b/gfx/overworld/096.png deleted file mode 100644 index 161ce5722..000000000 Binary files a/gfx/overworld/096.png and /dev/null differ diff --git a/gfx/overworld/097.png b/gfx/overworld/097.png deleted file mode 100644 index 69e46b84c..000000000 Binary files a/gfx/overworld/097.png and /dev/null differ diff --git a/gfx/overworld/098.png b/gfx/overworld/098.png deleted file mode 100644 index c3aef5c6c..000000000 Binary files a/gfx/overworld/098.png and /dev/null differ diff --git a/gfx/overworld/099.png b/gfx/overworld/099.png deleted file mode 100644 index 1ff4fd63c..000000000 Binary files a/gfx/overworld/099.png and /dev/null differ diff --git a/gfx/overworld/100.png b/gfx/overworld/100.png deleted file mode 100644 index 4a5f1f186..000000000 Binary files a/gfx/overworld/100.png and /dev/null differ diff --git a/gfx/overworld/101.png b/gfx/overworld/101.png deleted file mode 100644 index 61a8b79c6..000000000 Binary files a/gfx/overworld/101.png and /dev/null differ diff --git a/gfx/overworld/boulder_dust.png b/gfx/overworld/boulder_dust.png new file mode 100644 index 000000000..9acb11c1b Binary files /dev/null and b/gfx/overworld/boulder_dust.png differ diff --git a/gfx/overworld/chris_fish.png b/gfx/overworld/chris_fish.png new file mode 100644 index 000000000..ea0730151 Binary files /dev/null and b/gfx/overworld/chris_fish.png differ diff --git a/gfx/overworld/cut_grass.png b/gfx/overworld/cut_grass.png new file mode 100644 index 000000000..b10e0cf8c Binary files /dev/null and b/gfx/overworld/cut_grass.png differ diff --git a/gfx/overworld/cut_tree.png b/gfx/overworld/cut_tree.png new file mode 100644 index 000000000..c1f1bc97d Binary files /dev/null and b/gfx/overworld/cut_tree.png differ diff --git a/gfx/overworld/fishing_rod.png b/gfx/overworld/fishing_rod.png new file mode 100644 index 000000000..32d277269 Binary files /dev/null and b/gfx/overworld/fishing_rod.png differ diff --git a/gfx/overworld/grass_rustle.png b/gfx/overworld/grass_rustle.png new file mode 100644 index 000000000..0b2d73e2c Binary files /dev/null and b/gfx/overworld/grass_rustle.png differ diff --git a/gfx/overworld/headbutt_tree.png b/gfx/overworld/headbutt_tree.png new file mode 100644 index 000000000..4cbb595f7 Binary files /dev/null and b/gfx/overworld/headbutt_tree.png differ diff --git a/gfx/overworld/heal_machine.png b/gfx/overworld/heal_machine.png new file mode 100644 index 000000000..dbf513487 Binary files /dev/null and b/gfx/overworld/heal_machine.png differ diff --git a/gfx/overworld/kris_fish.png b/gfx/overworld/kris_fish.png new file mode 100644 index 000000000..a47b89042 Binary files /dev/null and b/gfx/overworld/kris_fish.png differ diff --git a/gfx/overworld/shadow.png b/gfx/overworld/shadow.png new file mode 100644 index 000000000..ba3dab5be Binary files /dev/null and b/gfx/overworld/shadow.png differ diff --git a/gfx/overworld/sprite_headers.asm b/gfx/overworld/sprite_headers.asm deleted file mode 100644 index 095d7594b..000000000 --- a/gfx/overworld/sprite_headers.asm +++ /dev/null @@ -1,419 +0,0 @@ -; Format: -; Address -; Length, Bank -; Type, Palette - -sprite_header: MACRO -; pointer, length, type, palette - dw \1 - db \2 * 4 tiles, BANK(\1) - db \3, \4 -ENDM - -ChrisSprite: ; 14736 - sprite_header ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 1473c - -ChrisBikeSprite: ; 1473c - sprite_header ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 14742 - -GameboyKidSprite: ; 14742 - sprite_header GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN -; 14748 - -SilverSprite: ; 14748 - sprite_header SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 1474e - -OakSprite: ; 1474e - sprite_header OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 14754 - -RedSprite: ; 14754 - sprite_header RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 1475a - -BlueSprite: ; 1475a - sprite_header BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 14760 - -BillSprite: ; 14760 - sprite_header BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 14766 - -ElderSprite: ; 14766 - sprite_header ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 1476c - -JanineSprite: ; 1476c - sprite_header JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 14772 - -KurtSprite: ; 14772 - sprite_header KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 14778 - -MomSprite: ; 14778 - sprite_header MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 1477e - -BlaineSprite: ; 1477e - sprite_header BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 14784 - -RedsMomSprite: ; 14784 - sprite_header RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 1478a - -DaisySprite: ; 1478a - sprite_header DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14790 - -ElmSprite: ; 14790 - sprite_header ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 14796 - -WillSprite: ; 14796 - sprite_header WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED -; 1479c - -FalknerSprite: ; 1479c - sprite_header FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 147a2 - -WhitneySprite: ; 147a2 - sprite_header WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 147a8 - -BugsySprite: ; 147a8 - sprite_header BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN -; 147ae - -MortySprite: ; 147ae - sprite_header MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 147b4 - -ChuckSprite: ; 147b4 - sprite_header ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 147ba - -JasmineSprite: ; 147ba - sprite_header JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN -; 147c0 - -PryceSprite: ; 147c0 - sprite_header PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 147c6 - -ClairSprite: ; 147c6 - sprite_header ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 147cc - -BrockSprite: ; 147cc - sprite_header BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 147d2 - -KarenSprite: ; 147d2 - sprite_header KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE -; 147d8 - -BrunoSprite: ; 147d8 - sprite_header BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 147de - -MistySprite: ; 147de - sprite_header MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 147e4 - -LanceSprite: ; 147e4 - sprite_header LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 147ea - -SurgeSprite: ; 147ea - sprite_header SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN -; 147f0 - -ErikaSprite: ; 147f0 - sprite_header ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN -; 147f6 - -KogaSprite: ; 147f6 - sprite_header KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 147fc - -SabrinaSprite: ; 147fc - sprite_header SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 14802 - -CooltrainerMSprite: ; 14802 - sprite_header CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14808 - -CooltrainerFSprite: ; 14808 - sprite_header CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 1480e - -BugCatcherSprite: ; 1480e - sprite_header BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14814 - -TwinSprite: ; 14814 - sprite_header TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 1481a - -YoungsterSprite: ; 1481a - sprite_header YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14820 - -LassSprite: ; 14820 - sprite_header LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 14826 - -TeacherSprite: ; 14826 - sprite_header TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 1482c - -BuenaSprite: ; 1482c - sprite_header BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14832 - -SuperNerdSprite: ; 14832 - sprite_header SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14838 - -RockerSprite: ; 14838 - sprite_header RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN -; 1483e - -PokefanMSprite: ; 1483e - sprite_header PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 14844 - -PokefanFSprite: ; 14844 - sprite_header PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 1484a - -GrampsSprite: ; 1484a - sprite_header GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 14850 - -GrannySprite: ; 14850 - sprite_header GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 14856 - -SwimmerGuySprite: ; 14856 - sprite_header SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 1485c - -SwimmerGirlSprite: ; 1485c - sprite_header SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14862 - -BigSnorlaxSprite: ; 14862 - sprite_header BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE -; 14868 - -SurfingPikachuSprite: ; 14868 - sprite_header SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 1486e - -RocketSprite: ; 1486e - sprite_header RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 14874 - -RocketGirlSprite: ; 14874 - sprite_header RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 1487a - -NurseSprite: ; 1487a - sprite_header NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED -; 14880 - -LinkReceptionistSprite: ; 14880 - sprite_header LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 14886 - -ClerkSprite: ; 14886 - sprite_header ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN -; 1488c - -FisherSprite: ; 1488c - sprite_header FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14892 - -FishingGuruSprite: ; 14892 - sprite_header FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14898 - -ScientistSprite: ; 14898 - sprite_header ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 1489e - -KimonoGirlSprite: ; 1489e - sprite_header KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 148a4 - -SageSprite: ; 148a4 - sprite_header SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 148aa - -UnusedGuySprite: ; 148aa - sprite_header UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED -; 148b0 - -GentlemanSprite: ; 148b0 - sprite_header GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 148b6 - -BlackBeltSprite: ; 148b6 - sprite_header BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 148bc - -ReceptionistSprite: ; 148bc - sprite_header ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 148c2 - -OfficerSprite: ; 148c2 - sprite_header OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 148c8 - -CalSprite: ; 148c8 - sprite_header CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 148ce - -SlowpokeSprite: ; 148ce - sprite_header SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED -; 148d4 - -CaptainSprite: ; 148d4 - sprite_header CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 148da - -BigLaprasSprite: ; 148da - sprite_header BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE -; 148e0 - -GymGuySprite: ; 148e0 - sprite_header GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 148e6 - -SailorSprite: ; 148e6 - sprite_header SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 148ec - -BikerSprite: ; 148ec - sprite_header BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN -; 148f2 - -PharmacistSprite: ; 148f2 - sprite_header PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 148f8 - -MonsterSprite: ; 148f8 - sprite_header MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 148fe - -FairySprite: ; 148fe - sprite_header FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 14904 - -BirdSprite: ; 14904 - sprite_header BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 1490a - -DragonSprite: ; 1490a - sprite_header DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED -; 14910 - -BigOnixSprite: ; 14910 - sprite_header BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN -; 14916 - -N64Sprite: ; 14916 - sprite_header N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN -; 1491c - -SudowoodoSprite: ; 1491c - sprite_header SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN -; 14922 - -SurfSprite: ; 14922 - sprite_header SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14928 - -PokeBallSprite: ; 14928 - sprite_header PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED -; 1492e - -PokedexSprite: ; 1492e - sprite_header PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN -; 14934 - -PaperSprite: ; 14934 - sprite_header PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE -; 1493a - -VirtualBoySprite: ; 1493a - sprite_header VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED -; 14940 - -OldLinkReceptionistSprite: ; 14940 - sprite_header OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED -; 14946 - -RockSprite: ; 14946 - sprite_header RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK -; 1494c - -BoulderSprite: ; 1494c - sprite_header BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK -; 14952 - -SnesSprite: ; 14952 - sprite_header SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE -; 14958 - -FamicomSprite: ; 14958 - sprite_header FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED -; 1495e - -FruitTreeSprite: ; 1495e - sprite_header FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE -; 14964 - -GoldTrophySprite: ; 14964 - sprite_header GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN -; 1496a - -SilverTrophySprite: ; 1496a - sprite_header SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER -; 14970 - -KrisSprite: ; 14970 - sprite_header KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 14976 - -KrisBikeSprite: ; 14976 - sprite_header KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE -; 1497c - -KurtOutsideSprite: ; 1497c - sprite_header KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN -; 14982 - -SuicuneSprite: ; 14982 - sprite_header SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE -; 14988 - -EnteiSprite: ; 14988 - sprite_header EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED -; 1498e - -RaikouSprite: ; 1498e - sprite_header RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED -; 14994 - -StandingYoungsterSprite: ; 14994 - sprite_header StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE -; 1499a diff --git a/gfx/overworld/sprites_1.asm b/gfx/overworld/sprites_1.asm deleted file mode 100644 index 640ac6ccc..000000000 --- a/gfx/overworld/sprites_1.asm +++ /dev/null @@ -1,44 +0,0 @@ -ChrisSpriteGFX: INCBIN "gfx/overworld/000.2bpp" ; c0000 -ChrisBikeSpriteGFX: INCBIN "gfx/overworld/001.2bpp" ; c0180 -GameboyKidSpriteGFX: INCBIN "gfx/overworld/002.2bpp" ; c0300 -SilverSpriteGFX: INCBIN "gfx/overworld/003.2bpp" ; c03c0 -OakSpriteGFX: INCBIN "gfx/overworld/004.2bpp" ; c0540 -RedSpriteGFX: INCBIN "gfx/overworld/005.2bpp" ; c06c0 -BlueSpriteGFX: INCBIN "gfx/overworld/006.2bpp" ; c0840 -BillSpriteGFX: INCBIN "gfx/overworld/007.2bpp" ; c09c0 -ElderSpriteGFX: INCBIN "gfx/overworld/008.2bpp" ; c0b40 -JanineSpriteGFX: INCBIN "gfx/overworld/009.2bpp" ; c0cc0 -KurtSpriteGFX: INCBIN "gfx/overworld/010.2bpp" ; c0e40 -MomSpriteGFX: INCBIN "gfx/overworld/011.2bpp" ; c0fc0 -BlaineSpriteGFX: INCBIN "gfx/overworld/012.2bpp" ; c1140 -RedsMomSpriteGFX: INCBIN "gfx/overworld/013.2bpp" ; c12c0 -DaisySpriteGFX: INCBIN "gfx/overworld/014.2bpp" ; c1440 -ElmSpriteGFX: INCBIN "gfx/overworld/015.2bpp" ; c15c0 -WillSpriteGFX: INCBIN "gfx/overworld/016.2bpp" ; c1740 -FalknerSpriteGFX: INCBIN "gfx/overworld/017.2bpp" ; c1800 -WhitneySpriteGFX: INCBIN "gfx/overworld/018.2bpp" ; c1980 -BugsySpriteGFX: INCBIN "gfx/overworld/019.2bpp" ; c1b00 -MortySpriteGFX: INCBIN "gfx/overworld/020.2bpp" ; c1c80 -ChuckSpriteGFX: INCBIN "gfx/overworld/021.2bpp" ; c1e00 -JasmineSpriteGFX: INCBIN "gfx/overworld/022.2bpp" ; c1f80 -PryceSpriteGFX: INCBIN "gfx/overworld/023.2bpp" ; c2100 -ClairSpriteGFX: INCBIN "gfx/overworld/024.2bpp" ; c2280 -BrockSpriteGFX: INCBIN "gfx/overworld/025.2bpp" ; c2400 -KarenSpriteGFX: INCBIN "gfx/overworld/026.2bpp" ; c2580 -BrunoSpriteGFX: INCBIN "gfx/overworld/027.2bpp" ; c2640 -MistySpriteGFX: INCBIN "gfx/overworld/028.2bpp" ; c27c0 -LanceSpriteGFX: INCBIN "gfx/overworld/029.2bpp" ; c2940 -SurgeSpriteGFX: INCBIN "gfx/overworld/030.2bpp" ; c2ac0 -ErikaSpriteGFX: INCBIN "gfx/overworld/031.2bpp" ; c2c40 -KogaSpriteGFX: INCBIN "gfx/overworld/032.2bpp" ; c2dc0 -SabrinaSpriteGFX: INCBIN "gfx/overworld/033.2bpp" ; c2f40 -CooltrainerMSpriteGFX: INCBIN "gfx/overworld/034.2bpp" ; c30c0 -CooltrainerFSpriteGFX: INCBIN "gfx/overworld/035.2bpp" ; c3240 -BugCatcherSpriteGFX: INCBIN "gfx/overworld/036.2bpp" ; c33c0 -TwinSpriteGFX: INCBIN "gfx/overworld/037.2bpp" ; c3540 -YoungsterSpriteGFX: INCBIN "gfx/overworld/038.2bpp" ; c36c0 -LassSpriteGFX: INCBIN "gfx/overworld/039.2bpp" ; c3840 -TeacherSpriteGFX: INCBIN "gfx/overworld/040.2bpp" ; c39c0 -BuenaSpriteGFX: INCBIN "gfx/overworld/041.2bpp" ; c3b40 -SuperNerdSpriteGFX: INCBIN "gfx/overworld/042.2bpp" ; c3cc0 -RockerSpriteGFX: INCBIN "gfx/overworld/043.2bpp" ; c3e40 diff --git a/gfx/overworld/sprites_2.asm b/gfx/overworld/sprites_2.asm deleted file mode 100644 index 20060d0c1..000000000 --- a/gfx/overworld/sprites_2.asm +++ /dev/null @@ -1,58 +0,0 @@ -PokefanMSpriteGFX: INCBIN "gfx/overworld/044.2bpp" ; c4000 -PokefanFSpriteGFX: INCBIN "gfx/overworld/045.2bpp" ; c4180 -GrampsSpriteGFX: INCBIN "gfx/overworld/046.2bpp" ; c4300 -GrannySpriteGFX: INCBIN "gfx/overworld/047.2bpp" ; c4480 -SwimmerGuySpriteGFX: INCBIN "gfx/overworld/048.2bpp" ; c4600 -SwimmerGirlSpriteGFX: INCBIN "gfx/overworld/049.2bpp" ; c4780 -BigSnorlaxSpriteGFX: INCBIN "gfx/overworld/050.2bpp" ; c4900 -SurfingPikachuSpriteGFX: INCBIN "gfx/overworld/051.2bpp" ; c4980 -RocketSpriteGFX: INCBIN "gfx/overworld/052.2bpp" ; c4b00 -RocketGirlSpriteGFX: INCBIN "gfx/overworld/053.2bpp" ; c4c80 -NurseSpriteGFX: INCBIN "gfx/overworld/054.2bpp" ; c4e00 -LinkReceptionistSpriteGFX: INCBIN "gfx/overworld/055.2bpp" ; c4ec0 -ClerkSpriteGFX: INCBIN "gfx/overworld/056.2bpp" ; c5040 -FisherSpriteGFX: INCBIN "gfx/overworld/057.2bpp" ; c51c0 -FishingGuruSpriteGFX: INCBIN "gfx/overworld/058.2bpp" ; c5340 -ScientistSpriteGFX: INCBIN "gfx/overworld/059.2bpp" ; c54c0 -KimonoGirlSpriteGFX: INCBIN "gfx/overworld/060.2bpp" ; c5640 -SageSpriteGFX: INCBIN "gfx/overworld/061.2bpp" ; c57c0 -UnusedGuySpriteGFX: INCBIN "gfx/overworld/062.2bpp" ; c5940 -GentlemanSpriteGFX: INCBIN "gfx/overworld/063.2bpp" ; c5ac0 -BlackBeltSpriteGFX: INCBIN "gfx/overworld/064.2bpp" ; c5c40 -ReceptionistSpriteGFX: INCBIN "gfx/overworld/065.2bpp" ; c5dc0 -OfficerSpriteGFX: INCBIN "gfx/overworld/066.2bpp" ; c5f40 -CalSpriteGFX: INCBIN "gfx/overworld/067.2bpp" ; c60c0 -SlowpokeSpriteGFX: INCBIN "gfx/overworld/068.2bpp" ; c6240 -CaptainSpriteGFX: INCBIN "gfx/overworld/069.2bpp" ; c6280 -BigLaprasSpriteGFX: INCBIN "gfx/overworld/070.2bpp" ; c6400 -GymGuySpriteGFX: INCBIN "gfx/overworld/071.2bpp" ; c6480 -SailorSpriteGFX: INCBIN "gfx/overworld/072.2bpp" ; c6600 -BikerSpriteGFX: INCBIN "gfx/overworld/073.2bpp" ; c6780 -PharmacistSpriteGFX: INCBIN "gfx/overworld/074.2bpp" ; c6900 -MonsterSpriteGFX: INCBIN "gfx/overworld/075.2bpp" ; c6a80 -FairySpriteGFX: INCBIN "gfx/overworld/076.2bpp" ; c6c00 -BirdSpriteGFX: INCBIN "gfx/overworld/077.2bpp" ; c6d80 -DragonSpriteGFX: INCBIN "gfx/overworld/078.2bpp" ; c6f00 -BigOnixSpriteGFX: INCBIN "gfx/overworld/079.2bpp" ; c7080 -N64SpriteGFX: INCBIN "gfx/overworld/080.2bpp" ; c7140 -SudowoodoSpriteGFX: INCBIN "gfx/overworld/081.2bpp" ; c7180 -SurfSpriteGFX: INCBIN "gfx/overworld/082.2bpp" ; c7200 -PokeBallSpriteGFX: INCBIN "gfx/overworld/083.2bpp" ; c7380 -PokedexSpriteGFX: INCBIN "gfx/overworld/084.2bpp" ; c7500 -PaperSpriteGFX: INCBIN "gfx/overworld/085.2bpp" ; c7680 -VirtualBoySpriteGFX: INCBIN "gfx/overworld/086.2bpp" ; c7800 -OldLinkReceptionistSpriteGFX: INCBIN "gfx/overworld/087.2bpp" ; c7840 -RockSpriteGFX: INCBIN "gfx/overworld/088.2bpp" ; c7880 -BoulderSpriteGFX: INCBIN "gfx/overworld/089.2bpp" ; c78c0 -SnesSpriteGFX: INCBIN "gfx/overworld/090.2bpp" ; c7900 -FamicomSpriteGFX: INCBIN "gfx/overworld/091.2bpp" ; c7940 -FruitTreeSpriteGFX: INCBIN "gfx/overworld/092.2bpp" ; c7980 -GoldTrophySpriteGFX: INCBIN "gfx/overworld/093.2bpp" ; c79c0 -SilverTrophySpriteGFX: INCBIN "gfx/overworld/094.2bpp" ; c7a00 -KrisSpriteGFX: INCBIN "gfx/overworld/095.2bpp" ; c7a40 -KrisBikeSpriteGFX: INCBIN "gfx/overworld/096.2bpp" ; c7bc0 -KurtOutsideSpriteGFX: INCBIN "gfx/overworld/097.2bpp" ; c7d40 -SuicuneSpriteGFX: INCBIN "gfx/overworld/098.2bpp" ; c7e00 -EnteiSpriteGFX: INCBIN "gfx/overworld/099.2bpp" ; c7e40 -RaikouSpriteGFX: INCBIN "gfx/overworld/100.2bpp" ; c7e80 -StandingYoungsterSpriteGFX: INCBIN "gfx/overworld/101.2bpp" ; c7ec0 diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.png b/gfx/overworld/trainer_battle_pokeball_tiles.png new file mode 100644 index 000000000..a4655d26e Binary files /dev/null and b/gfx/overworld/trainer_battle_pokeball_tiles.png differ diff --git a/gfx/ow_fx/boulder_dust.png b/gfx/ow_fx/boulder_dust.png deleted file mode 100644 index 9acb11c1b..000000000 Binary files a/gfx/ow_fx/boulder_dust.png and /dev/null differ diff --git a/gfx/ow_fx/chris_fish.png b/gfx/ow_fx/chris_fish.png deleted file mode 100644 index ea0730151..000000000 Binary files a/gfx/ow_fx/chris_fish.png and /dev/null differ diff --git a/gfx/ow_fx/cut_grass.png b/gfx/ow_fx/cut_grass.png deleted file mode 100644 index b10e0cf8c..000000000 Binary files a/gfx/ow_fx/cut_grass.png and /dev/null differ diff --git a/gfx/ow_fx/cut_tree.png b/gfx/ow_fx/cut_tree.png deleted file mode 100644 index c1f1bc97d..000000000 Binary files a/gfx/ow_fx/cut_tree.png and /dev/null differ diff --git a/gfx/ow_fx/fishing_rod.png b/gfx/ow_fx/fishing_rod.png deleted file mode 100644 index 32d277269..000000000 Binary files a/gfx/ow_fx/fishing_rod.png and /dev/null differ diff --git a/gfx/ow_fx/grass_rustle.png b/gfx/ow_fx/grass_rustle.png deleted file mode 100644 index 0b2d73e2c..000000000 Binary files a/gfx/ow_fx/grass_rustle.png and /dev/null differ diff --git a/gfx/ow_fx/headbutt_tree.png b/gfx/ow_fx/headbutt_tree.png deleted file mode 100644 index 4cbb595f7..000000000 Binary files a/gfx/ow_fx/headbutt_tree.png and /dev/null differ diff --git a/gfx/ow_fx/heal_machine.png b/gfx/ow_fx/heal_machine.png deleted file mode 100644 index dbf513487..000000000 Binary files a/gfx/ow_fx/heal_machine.png and /dev/null differ diff --git a/gfx/ow_fx/kris_fish.png b/gfx/ow_fx/kris_fish.png deleted file mode 100644 index a47b89042..000000000 Binary files a/gfx/ow_fx/kris_fish.png and /dev/null differ diff --git a/gfx/ow_fx/shadow.png b/gfx/ow_fx/shadow.png deleted file mode 100644 index ba3dab5be..000000000 Binary files a/gfx/ow_fx/shadow.png and /dev/null differ diff --git a/gfx/ow_fx/trainer_battle_pokeball_tiles.png b/gfx/ow_fx/trainer_battle_pokeball_tiles.png deleted file mode 100644 index a4655d26e..000000000 Binary files a/gfx/ow_fx/trainer_battle_pokeball_tiles.png and /dev/null differ diff --git a/gfx/pics.asm b/gfx/pics.asm index c48106e3c..7e0aebb5c 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1,18 +1,21 @@ INCLUDE "includes.asm" -; Unown pic pointers are assumed to start at the same address in a different bank. - SECTION "Pic Pointers", ROMX + PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm" + SECTION "Unown Pic Pointers", ROMX + +; Unown pic pointers are assumed to start at the same address as PicPointers, +; but in a different bank. UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm" SECTION "Trainer Pic Pointers", ROMX -TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm" +TrainerPicPointers:: INCLUDE "gfx/trainer_pic_pointers.asm" SECTION "Pics 1", ROMX diff --git a/gfx/pics/trainer_pic_pointers.asm b/gfx/pics/trainer_pic_pointers.asm deleted file mode 100644 index 4c1db41d5..000000000 --- a/gfx/pics/trainer_pic_pointers.asm +++ /dev/null @@ -1,68 +0,0 @@ - - add_pic FalknerPic - add_pic WhitneyPic - add_pic BugsyPic - add_pic MortyPic - add_pic PrycePic - add_pic JasminePic - add_pic ChuckPic - add_pic ClairPic - add_pic Rival1Pic - add_pic PokemonProfPic - add_pic WillPic - add_pic CalPic - add_pic BrunoPic - add_pic KarenPic - add_pic KogaPic - add_pic ChampionPic - add_pic BrockPic - add_pic MistyPic - add_pic LtSurgePic - add_pic ScientistPic - add_pic ErikaPic - add_pic YoungsterPic - add_pic SchoolboyPic - add_pic BirdKeeperPic - add_pic LassPic - add_pic JaninePic - add_pic CooltrainermPic - add_pic CooltrainerfPic - add_pic BeautyPic - add_pic PokemaniacPic - add_pic GruntmPic - add_pic GentlemanPic - add_pic SkierPic - add_pic TeacherPic - add_pic SabrinaPic - add_pic BugCatcherPic - add_pic FisherPic - add_pic SwimmermPic - add_pic SwimmerfPic - add_pic SailorPic - add_pic SuperNerdPic - add_pic Rival2Pic - add_pic GuitaristPic - add_pic HikerPic - add_pic BikerPic - add_pic BlainePic - add_pic BurglarPic - add_pic FirebreatherPic - add_pic JugglerPic - add_pic BlackbeltTPic - add_pic ExecutivemPic - add_pic PsychicTPic - add_pic PicnickerPic - add_pic CamperPic - add_pic ExecutivefPic - add_pic SagePic - add_pic MediumPic - add_pic BoarderPic - add_pic PokefanmPic - add_pic KimonoGirlPic - add_pic TwinsPic - add_pic PokefanfPic - add_pic RedPic - add_pic BluePic - add_pic OfficerPic - add_pic GruntfPic - add_pic MysticalmanPic diff --git a/gfx/sprite_headers.asm b/gfx/sprite_headers.asm new file mode 100644 index 000000000..095d7594b --- /dev/null +++ b/gfx/sprite_headers.asm @@ -0,0 +1,419 @@ +; Format: +; Address +; Length, Bank +; Type, Palette + +sprite_header: MACRO +; pointer, length, type, palette + dw \1 + db \2 * 4 tiles, BANK(\1) + db \3, \4 +ENDM + +ChrisSprite: ; 14736 + sprite_header ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 1473c + +ChrisBikeSprite: ; 1473c + sprite_header ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 14742 + +GameboyKidSprite: ; 14742 + sprite_header GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN +; 14748 + +SilverSprite: ; 14748 + sprite_header SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 1474e + +OakSprite: ; 1474e + sprite_header OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 14754 + +RedSprite: ; 14754 + sprite_header RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 1475a + +BlueSprite: ; 1475a + sprite_header BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 14760 + +BillSprite: ; 14760 + sprite_header BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 14766 + +ElderSprite: ; 14766 + sprite_header ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 1476c + +JanineSprite: ; 1476c + sprite_header JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 14772 + +KurtSprite: ; 14772 + sprite_header KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 14778 + +MomSprite: ; 14778 + sprite_header MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 1477e + +BlaineSprite: ; 1477e + sprite_header BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 14784 + +RedsMomSprite: ; 14784 + sprite_header RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 1478a + +DaisySprite: ; 1478a + sprite_header DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14790 + +ElmSprite: ; 14790 + sprite_header ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 14796 + +WillSprite: ; 14796 + sprite_header WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED +; 1479c + +FalknerSprite: ; 1479c + sprite_header FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 147a2 + +WhitneySprite: ; 147a2 + sprite_header WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 147a8 + +BugsySprite: ; 147a8 + sprite_header BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN +; 147ae + +MortySprite: ; 147ae + sprite_header MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 147b4 + +ChuckSprite: ; 147b4 + sprite_header ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 147ba + +JasmineSprite: ; 147ba + sprite_header JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN +; 147c0 + +PryceSprite: ; 147c0 + sprite_header PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 147c6 + +ClairSprite: ; 147c6 + sprite_header ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 147cc + +BrockSprite: ; 147cc + sprite_header BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 147d2 + +KarenSprite: ; 147d2 + sprite_header KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE +; 147d8 + +BrunoSprite: ; 147d8 + sprite_header BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 147de + +MistySprite: ; 147de + sprite_header MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 147e4 + +LanceSprite: ; 147e4 + sprite_header LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 147ea + +SurgeSprite: ; 147ea + sprite_header SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN +; 147f0 + +ErikaSprite: ; 147f0 + sprite_header ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN +; 147f6 + +KogaSprite: ; 147f6 + sprite_header KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 147fc + +SabrinaSprite: ; 147fc + sprite_header SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 14802 + +CooltrainerMSprite: ; 14802 + sprite_header CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14808 + +CooltrainerFSprite: ; 14808 + sprite_header CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 1480e + +BugCatcherSprite: ; 1480e + sprite_header BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14814 + +TwinSprite: ; 14814 + sprite_header TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 1481a + +YoungsterSprite: ; 1481a + sprite_header YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14820 + +LassSprite: ; 14820 + sprite_header LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 14826 + +TeacherSprite: ; 14826 + sprite_header TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 1482c + +BuenaSprite: ; 1482c + sprite_header BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14832 + +SuperNerdSprite: ; 14832 + sprite_header SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14838 + +RockerSprite: ; 14838 + sprite_header RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN +; 1483e + +PokefanMSprite: ; 1483e + sprite_header PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 14844 + +PokefanFSprite: ; 14844 + sprite_header PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 1484a + +GrampsSprite: ; 1484a + sprite_header GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 14850 + +GrannySprite: ; 14850 + sprite_header GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 14856 + +SwimmerGuySprite: ; 14856 + sprite_header SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 1485c + +SwimmerGirlSprite: ; 1485c + sprite_header SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14862 + +BigSnorlaxSprite: ; 14862 + sprite_header BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE +; 14868 + +SurfingPikachuSprite: ; 14868 + sprite_header SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 1486e + +RocketSprite: ; 1486e + sprite_header RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 14874 + +RocketGirlSprite: ; 14874 + sprite_header RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 1487a + +NurseSprite: ; 1487a + sprite_header NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED +; 14880 + +LinkReceptionistSprite: ; 14880 + sprite_header LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 14886 + +ClerkSprite: ; 14886 + sprite_header ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN +; 1488c + +FisherSprite: ; 1488c + sprite_header FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14892 + +FishingGuruSprite: ; 14892 + sprite_header FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14898 + +ScientistSprite: ; 14898 + sprite_header ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 1489e + +KimonoGirlSprite: ; 1489e + sprite_header KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 148a4 + +SageSprite: ; 148a4 + sprite_header SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 148aa + +UnusedGuySprite: ; 148aa + sprite_header UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED +; 148b0 + +GentlemanSprite: ; 148b0 + sprite_header GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 148b6 + +BlackBeltSprite: ; 148b6 + sprite_header BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 148bc + +ReceptionistSprite: ; 148bc + sprite_header ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 148c2 + +OfficerSprite: ; 148c2 + sprite_header OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 148c8 + +CalSprite: ; 148c8 + sprite_header CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 148ce + +SlowpokeSprite: ; 148ce + sprite_header SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED +; 148d4 + +CaptainSprite: ; 148d4 + sprite_header CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 148da + +BigLaprasSprite: ; 148da + sprite_header BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE +; 148e0 + +GymGuySprite: ; 148e0 + sprite_header GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 148e6 + +SailorSprite: ; 148e6 + sprite_header SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 148ec + +BikerSprite: ; 148ec + sprite_header BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN +; 148f2 + +PharmacistSprite: ; 148f2 + sprite_header PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 148f8 + +MonsterSprite: ; 148f8 + sprite_header MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 148fe + +FairySprite: ; 148fe + sprite_header FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 14904 + +BirdSprite: ; 14904 + sprite_header BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 1490a + +DragonSprite: ; 1490a + sprite_header DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED +; 14910 + +BigOnixSprite: ; 14910 + sprite_header BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN +; 14916 + +N64Sprite: ; 14916 + sprite_header N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN +; 1491c + +SudowoodoSprite: ; 1491c + sprite_header SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN +; 14922 + +SurfSprite: ; 14922 + sprite_header SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14928 + +PokeBallSprite: ; 14928 + sprite_header PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED +; 1492e + +PokedexSprite: ; 1492e + sprite_header PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN +; 14934 + +PaperSprite: ; 14934 + sprite_header PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE +; 1493a + +VirtualBoySprite: ; 1493a + sprite_header VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED +; 14940 + +OldLinkReceptionistSprite: ; 14940 + sprite_header OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED +; 14946 + +RockSprite: ; 14946 + sprite_header RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK +; 1494c + +BoulderSprite: ; 1494c + sprite_header BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK +; 14952 + +SnesSprite: ; 14952 + sprite_header SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE +; 14958 + +FamicomSprite: ; 14958 + sprite_header FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED +; 1495e + +FruitTreeSprite: ; 1495e + sprite_header FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE +; 14964 + +GoldTrophySprite: ; 14964 + sprite_header GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN +; 1496a + +SilverTrophySprite: ; 1496a + sprite_header SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER +; 14970 + +KrisSprite: ; 14970 + sprite_header KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 14976 + +KrisBikeSprite: ; 14976 + sprite_header KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE +; 1497c + +KurtOutsideSprite: ; 1497c + sprite_header KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN +; 14982 + +SuicuneSprite: ; 14982 + sprite_header SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE +; 14988 + +EnteiSprite: ; 14988 + sprite_header EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED +; 1498e + +RaikouSprite: ; 1498e + sprite_header RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED +; 14994 + +StandingYoungsterSprite: ; 14994 + sprite_header StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE +; 1499a diff --git a/gfx/sprites.asm b/gfx/sprites.asm new file mode 100644 index 000000000..f7740d6a6 --- /dev/null +++ b/gfx/sprites.asm @@ -0,0 +1,108 @@ +SECTION "Sprites 1", ROMX + +ChrisSpriteGFX: INCBIN "gfx/sprites/chris.2bpp" ; c0000 +ChrisBikeSpriteGFX: INCBIN "gfx/sprites/chris_bike.2bpp" ; c0180 +GameboyKidSpriteGFX: INCBIN "gfx/sprites/gameboy_kid.2bpp" ; c0300 +SilverSpriteGFX: INCBIN "gfx/sprites/silver.2bpp" ; c03c0 +OakSpriteGFX: INCBIN "gfx/sprites/oak.2bpp" ; c0540 +RedSpriteGFX: INCBIN "gfx/sprites/red.2bpp" ; c06c0 +BlueSpriteGFX: INCBIN "gfx/sprites/blue.2bpp" ; c0840 +BillSpriteGFX: INCBIN "gfx/sprites/bill.2bpp" ; c09c0 +ElderSpriteGFX: INCBIN "gfx/sprites/elder.2bpp" ; c0b40 +JanineSpriteGFX: INCBIN "gfx/sprites/janine.2bpp" ; c0cc0 +KurtSpriteGFX: INCBIN "gfx/sprites/kurt.2bpp" ; c0e40 +MomSpriteGFX: INCBIN "gfx/sprites/mom.2bpp" ; c0fc0 +BlaineSpriteGFX: INCBIN "gfx/sprites/blaine.2bpp" ; c1140 +RedsMomSpriteGFX: INCBIN "gfx/sprites/reds_mom.2bpp" ; c12c0 +DaisySpriteGFX: INCBIN "gfx/sprites/daisy.2bpp" ; c1440 +ElmSpriteGFX: INCBIN "gfx/sprites/elm.2bpp" ; c15c0 +WillSpriteGFX: INCBIN "gfx/sprites/will.2bpp" ; c1740 +FalknerSpriteGFX: INCBIN "gfx/sprites/falkner.2bpp" ; c1800 +WhitneySpriteGFX: INCBIN "gfx/sprites/whitney.2bpp" ; c1980 +BugsySpriteGFX: INCBIN "gfx/sprites/bugsy.2bpp" ; c1b00 +MortySpriteGFX: INCBIN "gfx/sprites/morty.2bpp" ; c1c80 +ChuckSpriteGFX: INCBIN "gfx/sprites/chuck.2bpp" ; c1e00 +JasmineSpriteGFX: INCBIN "gfx/sprites/jasmine.2bpp" ; c1f80 +PryceSpriteGFX: INCBIN "gfx/sprites/pryce.2bpp" ; c2100 +ClairSpriteGFX: INCBIN "gfx/sprites/clair.2bpp" ; c2280 +BrockSpriteGFX: INCBIN "gfx/sprites/brock.2bpp" ; c2400 +KarenSpriteGFX: INCBIN "gfx/sprites/karen.2bpp" ; c2580 +BrunoSpriteGFX: INCBIN "gfx/sprites/bruno.2bpp" ; c2640 +MistySpriteGFX: INCBIN "gfx/sprites/misty.2bpp" ; c27c0 +LanceSpriteGFX: INCBIN "gfx/sprites/lance.2bpp" ; c2940 +SurgeSpriteGFX: INCBIN "gfx/sprites/surge.2bpp" ; c2ac0 +ErikaSpriteGFX: INCBIN "gfx/sprites/erika.2bpp" ; c2c40 +KogaSpriteGFX: INCBIN "gfx/sprites/koga.2bpp" ; c2dc0 +SabrinaSpriteGFX: INCBIN "gfx/sprites/sabrina.2bpp" ; c2f40 +CooltrainerMSpriteGFX: INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; c30c0 +CooltrainerFSpriteGFX: INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; c3240 +BugCatcherSpriteGFX: INCBIN "gfx/sprites/bug_catcher.2bpp" ; c33c0 +TwinSpriteGFX: INCBIN "gfx/sprites/twin.2bpp" ; c3540 +YoungsterSpriteGFX: INCBIN "gfx/sprites/youngster.2bpp" ; c36c0 +LassSpriteGFX: INCBIN "gfx/sprites/lass.2bpp" ; c3840 +TeacherSpriteGFX: INCBIN "gfx/sprites/teacher.2bpp" ; c39c0 +BuenaSpriteGFX: INCBIN "gfx/sprites/buena.2bpp" ; c3b40 +SuperNerdSpriteGFX: INCBIN "gfx/sprites/super_nerd.2bpp" ; c3cc0 +RockerSpriteGFX: INCBIN "gfx/sprites/rocker.2bpp" ; c3e40 + + +SECTION "Sprites 2", ROMX + +PokefanMSpriteGFX: INCBIN "gfx/sprites/pokefan_m.2bpp" ; c4000 +PokefanFSpriteGFX: INCBIN "gfx/sprites/pokefan_f.2bpp" ; c4180 +GrampsSpriteGFX: INCBIN "gfx/sprites/gramps.2bpp" ; c4300 +GrannySpriteGFX: INCBIN "gfx/sprites/granny.2bpp" ; c4480 +SwimmerGuySpriteGFX: INCBIN "gfx/sprites/swimmer_guy.2bpp" ; c4600 +SwimmerGirlSpriteGFX: INCBIN "gfx/sprites/swimmer_girl.2bpp" ; c4780 +BigSnorlaxSpriteGFX: INCBIN "gfx/sprites/big_snorlax.2bpp" ; c4900 +SurfingPikachuSpriteGFX: INCBIN "gfx/sprites/surfing_pikachu.2bpp" ; c4980 +RocketSpriteGFX: INCBIN "gfx/sprites/rocket.2bpp" ; c4b00 +RocketGirlSpriteGFX: INCBIN "gfx/sprites/rocket_girl.2bpp" ; c4c80 +NurseSpriteGFX: INCBIN "gfx/sprites/nurse.2bpp" ; c4e00 +LinkReceptionistSpriteGFX: INCBIN "gfx/sprites/link_receptionist.2bpp" ; c4ec0 +ClerkSpriteGFX: INCBIN "gfx/sprites/clerk.2bpp" ; c5040 +FisherSpriteGFX: INCBIN "gfx/sprites/fisher.2bpp" ; c51c0 +FishingGuruSpriteGFX: INCBIN "gfx/sprites/fishing_guru.2bpp" ; c5340 +ScientistSpriteGFX: INCBIN "gfx/sprites/scientist.2bpp" ; c54c0 +KimonoGirlSpriteGFX: INCBIN "gfx/sprites/kimono_girl.2bpp" ; c5640 +SageSpriteGFX: INCBIN "gfx/sprites/sage.2bpp" ; c57c0 +UnusedGuySpriteGFX: INCBIN "gfx/sprites/unused_guy.2bpp" ; c5940 +GentlemanSpriteGFX: INCBIN "gfx/sprites/gentleman.2bpp" ; c5ac0 +BlackBeltSpriteGFX: INCBIN "gfx/sprites/black_belt.2bpp" ; c5c40 +ReceptionistSpriteGFX: INCBIN "gfx/sprites/receptionist.2bpp" ; c5dc0 +OfficerSpriteGFX: INCBIN "gfx/sprites/officer.2bpp" ; c5f40 +CalSpriteGFX: INCBIN "gfx/sprites/cal.2bpp" ; c60c0 +SlowpokeSpriteGFX: INCBIN "gfx/sprites/slowpoke.2bpp" ; c6240 +CaptainSpriteGFX: INCBIN "gfx/sprites/captain.2bpp" ; c6280 +BigLaprasSpriteGFX: INCBIN "gfx/sprites/big_lapras.2bpp" ; c6400 +GymGuySpriteGFX: INCBIN "gfx/sprites/gym_guy.2bpp" ; c6480 +SailorSpriteGFX: INCBIN "gfx/sprites/sailor.2bpp" ; c6600 +BikerSpriteGFX: INCBIN "gfx/sprites/biker.2bpp" ; c6780 +PharmacistSpriteGFX: INCBIN "gfx/sprites/pharmacist.2bpp" ; c6900 +MonsterSpriteGFX: INCBIN "gfx/sprites/monster.2bpp" ; c6a80 +FairySpriteGFX: INCBIN "gfx/sprites/fairy.2bpp" ; c6c00 +BirdSpriteGFX: INCBIN "gfx/sprites/bird.2bpp" ; c6d80 +DragonSpriteGFX: INCBIN "gfx/sprites/dragon.2bpp" ; c6f00 +BigOnixSpriteGFX: INCBIN "gfx/sprites/big_onix.2bpp" ; c7080 +N64SpriteGFX: INCBIN "gfx/sprites/n64.2bpp" ; c7140 +SudowoodoSpriteGFX: INCBIN "gfx/sprites/sudowoodo.2bpp" ; c7180 +SurfSpriteGFX: INCBIN "gfx/sprites/surf.2bpp" ; c7200 +PokeBallSpriteGFX: INCBIN "gfx/sprites/poke_ball.2bpp" ; c7380 +PokedexSpriteGFX: INCBIN "gfx/sprites/pokedex.2bpp" ; c7500 +PaperSpriteGFX: INCBIN "gfx/sprites/paper.2bpp" ; c7680 +VirtualBoySpriteGFX: INCBIN "gfx/sprites/virtual_boy.2bpp" ; c7800 +OldLinkReceptionistSpriteGFX: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; c7840 +RockSpriteGFX: INCBIN "gfx/sprites/rock.2bpp" ; c7880 +BoulderSpriteGFX: INCBIN "gfx/sprites/boulder.2bpp" ; c78c0 +SnesSpriteGFX: INCBIN "gfx/sprites/snes.2bpp" ; c7900 +FamicomSpriteGFX: INCBIN "gfx/sprites/famicom.2bpp" ; c7940 +FruitTreeSpriteGFX: INCBIN "gfx/sprites/fruit_tree.2bpp" ; c7980 +GoldTrophySpriteGFX: INCBIN "gfx/sprites/gold_trophy.2bpp" ; c79c0 +SilverTrophySpriteGFX: INCBIN "gfx/sprites/silver_trophy.2bpp" ; c7a00 +KrisSpriteGFX: INCBIN "gfx/sprites/kris.2bpp" ; c7a40 +KrisBikeSpriteGFX: INCBIN "gfx/sprites/kris_bike.2bpp" ; c7bc0 +KurtOutsideSpriteGFX: INCBIN "gfx/sprites/kurt_outside.2bpp" ; c7d40 +SuicuneSpriteGFX: INCBIN "gfx/sprites/suicune.2bpp" ; c7e00 +EnteiSpriteGFX: INCBIN "gfx/sprites/entei.2bpp" ; c7e40 +RaikouSpriteGFX: INCBIN "gfx/sprites/raikou.2bpp" ; c7e80 +StandingYoungsterSpriteGFX: INCBIN "gfx/sprites/standing_youngster.2bpp" ; c7ec0 diff --git a/gfx/sprites/big_lapras.png b/gfx/sprites/big_lapras.png new file mode 100644 index 000000000..45f27649e Binary files /dev/null and b/gfx/sprites/big_lapras.png differ diff --git a/gfx/sprites/big_onix.png b/gfx/sprites/big_onix.png new file mode 100644 index 000000000..7996be17e Binary files /dev/null and b/gfx/sprites/big_onix.png differ diff --git a/gfx/sprites/big_snorlax.png b/gfx/sprites/big_snorlax.png new file mode 100644 index 000000000..f53f71105 Binary files /dev/null and b/gfx/sprites/big_snorlax.png differ diff --git a/gfx/sprites/biker.png b/gfx/sprites/biker.png new file mode 100644 index 000000000..5d056cf42 Binary files /dev/null and b/gfx/sprites/biker.png differ diff --git a/gfx/sprites/bill.png b/gfx/sprites/bill.png new file mode 100644 index 000000000..d72bb7ba1 Binary files /dev/null and b/gfx/sprites/bill.png differ diff --git a/gfx/sprites/bird.png b/gfx/sprites/bird.png new file mode 100644 index 000000000..9e2009940 Binary files /dev/null and b/gfx/sprites/bird.png differ diff --git a/gfx/sprites/black_belt.png b/gfx/sprites/black_belt.png new file mode 100644 index 000000000..9aec228c5 Binary files /dev/null and b/gfx/sprites/black_belt.png differ diff --git a/gfx/sprites/blaine.png b/gfx/sprites/blaine.png new file mode 100644 index 000000000..6ce1f3092 Binary files /dev/null and b/gfx/sprites/blaine.png differ diff --git a/gfx/sprites/blue.png b/gfx/sprites/blue.png new file mode 100644 index 000000000..17fc2fdc6 Binary files /dev/null and b/gfx/sprites/blue.png differ diff --git a/gfx/sprites/boulder.png b/gfx/sprites/boulder.png new file mode 100644 index 000000000..9b408e021 Binary files /dev/null and b/gfx/sprites/boulder.png differ diff --git a/gfx/sprites/brock.png b/gfx/sprites/brock.png new file mode 100644 index 000000000..f9f8ec431 Binary files /dev/null and b/gfx/sprites/brock.png differ diff --git a/gfx/sprites/bruno.png b/gfx/sprites/bruno.png new file mode 100644 index 000000000..5f77217ef Binary files /dev/null and b/gfx/sprites/bruno.png differ diff --git a/gfx/sprites/buena.png b/gfx/sprites/buena.png new file mode 100644 index 000000000..af5a7e7e7 Binary files /dev/null and b/gfx/sprites/buena.png differ diff --git a/gfx/sprites/bug_catcher.png b/gfx/sprites/bug_catcher.png new file mode 100644 index 000000000..e1306b6a0 Binary files /dev/null and b/gfx/sprites/bug_catcher.png differ diff --git a/gfx/sprites/bugsy.png b/gfx/sprites/bugsy.png new file mode 100644 index 000000000..b528045b5 Binary files /dev/null and b/gfx/sprites/bugsy.png differ diff --git a/gfx/sprites/cal.png b/gfx/sprites/cal.png new file mode 100644 index 000000000..9dfe77ff4 Binary files /dev/null and b/gfx/sprites/cal.png differ diff --git a/gfx/sprites/captain.png b/gfx/sprites/captain.png new file mode 100644 index 000000000..7408cbbbc Binary files /dev/null and b/gfx/sprites/captain.png differ diff --git a/gfx/sprites/chris.png b/gfx/sprites/chris.png new file mode 100644 index 000000000..1050bb02c Binary files /dev/null and b/gfx/sprites/chris.png differ diff --git a/gfx/sprites/chris_bike.png b/gfx/sprites/chris_bike.png new file mode 100644 index 000000000..0d18d11a6 Binary files /dev/null and b/gfx/sprites/chris_bike.png differ diff --git a/gfx/sprites/chuck.png b/gfx/sprites/chuck.png new file mode 100644 index 000000000..54300be2d Binary files /dev/null and b/gfx/sprites/chuck.png differ diff --git a/gfx/sprites/clair.png b/gfx/sprites/clair.png new file mode 100644 index 000000000..c4e721b75 Binary files /dev/null and b/gfx/sprites/clair.png differ diff --git a/gfx/sprites/clerk.png b/gfx/sprites/clerk.png new file mode 100644 index 000000000..77a5fb914 Binary files /dev/null and b/gfx/sprites/clerk.png differ diff --git a/gfx/sprites/cooltrainer_f.png b/gfx/sprites/cooltrainer_f.png new file mode 100644 index 000000000..53bf81b13 Binary files /dev/null and b/gfx/sprites/cooltrainer_f.png differ diff --git a/gfx/sprites/cooltrainer_m.png b/gfx/sprites/cooltrainer_m.png new file mode 100644 index 000000000..ffd94f410 Binary files /dev/null and b/gfx/sprites/cooltrainer_m.png differ diff --git a/gfx/sprites/daisy.png b/gfx/sprites/daisy.png new file mode 100644 index 000000000..84f330f1d Binary files /dev/null and b/gfx/sprites/daisy.png differ diff --git a/gfx/sprites/dragon.png b/gfx/sprites/dragon.png new file mode 100644 index 000000000..3b6c621b8 Binary files /dev/null and b/gfx/sprites/dragon.png differ diff --git a/gfx/sprites/elder.png b/gfx/sprites/elder.png new file mode 100644 index 000000000..90b499f16 Binary files /dev/null and b/gfx/sprites/elder.png differ diff --git a/gfx/sprites/elm.png b/gfx/sprites/elm.png new file mode 100644 index 000000000..ed1439b69 Binary files /dev/null and b/gfx/sprites/elm.png differ diff --git a/gfx/sprites/entei.png b/gfx/sprites/entei.png new file mode 100644 index 000000000..1ff4fd63c Binary files /dev/null and b/gfx/sprites/entei.png differ diff --git a/gfx/sprites/erika.png b/gfx/sprites/erika.png new file mode 100644 index 000000000..22c157d82 Binary files /dev/null and b/gfx/sprites/erika.png differ diff --git a/gfx/sprites/fairy.png b/gfx/sprites/fairy.png new file mode 100644 index 000000000..06fe00768 Binary files /dev/null and b/gfx/sprites/fairy.png differ diff --git a/gfx/sprites/falkner.png b/gfx/sprites/falkner.png new file mode 100644 index 000000000..a9bc75dbd Binary files /dev/null and b/gfx/sprites/falkner.png differ diff --git a/gfx/sprites/famicom.png b/gfx/sprites/famicom.png new file mode 100644 index 000000000..15ff22d0a Binary files /dev/null and b/gfx/sprites/famicom.png differ diff --git a/gfx/sprites/fisher.png b/gfx/sprites/fisher.png new file mode 100644 index 000000000..a84a2e371 Binary files /dev/null and b/gfx/sprites/fisher.png differ diff --git a/gfx/sprites/fishing_guru.png b/gfx/sprites/fishing_guru.png new file mode 100644 index 000000000..748444f8e Binary files /dev/null and b/gfx/sprites/fishing_guru.png differ diff --git a/gfx/sprites/fruit_tree.png b/gfx/sprites/fruit_tree.png new file mode 100644 index 000000000..b27633907 Binary files /dev/null and b/gfx/sprites/fruit_tree.png differ diff --git a/gfx/sprites/gameboy_kid.png b/gfx/sprites/gameboy_kid.png new file mode 100644 index 000000000..0ca4acef9 Binary files /dev/null and b/gfx/sprites/gameboy_kid.png differ diff --git a/gfx/sprites/gentleman.png b/gfx/sprites/gentleman.png new file mode 100644 index 000000000..38a6125d2 Binary files /dev/null and b/gfx/sprites/gentleman.png differ diff --git a/gfx/sprites/gold_trophy.png b/gfx/sprites/gold_trophy.png new file mode 100644 index 000000000..cc12f9f34 Binary files /dev/null and b/gfx/sprites/gold_trophy.png differ diff --git a/gfx/sprites/gramps.png b/gfx/sprites/gramps.png new file mode 100644 index 000000000..abe61a31d Binary files /dev/null and b/gfx/sprites/gramps.png differ diff --git a/gfx/sprites/granny.png b/gfx/sprites/granny.png new file mode 100644 index 000000000..763b2a2b1 Binary files /dev/null and b/gfx/sprites/granny.png differ diff --git a/gfx/sprites/gym_guy.png b/gfx/sprites/gym_guy.png new file mode 100644 index 000000000..a1f74da03 Binary files /dev/null and b/gfx/sprites/gym_guy.png differ diff --git a/gfx/sprites/janine.png b/gfx/sprites/janine.png new file mode 100644 index 000000000..b49f8e573 Binary files /dev/null and b/gfx/sprites/janine.png differ diff --git a/gfx/sprites/jasmine.png b/gfx/sprites/jasmine.png new file mode 100644 index 000000000..0d8be19ec Binary files /dev/null and b/gfx/sprites/jasmine.png differ diff --git a/gfx/sprites/karen.png b/gfx/sprites/karen.png new file mode 100644 index 000000000..8b95fb3fc Binary files /dev/null and b/gfx/sprites/karen.png differ diff --git a/gfx/sprites/kimono_girl.png b/gfx/sprites/kimono_girl.png new file mode 100644 index 000000000..0ea041f5b Binary files /dev/null and b/gfx/sprites/kimono_girl.png differ diff --git a/gfx/sprites/koga.png b/gfx/sprites/koga.png new file mode 100644 index 000000000..8afd066bd Binary files /dev/null and b/gfx/sprites/koga.png differ diff --git a/gfx/sprites/kris.png b/gfx/sprites/kris.png new file mode 100644 index 000000000..d4339470e Binary files /dev/null and b/gfx/sprites/kris.png differ diff --git a/gfx/sprites/kris_bike.png b/gfx/sprites/kris_bike.png new file mode 100644 index 000000000..161ce5722 Binary files /dev/null and b/gfx/sprites/kris_bike.png differ diff --git a/gfx/sprites/kurt.png b/gfx/sprites/kurt.png new file mode 100644 index 000000000..bd7fc20ea Binary files /dev/null and b/gfx/sprites/kurt.png differ diff --git a/gfx/sprites/kurt_outside.png b/gfx/sprites/kurt_outside.png new file mode 100644 index 000000000..69e46b84c Binary files /dev/null and b/gfx/sprites/kurt_outside.png differ diff --git a/gfx/sprites/lance.png b/gfx/sprites/lance.png new file mode 100644 index 000000000..5a2372dfa Binary files /dev/null and b/gfx/sprites/lance.png differ diff --git a/gfx/sprites/lass.png b/gfx/sprites/lass.png new file mode 100644 index 000000000..762108ad5 Binary files /dev/null and b/gfx/sprites/lass.png differ diff --git a/gfx/sprites/link_receptionist.png b/gfx/sprites/link_receptionist.png new file mode 100644 index 000000000..b6c98bbef Binary files /dev/null and b/gfx/sprites/link_receptionist.png differ diff --git a/gfx/sprites/misty.png b/gfx/sprites/misty.png new file mode 100644 index 000000000..8b9857a85 Binary files /dev/null and b/gfx/sprites/misty.png differ diff --git a/gfx/sprites/mom.png b/gfx/sprites/mom.png new file mode 100644 index 000000000..36010c92d Binary files /dev/null and b/gfx/sprites/mom.png differ diff --git a/gfx/sprites/monster.png b/gfx/sprites/monster.png new file mode 100644 index 000000000..80d615b2e Binary files /dev/null and b/gfx/sprites/monster.png differ diff --git a/gfx/sprites/morty.png b/gfx/sprites/morty.png new file mode 100644 index 000000000..dcee550e0 Binary files /dev/null and b/gfx/sprites/morty.png differ diff --git a/gfx/sprites/n64.png b/gfx/sprites/n64.png new file mode 100644 index 000000000..6d2bdc8d7 Binary files /dev/null and b/gfx/sprites/n64.png differ diff --git a/gfx/sprites/nurse.png b/gfx/sprites/nurse.png new file mode 100644 index 000000000..4cd71fcfc Binary files /dev/null and b/gfx/sprites/nurse.png differ diff --git a/gfx/sprites/oak.png b/gfx/sprites/oak.png new file mode 100644 index 000000000..7a76574d0 Binary files /dev/null and b/gfx/sprites/oak.png differ diff --git a/gfx/sprites/officer.png b/gfx/sprites/officer.png new file mode 100644 index 000000000..f62252038 Binary files /dev/null and b/gfx/sprites/officer.png differ diff --git a/gfx/sprites/old_link_receptionist.png b/gfx/sprites/old_link_receptionist.png new file mode 100644 index 000000000..fad0eedd8 Binary files /dev/null and b/gfx/sprites/old_link_receptionist.png differ diff --git a/gfx/sprites/paper.png b/gfx/sprites/paper.png new file mode 100644 index 000000000..da171b3b2 Binary files /dev/null and b/gfx/sprites/paper.png differ diff --git a/gfx/sprites/pharmacist.png b/gfx/sprites/pharmacist.png new file mode 100644 index 000000000..ed0fa1d28 Binary files /dev/null and b/gfx/sprites/pharmacist.png differ diff --git a/gfx/sprites/poke_ball.png b/gfx/sprites/poke_ball.png new file mode 100644 index 000000000..b12bf897c Binary files /dev/null and b/gfx/sprites/poke_ball.png differ diff --git a/gfx/sprites/pokedex.png b/gfx/sprites/pokedex.png new file mode 100644 index 000000000..63846bfad Binary files /dev/null and b/gfx/sprites/pokedex.png differ diff --git a/gfx/sprites/pokefan_f.png b/gfx/sprites/pokefan_f.png new file mode 100644 index 000000000..aa1fbc06f Binary files /dev/null and b/gfx/sprites/pokefan_f.png differ diff --git a/gfx/sprites/pokefan_m.png b/gfx/sprites/pokefan_m.png new file mode 100644 index 000000000..fea7979d3 Binary files /dev/null and b/gfx/sprites/pokefan_m.png differ diff --git a/gfx/sprites/pryce.png b/gfx/sprites/pryce.png new file mode 100644 index 000000000..69f152a3c Binary files /dev/null and b/gfx/sprites/pryce.png differ diff --git a/gfx/sprites/raikou.png b/gfx/sprites/raikou.png new file mode 100644 index 000000000..4a5f1f186 Binary files /dev/null and b/gfx/sprites/raikou.png differ diff --git a/gfx/sprites/receptionist.png b/gfx/sprites/receptionist.png new file mode 100644 index 000000000..0d102b04a Binary files /dev/null and b/gfx/sprites/receptionist.png differ diff --git a/gfx/sprites/red.png b/gfx/sprites/red.png new file mode 100644 index 000000000..018b676f5 Binary files /dev/null and b/gfx/sprites/red.png differ diff --git a/gfx/sprites/reds_mom.png b/gfx/sprites/reds_mom.png new file mode 100644 index 000000000..5644764c0 Binary files /dev/null and b/gfx/sprites/reds_mom.png differ diff --git a/gfx/sprites/rock.png b/gfx/sprites/rock.png new file mode 100644 index 000000000..5a614d7bb Binary files /dev/null and b/gfx/sprites/rock.png differ diff --git a/gfx/sprites/rocker.png b/gfx/sprites/rocker.png new file mode 100644 index 000000000..50ac2089e Binary files /dev/null and b/gfx/sprites/rocker.png differ diff --git a/gfx/sprites/rocket.png b/gfx/sprites/rocket.png new file mode 100644 index 000000000..43a71bd6e Binary files /dev/null and b/gfx/sprites/rocket.png differ diff --git a/gfx/sprites/rocket_girl.png b/gfx/sprites/rocket_girl.png new file mode 100644 index 000000000..b8714ba6f Binary files /dev/null and b/gfx/sprites/rocket_girl.png differ diff --git a/gfx/sprites/sabrina.png b/gfx/sprites/sabrina.png new file mode 100644 index 000000000..ef29e27d5 Binary files /dev/null and b/gfx/sprites/sabrina.png differ diff --git a/gfx/sprites/sage.png b/gfx/sprites/sage.png new file mode 100644 index 000000000..802230467 Binary files /dev/null and b/gfx/sprites/sage.png differ diff --git a/gfx/sprites/sailor.png b/gfx/sprites/sailor.png new file mode 100644 index 000000000..b4d3b5f2a Binary files /dev/null and b/gfx/sprites/sailor.png differ diff --git a/gfx/sprites/scientist.png b/gfx/sprites/scientist.png new file mode 100644 index 000000000..39c44291e Binary files /dev/null and b/gfx/sprites/scientist.png differ diff --git a/gfx/sprites/silver.png b/gfx/sprites/silver.png new file mode 100644 index 000000000..7d82d400c Binary files /dev/null and b/gfx/sprites/silver.png differ diff --git a/gfx/sprites/silver_trophy.png b/gfx/sprites/silver_trophy.png new file mode 100644 index 000000000..458cda431 Binary files /dev/null and b/gfx/sprites/silver_trophy.png differ diff --git a/gfx/sprites/slowpoke.png b/gfx/sprites/slowpoke.png new file mode 100644 index 000000000..d651ad3e6 Binary files /dev/null and b/gfx/sprites/slowpoke.png differ diff --git a/gfx/sprites/snes.png b/gfx/sprites/snes.png new file mode 100644 index 000000000..4eaae4591 Binary files /dev/null and b/gfx/sprites/snes.png differ diff --git a/gfx/sprites/standing_youngster.png b/gfx/sprites/standing_youngster.png new file mode 100644 index 000000000..61a8b79c6 Binary files /dev/null and b/gfx/sprites/standing_youngster.png differ diff --git a/gfx/sprites/sudowoodo.png b/gfx/sprites/sudowoodo.png new file mode 100644 index 000000000..9354f928b Binary files /dev/null and b/gfx/sprites/sudowoodo.png differ diff --git a/gfx/sprites/suicune.png b/gfx/sprites/suicune.png new file mode 100644 index 000000000..c3aef5c6c Binary files /dev/null and b/gfx/sprites/suicune.png differ diff --git a/gfx/sprites/super_nerd.png b/gfx/sprites/super_nerd.png new file mode 100644 index 000000000..6866c7b30 Binary files /dev/null and b/gfx/sprites/super_nerd.png differ diff --git a/gfx/sprites/surf.png b/gfx/sprites/surf.png new file mode 100644 index 000000000..d124616b0 Binary files /dev/null and b/gfx/sprites/surf.png differ diff --git a/gfx/sprites/surfing_pikachu.png b/gfx/sprites/surfing_pikachu.png new file mode 100644 index 000000000..e6a3d7d03 Binary files /dev/null and b/gfx/sprites/surfing_pikachu.png differ diff --git a/gfx/sprites/surge.png b/gfx/sprites/surge.png new file mode 100644 index 000000000..ae165c7ab Binary files /dev/null and b/gfx/sprites/surge.png differ diff --git a/gfx/sprites/swimmer_girl.png b/gfx/sprites/swimmer_girl.png new file mode 100644 index 000000000..eed753ab2 Binary files /dev/null and b/gfx/sprites/swimmer_girl.png differ diff --git a/gfx/sprites/swimmer_guy.png b/gfx/sprites/swimmer_guy.png new file mode 100644 index 000000000..4c1818b2b Binary files /dev/null and b/gfx/sprites/swimmer_guy.png differ diff --git a/gfx/sprites/teacher.png b/gfx/sprites/teacher.png new file mode 100644 index 000000000..2107159e9 Binary files /dev/null and b/gfx/sprites/teacher.png differ diff --git a/gfx/sprites/twin.png b/gfx/sprites/twin.png new file mode 100644 index 000000000..caa9f43af Binary files /dev/null and b/gfx/sprites/twin.png differ diff --git a/gfx/sprites/unused_guy.png b/gfx/sprites/unused_guy.png new file mode 100644 index 000000000..d979b9a6e Binary files /dev/null and b/gfx/sprites/unused_guy.png differ diff --git a/gfx/sprites/virtual_boy.png b/gfx/sprites/virtual_boy.png new file mode 100644 index 000000000..dba7dc130 Binary files /dev/null and b/gfx/sprites/virtual_boy.png differ diff --git a/gfx/sprites/whitney.png b/gfx/sprites/whitney.png new file mode 100644 index 000000000..ff8b28b98 Binary files /dev/null and b/gfx/sprites/whitney.png differ diff --git a/gfx/sprites/will.png b/gfx/sprites/will.png new file mode 100644 index 000000000..5229bb404 Binary files /dev/null and b/gfx/sprites/will.png differ diff --git a/gfx/sprites/youngster.png b/gfx/sprites/youngster.png new file mode 100644 index 000000000..5c0d33939 Binary files /dev/null and b/gfx/sprites/youngster.png differ diff --git a/gfx/trainer_palettes.asm b/gfx/trainer_palettes.asm new file mode 100644 index 000000000..6dbf13983 --- /dev/null +++ b/gfx/trainer_palettes.asm @@ -0,0 +1,82 @@ + +TrainerPalettes: ; b0ce + +PlayerPalette: ; b0ce +; The player's palette +; RGB 25, 18, 12 +; RGB 22, 09, 05 + INCLUDE "gfx/trainers/cal.pal" + +KrisPalette: ; b0d0 +; Kris uses Falkner's palette +; RGB 27, 17, 14 +; RGB 07, 05, 31 + +FalknerPalette: INCLUDE "gfx/trainers/falkner.pal" +WhitneyPalette: INCLUDE "gfx/trainers/whitney.pal" +BugsyPalette: INCLUDE "gfx/trainers/bugsy.pal" +MortyPalette: INCLUDE "gfx/trainers/morty.pal" +PrycePalette: INCLUDE "gfx/trainers/pryce.pal" +JasminePalette: INCLUDE "gfx/trainers/jasmine.pal" +ChuckPalette: INCLUDE "gfx/trainers/chuck.pal" +ClairPalette: INCLUDE "gfx/trainers/clair.pal" +Rival1Palette: INCLUDE "gfx/trainers/rival1.pal" +PokemonProfPalette: INCLUDE "gfx/trainers/oak.pal" +WillPalette: INCLUDE "gfx/trainers/will.pal" +CalPalette: INCLUDE "gfx/trainers/cal.pal" +BrunoPalette: INCLUDE "gfx/trainers/bruno.pal" +KarenPalette: INCLUDE "gfx/trainers/karen.pal" +KogaPalette: INCLUDE "gfx/trainers/koga.pal" +ChampionPalette: INCLUDE "gfx/trainers/champion.pal" +BrockPalette: INCLUDE "gfx/trainers/brock.pal" +MistyPalette: INCLUDE "gfx/trainers/misty.pal" +LtSurgePalette: INCLUDE "gfx/trainers/lt_surge.pal" +ScientistPalette: INCLUDE "gfx/trainers/scientist.pal" +ErikaPalette: INCLUDE "gfx/trainers/erika.pal" +YoungsterPalette: INCLUDE "gfx/trainers/youngster.pal" +SchoolboyPalette: INCLUDE "gfx/trainers/schoolboy.pal" +BirdKeeperPalette: INCLUDE "gfx/trainers/bird_keeper.pal" +LassPalette: INCLUDE "gfx/trainers/lass.pal" +JaninePalette: INCLUDE "gfx/trainers/janine.pal" +CooltrainermPalette: INCLUDE "gfx/trainers/cooltrainer_m.pal" +CooltrainerfPalette: INCLUDE "gfx/trainers/cooltrainer_f.pal" +BeautyPalette: INCLUDE "gfx/trainers/beauty.pal" +PokemaniacPalette: INCLUDE "gfx/trainers/pokemaniac.pal" +GruntmPalette: INCLUDE "gfx/trainers/grunt_m.pal" +GentlemanPalette: INCLUDE "gfx/trainers/gentleman.pal" +SkierPalette: INCLUDE "gfx/trainers/skier.pal" +TeacherPalette: INCLUDE "gfx/trainers/teacher.pal" +SabrinaPalette: INCLUDE "gfx/trainers/sabrina.pal" +BugCatcherPalette: INCLUDE "gfx/trainers/bug_catcher.pal" +FisherPalette: INCLUDE "gfx/trainers/fisher.pal" +SwimmermPalette: INCLUDE "gfx/trainers/swimmer_m.pal" +SwimmerfPalette: INCLUDE "gfx/trainers/swimmer_f.pal" +SailorPalette: INCLUDE "gfx/trainers/sailor.pal" +SuperNerdPalette: INCLUDE "gfx/trainers/super_nerd.pal" +Rival2Palette: INCLUDE "gfx/trainers/rival2.pal" +GuitaristPalette: INCLUDE "gfx/trainers/guitarist.pal" +HikerPalette: INCLUDE "gfx/trainers/hiker.pal" +BikerPalette: INCLUDE "gfx/trainers/biker.pal" +BlainePalette: INCLUDE "gfx/trainers/blaine.pal" +BurglarPalette: INCLUDE "gfx/trainers/burglar.pal" +FirebreatherPalette: INCLUDE "gfx/trainers/firebreather.pal" +JugglerPalette: INCLUDE "gfx/trainers/juggler.pal" +BlackbeltTPalette: INCLUDE "gfx/trainers/blackbelt_t.pal" +ExecutivemPalette: INCLUDE "gfx/trainers/executive_m.pal" +PsychicTPalette: INCLUDE "gfx/trainers/psychic_t.pal" +PicnickerPalette: INCLUDE "gfx/trainers/picnicker.pal" +CamperPalette: INCLUDE "gfx/trainers/camper.pal" +ExecutivefPalette: INCLUDE "gfx/trainers/executive_f.pal" +SagePalette: INCLUDE "gfx/trainers/sage.pal" +MediumPalette: INCLUDE "gfx/trainers/medium.pal" +BoarderPalette: INCLUDE "gfx/trainers/boarder.pal" +PokefanmPalette: INCLUDE "gfx/trainers/pokefan_m.pal" +KimonoGirlPalette: INCLUDE "gfx/trainers/kimono_girl.pal" +TwinsPalette: INCLUDE "gfx/trainers/twins.pal" +PokefanfPalette: INCLUDE "gfx/trainers/pokefan_f.pal" +RedPalette: INCLUDE "gfx/trainers/red.pal" +BluePalette: INCLUDE "gfx/trainers/blue.pal" +OfficerPalette: INCLUDE "gfx/trainers/officer.pal" +GruntfPalette: INCLUDE "gfx/trainers/grunt_f.pal" +MysticalmanPalette: INCLUDE "gfx/trainers/mysticalman.pal" +; b1de diff --git a/gfx/trainer_pic_pointers.asm b/gfx/trainer_pic_pointers.asm new file mode 100644 index 000000000..4c1db41d5 --- /dev/null +++ b/gfx/trainer_pic_pointers.asm @@ -0,0 +1,68 @@ + + add_pic FalknerPic + add_pic WhitneyPic + add_pic BugsyPic + add_pic MortyPic + add_pic PrycePic + add_pic JasminePic + add_pic ChuckPic + add_pic ClairPic + add_pic Rival1Pic + add_pic PokemonProfPic + add_pic WillPic + add_pic CalPic + add_pic BrunoPic + add_pic KarenPic + add_pic KogaPic + add_pic ChampionPic + add_pic BrockPic + add_pic MistyPic + add_pic LtSurgePic + add_pic ScientistPic + add_pic ErikaPic + add_pic YoungsterPic + add_pic SchoolboyPic + add_pic BirdKeeperPic + add_pic LassPic + add_pic JaninePic + add_pic CooltrainermPic + add_pic CooltrainerfPic + add_pic BeautyPic + add_pic PokemaniacPic + add_pic GruntmPic + add_pic GentlemanPic + add_pic SkierPic + add_pic TeacherPic + add_pic SabrinaPic + add_pic BugCatcherPic + add_pic FisherPic + add_pic SwimmermPic + add_pic SwimmerfPic + add_pic SailorPic + add_pic SuperNerdPic + add_pic Rival2Pic + add_pic GuitaristPic + add_pic HikerPic + add_pic BikerPic + add_pic BlainePic + add_pic BurglarPic + add_pic FirebreatherPic + add_pic JugglerPic + add_pic BlackbeltTPic + add_pic ExecutivemPic + add_pic PsychicTPic + add_pic PicnickerPic + add_pic CamperPic + add_pic ExecutivefPic + add_pic SagePic + add_pic MediumPic + add_pic BoarderPic + add_pic PokefanmPic + add_pic KimonoGirlPic + add_pic TwinsPic + add_pic PokefanfPic + add_pic RedPic + add_pic BluePic + add_pic OfficerPic + add_pic GruntfPic + add_pic MysticalmanPic diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainers/palette_pointers.asm deleted file mode 100644 index 6dbf13983..000000000 --- a/gfx/trainers/palette_pointers.asm +++ /dev/null @@ -1,82 +0,0 @@ - -TrainerPalettes: ; b0ce - -PlayerPalette: ; b0ce -; The player's palette -; RGB 25, 18, 12 -; RGB 22, 09, 05 - INCLUDE "gfx/trainers/cal.pal" - -KrisPalette: ; b0d0 -; Kris uses Falkner's palette -; RGB 27, 17, 14 -; RGB 07, 05, 31 - -FalknerPalette: INCLUDE "gfx/trainers/falkner.pal" -WhitneyPalette: INCLUDE "gfx/trainers/whitney.pal" -BugsyPalette: INCLUDE "gfx/trainers/bugsy.pal" -MortyPalette: INCLUDE "gfx/trainers/morty.pal" -PrycePalette: INCLUDE "gfx/trainers/pryce.pal" -JasminePalette: INCLUDE "gfx/trainers/jasmine.pal" -ChuckPalette: INCLUDE "gfx/trainers/chuck.pal" -ClairPalette: INCLUDE "gfx/trainers/clair.pal" -Rival1Palette: INCLUDE "gfx/trainers/rival1.pal" -PokemonProfPalette: INCLUDE "gfx/trainers/oak.pal" -WillPalette: INCLUDE "gfx/trainers/will.pal" -CalPalette: INCLUDE "gfx/trainers/cal.pal" -BrunoPalette: INCLUDE "gfx/trainers/bruno.pal" -KarenPalette: INCLUDE "gfx/trainers/karen.pal" -KogaPalette: INCLUDE "gfx/trainers/koga.pal" -ChampionPalette: INCLUDE "gfx/trainers/champion.pal" -BrockPalette: INCLUDE "gfx/trainers/brock.pal" -MistyPalette: INCLUDE "gfx/trainers/misty.pal" -LtSurgePalette: INCLUDE "gfx/trainers/lt_surge.pal" -ScientistPalette: INCLUDE "gfx/trainers/scientist.pal" -ErikaPalette: INCLUDE "gfx/trainers/erika.pal" -YoungsterPalette: INCLUDE "gfx/trainers/youngster.pal" -SchoolboyPalette: INCLUDE "gfx/trainers/schoolboy.pal" -BirdKeeperPalette: INCLUDE "gfx/trainers/bird_keeper.pal" -LassPalette: INCLUDE "gfx/trainers/lass.pal" -JaninePalette: INCLUDE "gfx/trainers/janine.pal" -CooltrainermPalette: INCLUDE "gfx/trainers/cooltrainer_m.pal" -CooltrainerfPalette: INCLUDE "gfx/trainers/cooltrainer_f.pal" -BeautyPalette: INCLUDE "gfx/trainers/beauty.pal" -PokemaniacPalette: INCLUDE "gfx/trainers/pokemaniac.pal" -GruntmPalette: INCLUDE "gfx/trainers/grunt_m.pal" -GentlemanPalette: INCLUDE "gfx/trainers/gentleman.pal" -SkierPalette: INCLUDE "gfx/trainers/skier.pal" -TeacherPalette: INCLUDE "gfx/trainers/teacher.pal" -SabrinaPalette: INCLUDE "gfx/trainers/sabrina.pal" -BugCatcherPalette: INCLUDE "gfx/trainers/bug_catcher.pal" -FisherPalette: INCLUDE "gfx/trainers/fisher.pal" -SwimmermPalette: INCLUDE "gfx/trainers/swimmer_m.pal" -SwimmerfPalette: INCLUDE "gfx/trainers/swimmer_f.pal" -SailorPalette: INCLUDE "gfx/trainers/sailor.pal" -SuperNerdPalette: INCLUDE "gfx/trainers/super_nerd.pal" -Rival2Palette: INCLUDE "gfx/trainers/rival2.pal" -GuitaristPalette: INCLUDE "gfx/trainers/guitarist.pal" -HikerPalette: INCLUDE "gfx/trainers/hiker.pal" -BikerPalette: INCLUDE "gfx/trainers/biker.pal" -BlainePalette: INCLUDE "gfx/trainers/blaine.pal" -BurglarPalette: INCLUDE "gfx/trainers/burglar.pal" -FirebreatherPalette: INCLUDE "gfx/trainers/firebreather.pal" -JugglerPalette: INCLUDE "gfx/trainers/juggler.pal" -BlackbeltTPalette: INCLUDE "gfx/trainers/blackbelt_t.pal" -ExecutivemPalette: INCLUDE "gfx/trainers/executive_m.pal" -PsychicTPalette: INCLUDE "gfx/trainers/psychic_t.pal" -PicnickerPalette: INCLUDE "gfx/trainers/picnicker.pal" -CamperPalette: INCLUDE "gfx/trainers/camper.pal" -ExecutivefPalette: INCLUDE "gfx/trainers/executive_f.pal" -SagePalette: INCLUDE "gfx/trainers/sage.pal" -MediumPalette: INCLUDE "gfx/trainers/medium.pal" -BoarderPalette: INCLUDE "gfx/trainers/boarder.pal" -PokefanmPalette: INCLUDE "gfx/trainers/pokefan_m.pal" -KimonoGirlPalette: INCLUDE "gfx/trainers/kimono_girl.pal" -TwinsPalette: INCLUDE "gfx/trainers/twins.pal" -PokefanfPalette: INCLUDE "gfx/trainers/pokefan_f.pal" -RedPalette: INCLUDE "gfx/trainers/red.pal" -BluePalette: INCLUDE "gfx/trainers/blue.pal" -OfficerPalette: INCLUDE "gfx/trainers/officer.pal" -GruntfPalette: INCLUDE "gfx/trainers/grunt_f.pal" -MysticalmanPalette: INCLUDE "gfx/trainers/mysticalman.pal" -; b1de diff --git a/main.asm b/main.asm index 525fa26b9..a3161f7a6 100644 --- a/main.asm +++ b/main.asm @@ -5062,13 +5062,9 @@ StartBattleWithMapTrainerScript: ; 0xbe68a AlreadyBeatenTrainerScript: scripttalkafter -SECTION "bank30", ROMX -INCLUDE "gfx/overworld/sprites_1.asm" +INCLUDE "gfx/sprites.asm" -SECTION "bank31", ROMX - -INCLUDE "gfx/overworld/sprites_2.asm" SECTION "bank32", ROMX diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index 8f128a7bd..f627c85ff 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -632,7 +632,7 @@ HeartEmote: INCBIN "gfx/emotes/heart.2bpp" BoltEmote: INCBIN "gfx/emotes/bolt.2bpp" SleepEmote: INCBIN "gfx/emotes/sleep.2bpp" FishEmote: INCBIN "gfx/emotes/fish.2bpp" -JumpShadowGFX: INCBIN "gfx/ow_fx/shadow.2bpp" -FishingRodGFX: INCBIN "gfx/ow_fx/fishing_rod.2bpp" -BoulderDustGFX: INCBIN "gfx/ow_fx/boulder_dust.2bpp" -GrassRustleGFX: INCBIN "gfx/ow_fx/grass_rustle.2bpp" +JumpShadowGFX: INCBIN "gfx/overworld/shadow.2bpp" +FishingRodGFX: INCBIN "gfx/overworld/fishing_rod.2bpp" +BoulderDustGFX: INCBIN "gfx/overworld/boulder_dust.2bpp" +GrassRustleGFX: INCBIN "gfx/overworld/grass_rustle.2bpp" diff --git a/pokecrystal.link b/pokecrystal.link index 9bd693e0f..555a61123 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -129,9 +129,9 @@ ROMX $2e ROMX $2f "bank2F" ROMX $30 - "bank30" + "Sprites 1" ROMX $31 - "bank31" + "Sprites 2" ROMX $32 "bank32" ROMX $33 -- cgit v1.2.3