From 01888c742d6d748d56757de9a54b9f8d590b5205 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 5 Apr 2014 16:41:36 -0400 Subject: Convert pngs in gfx/ to 1bpp and 2bpp. All graphics are now png. Some files were split out of necessity: - gfx/trade.2bpp -> gfx/game_boy.norepeat.png gfx/link_cable.png - gfx/red/introfight.2bpp -> gfx/red/intro_nido_{1,2,3}.6x6.png - gfx/blue/introfight.2bpp -> gfx/blue/intro_purin_{1,2,3}.6x6.png --- gfx/AB.2bpp | Bin 32 -> 0 bytes gfx/AB.png | Bin 0 -> 90 bytes gfx/ED_tile.1bpp | 1 - gfx/ED_tile.png | Bin 0 -> 82 bytes gfx/attack_anim_1.2bpp | Bin 1264 -> 0 bytes gfx/attack_anim_1.png | Bin 0 -> 1042 bytes gfx/attack_anim_2.2bpp | Bin 1264 -> 0 bytes gfx/attack_anim_2.png | Bin 0 -> 999 bytes gfx/badge_numbers.2bpp | Bin 128 -> 0 bytes gfx/badge_numbers.png | Bin 0 -> 135 bytes gfx/badges.2bpp | Bin 1024 -> 0 bytes gfx/badges.w16.png | Bin 0 -> 924 bytes gfx/battle_hud1.1bpp | Bin 24 -> 0 bytes gfx/battle_hud1.png | Bin 0 -> 100 bytes gfx/battle_hud2.1bpp | Bin 24 -> 0 bytes gfx/battle_hud2.png | Bin 0 -> 82 bytes gfx/battle_hud3.1bpp | Bin 24 -> 0 bytes gfx/battle_hud3.png | Bin 0 -> 92 bytes gfx/battle_transition.2bpp | 1 - gfx/battle_transition.png | Bin 0 -> 68 bytes gfx/blank_leader_names.2bpp | Bin 352 -> 0 bytes gfx/blank_leader_names.png | Bin 0 -> 73 bytes gfx/blue/blueversion.1bpp | Bin 64 -> 0 bytes gfx/blue/blueversion.h8.png | Bin 0 -> 136 bytes gfx/blue/intro_purin_1.6x6.png | Bin 0 -> 366 bytes gfx/blue/intro_purin_2.6x6.png | Bin 0 -> 360 bytes gfx/blue/intro_purin_3.6x6.png | Bin 0 -> 416 bytes gfx/blue/introfight.2bpp | Bin 1744 -> 0 bytes gfx/blue/sgbborder.2bpp | Bin 1536 -> 0 bytes gfx/blue/sgbborder.w128.png | Bin 0 -> 1117 bytes gfx/blue/slotmachine1.2bpp | Bin 592 -> 0 bytes gfx/blue/slotmachine1.png | Bin 0 -> 459 bytes gfx/blue/slotmachine2.2bpp | Bin 384 -> 0 bytes gfx/blue/slotmachine2.png | Bin 0 -> 314 bytes gfx/circle_tile.2bpp | Bin 16 -> 0 bytes gfx/circle_tile.png | Bin 0 -> 81 bytes gfx/copyright.2bpp | Bin 304 -> 0 bytes gfx/copyright.h8.png | Bin 0 -> 220 bytes gfx/diagonal_lines.2bpp | Bin 32 -> 0 bytes gfx/diagonal_lines.png | Bin 0 -> 100 bytes gfx/emotion_bubbles.2bpp | Bin 192 -> 0 bytes gfx/emotion_bubbles.w16.png | Bin 0 -> 149 bytes gfx/falling_star.2bpp | Bin 16 -> 0 bytes gfx/falling_star.png | Bin 0 -> 90 bytes gfx/font.1bpp | Bin 1024 -> 0 bytes gfx/font.w128.png | Bin 0 -> 719 bytes gfx/game_boy.norepeat.png | Bin 0 -> 246 bytes gfx/gamefreak.2bpp | Bin 144 -> 0 bytes gfx/gamefreak.h8.png | Bin 0 -> 147 bytes gfx/gamefreak_intro.2bpp | Bin 320 -> 0 bytes gfx/gamefreak_intro.h8.png | Bin 0 -> 297 bytes gfx/gamefreak_logo.png | Bin 0 -> 139 bytes gfx/hp_bar_and_status.2bpp | Bin 480 -> 0 bytes gfx/hp_bar_and_status.png | Bin 0 -> 262 bytes gfx/hp_bar_and_status.w80.png | Bin 0 -> 257 bytes gfx/intro_fight.2bpp | Bin 1536 -> 0 bytes gfx/intro_fight.png | Bin 0 -> 1099 bytes gfx/ledge_hopping_shadow.1bpp | Bin 8 -> 0 bytes gfx/ledge_hopping_shadow.png | Bin 0 -> 81 bytes gfx/link_cable.png | Bin 0 -> 207 bytes gfx/minimized_mon_sprite.1bpp | 1 - gfx/minimized_mon_sprite.h5.png | Bin 0 -> 78 bytes gfx/minimized_mon_sprite.png | Bin 0 -> 78 bytes gfx/mon_nest_icon.1bpp | 1 - gfx/mon_nest_icon.png | Bin 0 -> 86 bytes gfx/mon_ow_sprites.2bpp | Bin 384 -> 0 bytes gfx/mon_ow_sprites.png | Bin 0 -> 324 bytes gfx/p_tile.1bpp | Bin 8 -> 0 bytes gfx/p_tile.png | Bin 0 -> 80 bytes gfx/player_title.2bpp | Bin 560 -> 0 bytes gfx/player_title.png | Bin 0 -> 450 bytes gfx/pokeball.2bpp | Bin 64 -> 0 bytes gfx/pokeball.png | Bin 0 -> 124 bytes gfx/pokecenter_ball.2bpp | Bin 32 -> 0 bytes gfx/pokecenter_ball.png | Bin 0 -> 93 bytes gfx/pokedex.2bpp | Bin 288 -> 0 bytes gfx/pokedex.png | Bin 0 -> 179 bytes gfx/pokemon_logo.2bpp | Bin 1792 -> 0 bytes gfx/pokemon_logo.w128.png | Bin 0 -> 926 bytes gfx/red/intro_nido_1.6x6.png | Bin 0 -> 462 bytes gfx/red/intro_nido_2.6x6.png | Bin 0 -> 449 bytes gfx/red/intro_nido_3.6x6.png | Bin 0 -> 495 bytes gfx/red/introfight.2bpp | Bin 1744 -> 0 bytes gfx/red/redgreenversion.1bpp | Bin 80 -> 0 bytes gfx/red/redgreenversion.h8.png | Bin 0 -> 145 bytes gfx/red/sgbborder.2bpp | Bin 1536 -> 0 bytes gfx/red/sgbborder.w128.png | Bin 0 -> 1048 bytes gfx/red/slotmachine1.2bpp | Bin 592 -> 0 bytes gfx/red/slotmachine1.png | Bin 0 -> 471 bytes gfx/red/slotmachine2.2bpp | Bin 384 -> 0 bytes gfx/red/slotmachine2.png | Bin 0 -> 346 bytes gfx/red_fishing_tile_back.2bpp | 1 - gfx/red_fishing_tile_back.png | Bin 0 -> 114 bytes gfx/red_fishing_tile_front.2bpp | 1 - gfx/red_fishing_tile_front.png | Bin 0 -> 107 bytes gfx/red_fishing_tile_side.2bpp | 1 - gfx/red_fishing_tile_side.png | Bin 0 -> 111 bytes gfx/red_fishingrod_tiles.2bpp | Bin 48 -> 0 bytes gfx/red_fishingrod_tiles.png | Bin 0 -> 108 bytes gfx/spinner_arrow.2bpp | Bin 64 -> 0 bytes gfx/spinner_arrow.png | Bin 0 -> 131 bytes gfx/sprites/agatha.2bpp | Bin 384 -> 0 bytes gfx/sprites/agatha.png | Bin 0 -> 289 bytes gfx/sprites/balding_guy.2bpp | 3 -- gfx/sprites/balding_guy.png | Bin 0 -> 219 bytes gfx/sprites/ball.2bpp | Bin 64 -> 0 bytes gfx/sprites/ball.png | Bin 0 -> 114 bytes gfx/sprites/bike_shop_guy.2bpp | 1 - gfx/sprites/bike_shop_guy.png | Bin 0 -> 213 bytes gfx/sprites/biker.2bpp | 2 - gfx/sprites/biker.png | Bin 0 -> 346 bytes gfx/sprites/bird.2bpp | Bin 384 -> 0 bytes gfx/sprites/bird.png | Bin 0 -> 354 bytes gfx/sprites/black_hair_boy_1.2bpp | Bin 384 -> 0 bytes gfx/sprites/black_hair_boy_1.png | Bin 0 -> 286 bytes gfx/sprites/black_hair_boy_2.2bpp | Bin 384 -> 0 bytes gfx/sprites/black_hair_boy_2.png | Bin 0 -> 291 bytes gfx/sprites/blackbelt.2bpp | Bin 384 -> 0 bytes gfx/sprites/blackbelt.png | Bin 0 -> 271 bytes gfx/sprites/blue.2bpp | Bin 384 -> 0 bytes gfx/sprites/blue.png | Bin 0 -> 306 bytes gfx/sprites/book_map_dex.2bpp | Bin 64 -> 0 bytes gfx/sprites/book_map_dex.png | Bin 0 -> 116 bytes gfx/sprites/boulder.2bpp | 2 - gfx/sprites/boulder.png | Bin 0 -> 139 bytes gfx/sprites/brunette_girl.2bpp | Bin 384 -> 0 bytes gfx/sprites/brunette_girl.png | Bin 0 -> 297 bytes gfx/sprites/bruno.2bpp | Bin 384 -> 0 bytes gfx/sprites/bruno.png | Bin 0 -> 286 bytes gfx/sprites/bug_catcher.2bpp | Bin 384 -> 0 bytes gfx/sprites/bug_catcher.png | Bin 0 -> 291 bytes gfx/sprites/cable_club_woman.2bpp | 1 - gfx/sprites/cable_club_woman.png | Bin 0 -> 218 bytes gfx/sprites/clefairy.2bpp | Bin 384 -> 0 bytes gfx/sprites/clefairy.png | Bin 0 -> 317 bytes gfx/sprites/clipboard.2bpp | Bin 64 -> 0 bytes gfx/sprites/clipboard.png | Bin 0 -> 108 bytes gfx/sprites/cook.2bpp | Bin 384 -> 0 bytes gfx/sprites/cook.png | Bin 0 -> 269 bytes gfx/sprites/cycling.2bpp | Bin 384 -> 0 bytes gfx/sprites/cycling.png | Bin 0 -> 373 bytes gfx/sprites/daisy.2bpp | Bin 384 -> 0 bytes gfx/sprites/daisy.png | Bin 0 -> 276 bytes gfx/sprites/erika.2bpp | Bin 384 -> 0 bytes gfx/sprites/erika.png | Bin 0 -> 257 bytes gfx/sprites/fat_bald_guy.2bpp | Bin 384 -> 0 bytes gfx/sprites/fat_bald_guy.png | Bin 0 -> 289 bytes gfx/sprites/fisher.2bpp | 1 - gfx/sprites/fisher.png | Bin 0 -> 213 bytes gfx/sprites/fisher2.2bpp | Bin 384 -> 0 bytes gfx/sprites/fisher2.png | Bin 0 -> 308 bytes gfx/sprites/foulard_woman.2bpp | Bin 384 -> 0 bytes gfx/sprites/foulard_woman.png | Bin 0 -> 260 bytes gfx/sprites/gambler.2bpp | Bin 384 -> 0 bytes gfx/sprites/gambler.png | Bin 0 -> 269 bytes gfx/sprites/gameboy_kid.2bpp | 1 - gfx/sprites/gameboy_kid.png | Bin 0 -> 209 bytes gfx/sprites/gentleman.2bpp | Bin 384 -> 0 bytes gfx/sprites/gentleman.png | Bin 0 -> 264 bytes gfx/sprites/giovanni.2bpp | Bin 384 -> 0 bytes gfx/sprites/giovanni.png | Bin 0 -> 265 bytes gfx/sprites/girl.2bpp | Bin 384 -> 0 bytes gfx/sprites/girl.png | Bin 0 -> 289 bytes gfx/sprites/guard.2bpp | 2 - gfx/sprites/guard.png | Bin 0 -> 224 bytes gfx/sprites/gym_helper.2bpp | 1 - gfx/sprites/gym_helper.png | Bin 0 -> 214 bytes gfx/sprites/hiker.2bpp | Bin 384 -> 0 bytes gfx/sprites/hiker.png | Bin 0 -> 287 bytes gfx/sprites/lance.2bpp | Bin 384 -> 0 bytes gfx/sprites/lance.png | Bin 0 -> 287 bytes gfx/sprites/lapras_giver.2bpp | 2 - gfx/sprites/lapras_giver.png | Bin 0 -> 210 bytes gfx/sprites/lass.2bpp | Bin 384 -> 0 bytes gfx/sprites/lass.png | Bin 0 -> 349 bytes gfx/sprites/little_girl.2bpp | Bin 384 -> 0 bytes gfx/sprites/little_girl.png | Bin 0 -> 259 bytes gfx/sprites/lorelei.2bpp | Bin 384 -> 0 bytes gfx/sprites/lorelei.png | Bin 0 -> 294 bytes gfx/sprites/lying_old_man.2bpp | Bin 64 -> 0 bytes gfx/sprites/lying_old_man.png | Bin 0 -> 124 bytes gfx/sprites/mart_guy.2bpp | 1 - gfx/sprites/mart_guy.png | Bin 0 -> 220 bytes gfx/sprites/medium.2bpp | Bin 384 -> 0 bytes gfx/sprites/medium.png | Bin 0 -> 242 bytes gfx/sprites/mom.2bpp | 1 - gfx/sprites/mom.png | Bin 0 -> 219 bytes gfx/sprites/mom_geisha.2bpp | 1 - gfx/sprites/mom_geisha.png | Bin 0 -> 289 bytes gfx/sprites/mr_fuji.2bpp | 7 ---- gfx/sprites/mr_fuji.png | Bin 0 -> 319 bytes gfx/sprites/mr_masterball.2bpp | 1 - gfx/sprites/mr_masterball.png | Bin 0 -> 212 bytes gfx/sprites/nurse.2bpp | Bin 192 -> 0 bytes gfx/sprites/nurse.png | Bin 0 -> 233 bytes gfx/sprites/oak.2bpp | Bin 384 -> 0 bytes gfx/sprites/oak.png | Bin 0 -> 305 bytes gfx/sprites/oak_aide.2bpp | Bin 384 -> 0 bytes gfx/sprites/oak_aide.png | Bin 0 -> 281 bytes gfx/sprites/old_amber.2bpp | Bin 64 -> 0 bytes gfx/sprites/old_amber.png | Bin 0 -> 115 bytes gfx/sprites/old_medium_woman.2bpp | 2 - gfx/sprites/old_medium_woman.png | Bin 0 -> 202 bytes gfx/sprites/old_person.2bpp | 3 -- gfx/sprites/old_person.png | Bin 0 -> 239 bytes gfx/sprites/omanyte.2bpp | Bin 64 -> 0 bytes gfx/sprites/omanyte.png | Bin 0 -> 140 bytes gfx/sprites/paper_sheet.2bpp | Bin 64 -> 0 bytes gfx/sprites/paper_sheet.png | Bin 0 -> 107 bytes gfx/sprites/red.2bpp | Bin 384 -> 0 bytes gfx/sprites/red.png | Bin 0 -> 294 bytes gfx/sprites/rocker.2bpp | Bin 384 -> 0 bytes gfx/sprites/rocker.png | Bin 0 -> 309 bytes gfx/sprites/rocket.2bpp | Bin 384 -> 0 bytes gfx/sprites/rocket.png | Bin 0 -> 245 bytes gfx/sprites/sailor.2bpp | Bin 384 -> 0 bytes gfx/sprites/sailor.png | Bin 0 -> 281 bytes gfx/sprites/seel.2bpp | Bin 384 -> 0 bytes gfx/sprites/seel.png | Bin 0 -> 343 bytes gfx/sprites/slowbro.2bpp | Bin 384 -> 0 bytes gfx/sprites/slowbro.png | Bin 0 -> 350 bytes gfx/sprites/snorlax.2bpp | Bin 64 -> 0 bytes gfx/sprites/snorlax.png | Bin 0 -> 145 bytes gfx/sprites/ss_captain.2bpp | 1 - gfx/sprites/ss_captain.png | Bin 0 -> 221 bytes gfx/sprites/swimmer.2bpp | Bin 384 -> 0 bytes gfx/sprites/swimmer.png | Bin 0 -> 303 bytes gfx/sprites/waiter.2bpp | Bin 384 -> 0 bytes gfx/sprites/waiter.png | Bin 0 -> 285 bytes gfx/sprites/warden.2bpp | 1 - gfx/sprites/warden.png | Bin 0 -> 234 bytes gfx/sprites/white_player.2bpp | 3 -- gfx/sprites/white_player.png | Bin 0 -> 210 bytes gfx/sprites/young_boy.2bpp | Bin 192 -> 0 bytes gfx/sprites/young_boy.png | Bin 0 -> 185 bytes gfx/ss_anne_smoke_puff.2bpp | Bin 16 -> 0 bytes gfx/ss_anne_smoke_puff.png | Bin 0 -> 90 bytes gfx/text_box.2bpp | Bin 512 -> 0 bytes gfx/text_box.png | Bin 0 -> 295 bytes gfx/theend.2bpp | 1 - gfx/theend.w40.interleave.png | Bin 0 -> 139 bytes gfx/tilesets/cavern.2bpp | Bin 1056 -> 0 bytes gfx/tilesets/cavern.w128.t14.png | Bin 0 -> 1022 bytes gfx/tilesets/cemetery.2bpp | Bin 1472 -> 0 bytes gfx/tilesets/cemetery.w128.t4.png | Bin 0 -> 928 bytes gfx/tilesets/club.2bpp | Bin 1200 -> 0 bytes gfx/tilesets/club.w128.t5.png | Bin 0 -> 899 bytes gfx/tilesets/facility.2bpp | Bin 1536 -> 0 bytes gfx/tilesets/facility.w128.png | Bin 0 -> 1081 bytes gfx/tilesets/flower/flower1.2bpp | Bin 16 -> 0 bytes gfx/tilesets/flower/flower1.png | Bin 0 -> 90 bytes gfx/tilesets/flower/flower2.2bpp | Bin 16 -> 0 bytes gfx/tilesets/flower/flower2.png | Bin 0 -> 90 bytes gfx/tilesets/flower/flower3.2bpp | Bin 16 -> 0 bytes gfx/tilesets/flower/flower3.png | Bin 0 -> 90 bytes gfx/tilesets/forest.2bpp | Bin 1536 -> 0 bytes gfx/tilesets/forest.w128.png | Bin 0 -> 1414 bytes gfx/tilesets/gate.2bpp | Bin 1520 -> 0 bytes gfx/tilesets/gate.w128.t1.png | Bin 0 -> 1119 bytes gfx/tilesets/gym.2bpp | Bin 1536 -> 0 bytes gfx/tilesets/gym.w128.png | Bin 0 -> 1157 bytes gfx/tilesets/house.2bpp | Bin 1504 -> 0 bytes gfx/tilesets/house.w128.png | Bin 0 -> 1163 bytes gfx/tilesets/interior.2bpp | Bin 1520 -> 0 bytes gfx/tilesets/interior.w128.t1.png | Bin 0 -> 1141 bytes gfx/tilesets/lab.2bpp | Bin 1472 -> 0 bytes gfx/tilesets/lab.w128.t4.png | Bin 0 -> 1051 bytes gfx/tilesets/lobby.2bpp | Bin 1504 -> 0 bytes gfx/tilesets/lobby.w128.t2.png | Bin 0 -> 966 bytes gfx/tilesets/mansion.2bpp | Bin 1504 -> 0 bytes gfx/tilesets/mansion.w128.t2.png | Bin 0 -> 960 bytes gfx/tilesets/overworld.2bpp | Bin 1504 -> 0 bytes gfx/tilesets/overworld.w128.t2.png | Bin 0 -> 1309 bytes gfx/tilesets/plateau.2bpp | Bin 1120 -> 0 bytes gfx/tilesets/plateau.w128.t10.png | Bin 0 -> 1011 bytes gfx/tilesets/pokecenter.2bpp | Bin 1536 -> 0 bytes gfx/tilesets/pokecenter.w128.png | Bin 0 -> 1200 bytes gfx/tilesets/reds_house.2bpp | Bin 1168 -> 0 bytes gfx/tilesets/reds_house.w128.t7.png | Bin 0 -> 845 bytes gfx/tilesets/ship.2bpp | Bin 1440 -> 0 bytes gfx/tilesets/ship.w128.t6.png | Bin 0 -> 865 bytes gfx/tilesets/ship_port.2bpp | Bin 1504 -> 0 bytes gfx/tilesets/ship_port.w128.png | Bin 0 -> 1125 bytes gfx/tilesets/underground.2bpp | Bin 400 -> 0 bytes gfx/tilesets/underground.w128.t7.png | Bin 0 -> 272 bytes gfx/town_map.2bpp | Bin 256 -> 0 bytes gfx/town_map.png | Bin 0 -> 256 bytes gfx/town_map_cursor.1bpp | Bin 32 -> 0 bytes gfx/town_map_cursor.png | Bin 0 -> 87 bytes gfx/trade.2bpp | Bin 784 -> 0 bytes gfx/trade2.2bpp | Bin 64 -> 0 bytes gfx/trade2.png | Bin 0 -> 126 bytes gfx/trainer_info.2bpp | Bin 144 -> 0 bytes gfx/trainer_info.png | Bin 0 -> 175 bytes gfx/up_arrow.1bpp | Bin 8 -> 0 bytes gfx/up_arrow.png | Bin 0 -> 86 bytes main.asm | 78 ++++++++++++++++++++--------------- 297 files changed, 44 insertions(+), 79 deletions(-) delete mode 100755 gfx/AB.2bpp create mode 100644 gfx/AB.png delete mode 100755 gfx/ED_tile.1bpp create mode 100644 gfx/ED_tile.png delete mode 100755 gfx/attack_anim_1.2bpp create mode 100644 gfx/attack_anim_1.png delete mode 100755 gfx/attack_anim_2.2bpp create mode 100644 gfx/attack_anim_2.png delete mode 100755 gfx/badge_numbers.2bpp create mode 100644 gfx/badge_numbers.png delete mode 100755 gfx/badges.2bpp create mode 100644 gfx/badges.w16.png delete mode 100755 gfx/battle_hud1.1bpp create mode 100644 gfx/battle_hud1.png delete mode 100755 gfx/battle_hud2.1bpp create mode 100644 gfx/battle_hud2.png delete mode 100755 gfx/battle_hud3.1bpp create mode 100644 gfx/battle_hud3.png delete mode 100755 gfx/battle_transition.2bpp create mode 100644 gfx/battle_transition.png delete mode 100755 gfx/blank_leader_names.2bpp create mode 100644 gfx/blank_leader_names.png delete mode 100644 gfx/blue/blueversion.1bpp create mode 100644 gfx/blue/blueversion.h8.png create mode 100644 gfx/blue/intro_purin_1.6x6.png create mode 100644 gfx/blue/intro_purin_2.6x6.png create mode 100644 gfx/blue/intro_purin_3.6x6.png delete mode 100755 gfx/blue/introfight.2bpp delete mode 100644 gfx/blue/sgbborder.2bpp create mode 100644 gfx/blue/sgbborder.w128.png delete mode 100755 gfx/blue/slotmachine1.2bpp create mode 100644 gfx/blue/slotmachine1.png delete mode 100644 gfx/blue/slotmachine2.2bpp create mode 100644 gfx/blue/slotmachine2.png delete mode 100755 gfx/circle_tile.2bpp create mode 100644 gfx/circle_tile.png delete mode 100755 gfx/copyright.2bpp create mode 100644 gfx/copyright.h8.png delete mode 100755 gfx/diagonal_lines.2bpp create mode 100644 gfx/diagonal_lines.png delete mode 100755 gfx/emotion_bubbles.2bpp create mode 100644 gfx/emotion_bubbles.w16.png delete mode 100755 gfx/falling_star.2bpp create mode 100644 gfx/falling_star.png delete mode 100644 gfx/font.1bpp create mode 100644 gfx/font.w128.png create mode 100644 gfx/game_boy.norepeat.png delete mode 100755 gfx/gamefreak.2bpp create mode 100644 gfx/gamefreak.h8.png delete mode 100755 gfx/gamefreak_intro.2bpp create mode 100644 gfx/gamefreak_intro.h8.png create mode 100644 gfx/gamefreak_logo.png delete mode 100644 gfx/hp_bar_and_status.2bpp create mode 100644 gfx/hp_bar_and_status.png create mode 100644 gfx/hp_bar_and_status.w80.png delete mode 100755 gfx/intro_fight.2bpp create mode 100644 gfx/intro_fight.png delete mode 100755 gfx/ledge_hopping_shadow.1bpp create mode 100644 gfx/ledge_hopping_shadow.png create mode 100644 gfx/link_cable.png delete mode 100644 gfx/minimized_mon_sprite.1bpp create mode 100644 gfx/minimized_mon_sprite.h5.png create mode 100644 gfx/minimized_mon_sprite.png delete mode 100755 gfx/mon_nest_icon.1bpp create mode 100644 gfx/mon_nest_icon.png delete mode 100755 gfx/mon_ow_sprites.2bpp create mode 100644 gfx/mon_ow_sprites.png delete mode 100644 gfx/p_tile.1bpp create mode 100644 gfx/p_tile.png delete mode 100755 gfx/player_title.2bpp create mode 100644 gfx/player_title.png delete mode 100755 gfx/pokeball.2bpp create mode 100644 gfx/pokeball.png delete mode 100755 gfx/pokecenter_ball.2bpp create mode 100644 gfx/pokecenter_ball.png delete mode 100755 gfx/pokedex.2bpp create mode 100644 gfx/pokedex.png delete mode 100644 gfx/pokemon_logo.2bpp create mode 100644 gfx/pokemon_logo.w128.png create mode 100644 gfx/red/intro_nido_1.6x6.png create mode 100644 gfx/red/intro_nido_2.6x6.png create mode 100644 gfx/red/intro_nido_3.6x6.png delete mode 100755 gfx/red/introfight.2bpp delete mode 100644 gfx/red/redgreenversion.1bpp create mode 100644 gfx/red/redgreenversion.h8.png delete mode 100644 gfx/red/sgbborder.2bpp create mode 100644 gfx/red/sgbborder.w128.png delete mode 100755 gfx/red/slotmachine1.2bpp create mode 100644 gfx/red/slotmachine1.png delete mode 100644 gfx/red/slotmachine2.2bpp create mode 100644 gfx/red/slotmachine2.png delete mode 100644 gfx/red_fishing_tile_back.2bpp create mode 100644 gfx/red_fishing_tile_back.png delete mode 100644 gfx/red_fishing_tile_front.2bpp create mode 100644 gfx/red_fishing_tile_front.png delete mode 100644 gfx/red_fishing_tile_side.2bpp create mode 100644 gfx/red_fishing_tile_side.png delete mode 100644 gfx/red_fishingrod_tiles.2bpp create mode 100644 gfx/red_fishingrod_tiles.png delete mode 100755 gfx/spinner_arrow.2bpp create mode 100644 gfx/spinner_arrow.png delete mode 100644 gfx/sprites/agatha.2bpp create mode 100644 gfx/sprites/agatha.png delete mode 100644 gfx/sprites/balding_guy.2bpp create mode 100644 gfx/sprites/balding_guy.png delete mode 100644 gfx/sprites/ball.2bpp create mode 100644 gfx/sprites/ball.png delete mode 100644 gfx/sprites/bike_shop_guy.2bpp create mode 100644 gfx/sprites/bike_shop_guy.png delete mode 100644 gfx/sprites/biker.2bpp create mode 100644 gfx/sprites/biker.png delete mode 100644 gfx/sprites/bird.2bpp create mode 100644 gfx/sprites/bird.png delete mode 100644 gfx/sprites/black_hair_boy_1.2bpp create mode 100644 gfx/sprites/black_hair_boy_1.png delete mode 100644 gfx/sprites/black_hair_boy_2.2bpp create mode 100644 gfx/sprites/black_hair_boy_2.png delete mode 100644 gfx/sprites/blackbelt.2bpp create mode 100644 gfx/sprites/blackbelt.png delete mode 100644 gfx/sprites/blue.2bpp create mode 100644 gfx/sprites/blue.png delete mode 100644 gfx/sprites/book_map_dex.2bpp create mode 100644 gfx/sprites/book_map_dex.png delete mode 100644 gfx/sprites/boulder.2bpp create mode 100644 gfx/sprites/boulder.png delete mode 100644 gfx/sprites/brunette_girl.2bpp create mode 100644 gfx/sprites/brunette_girl.png delete mode 100644 gfx/sprites/bruno.2bpp create mode 100644 gfx/sprites/bruno.png delete mode 100644 gfx/sprites/bug_catcher.2bpp create mode 100644 gfx/sprites/bug_catcher.png delete mode 100644 gfx/sprites/cable_club_woman.2bpp create mode 100644 gfx/sprites/cable_club_woman.png delete mode 100644 gfx/sprites/clefairy.2bpp create mode 100644 gfx/sprites/clefairy.png delete mode 100644 gfx/sprites/clipboard.2bpp create mode 100644 gfx/sprites/clipboard.png delete mode 100644 gfx/sprites/cook.2bpp create mode 100644 gfx/sprites/cook.png delete mode 100755 gfx/sprites/cycling.2bpp create mode 100644 gfx/sprites/cycling.png delete mode 100644 gfx/sprites/daisy.2bpp create mode 100644 gfx/sprites/daisy.png delete mode 100644 gfx/sprites/erika.2bpp create mode 100644 gfx/sprites/erika.png delete mode 100644 gfx/sprites/fat_bald_guy.2bpp create mode 100644 gfx/sprites/fat_bald_guy.png delete mode 100644 gfx/sprites/fisher.2bpp create mode 100644 gfx/sprites/fisher.png delete mode 100644 gfx/sprites/fisher2.2bpp create mode 100644 gfx/sprites/fisher2.png delete mode 100644 gfx/sprites/foulard_woman.2bpp create mode 100644 gfx/sprites/foulard_woman.png delete mode 100644 gfx/sprites/gambler.2bpp create mode 100644 gfx/sprites/gambler.png delete mode 100644 gfx/sprites/gameboy_kid.2bpp create mode 100644 gfx/sprites/gameboy_kid.png delete mode 100644 gfx/sprites/gentleman.2bpp create mode 100644 gfx/sprites/gentleman.png delete mode 100644 gfx/sprites/giovanni.2bpp create mode 100644 gfx/sprites/giovanni.png delete mode 100644 gfx/sprites/girl.2bpp create mode 100644 gfx/sprites/girl.png delete mode 100644 gfx/sprites/guard.2bpp create mode 100644 gfx/sprites/guard.png delete mode 100644 gfx/sprites/gym_helper.2bpp create mode 100644 gfx/sprites/gym_helper.png delete mode 100644 gfx/sprites/hiker.2bpp create mode 100644 gfx/sprites/hiker.png delete mode 100644 gfx/sprites/lance.2bpp create mode 100644 gfx/sprites/lance.png delete mode 100644 gfx/sprites/lapras_giver.2bpp create mode 100644 gfx/sprites/lapras_giver.png delete mode 100644 gfx/sprites/lass.2bpp create mode 100644 gfx/sprites/lass.png delete mode 100644 gfx/sprites/little_girl.2bpp create mode 100644 gfx/sprites/little_girl.png delete mode 100644 gfx/sprites/lorelei.2bpp create mode 100644 gfx/sprites/lorelei.png delete mode 100644 gfx/sprites/lying_old_man.2bpp create mode 100644 gfx/sprites/lying_old_man.png delete mode 100644 gfx/sprites/mart_guy.2bpp create mode 100644 gfx/sprites/mart_guy.png delete mode 100644 gfx/sprites/medium.2bpp create mode 100644 gfx/sprites/medium.png delete mode 100644 gfx/sprites/mom.2bpp create mode 100644 gfx/sprites/mom.png delete mode 100644 gfx/sprites/mom_geisha.2bpp create mode 100644 gfx/sprites/mom_geisha.png delete mode 100644 gfx/sprites/mr_fuji.2bpp create mode 100644 gfx/sprites/mr_fuji.png delete mode 100644 gfx/sprites/mr_masterball.2bpp create mode 100644 gfx/sprites/mr_masterball.png delete mode 100644 gfx/sprites/nurse.2bpp create mode 100644 gfx/sprites/nurse.png delete mode 100644 gfx/sprites/oak.2bpp create mode 100644 gfx/sprites/oak.png delete mode 100644 gfx/sprites/oak_aide.2bpp create mode 100644 gfx/sprites/oak_aide.png delete mode 100644 gfx/sprites/old_amber.2bpp create mode 100644 gfx/sprites/old_amber.png delete mode 100644 gfx/sprites/old_medium_woman.2bpp create mode 100644 gfx/sprites/old_medium_woman.png delete mode 100644 gfx/sprites/old_person.2bpp create mode 100644 gfx/sprites/old_person.png delete mode 100644 gfx/sprites/omanyte.2bpp create mode 100644 gfx/sprites/omanyte.png delete mode 100644 gfx/sprites/paper_sheet.2bpp create mode 100644 gfx/sprites/paper_sheet.png delete mode 100644 gfx/sprites/red.2bpp create mode 100644 gfx/sprites/red.png delete mode 100644 gfx/sprites/rocker.2bpp create mode 100644 gfx/sprites/rocker.png delete mode 100644 gfx/sprites/rocket.2bpp create mode 100644 gfx/sprites/rocket.png delete mode 100644 gfx/sprites/sailor.2bpp create mode 100644 gfx/sprites/sailor.png delete mode 100644 gfx/sprites/seel.2bpp create mode 100644 gfx/sprites/seel.png delete mode 100644 gfx/sprites/slowbro.2bpp create mode 100644 gfx/sprites/slowbro.png delete mode 100644 gfx/sprites/snorlax.2bpp create mode 100644 gfx/sprites/snorlax.png delete mode 100644 gfx/sprites/ss_captain.2bpp create mode 100644 gfx/sprites/ss_captain.png delete mode 100644 gfx/sprites/swimmer.2bpp create mode 100644 gfx/sprites/swimmer.png delete mode 100644 gfx/sprites/waiter.2bpp create mode 100644 gfx/sprites/waiter.png delete mode 100644 gfx/sprites/warden.2bpp create mode 100644 gfx/sprites/warden.png delete mode 100644 gfx/sprites/white_player.2bpp create mode 100644 gfx/sprites/white_player.png delete mode 100644 gfx/sprites/young_boy.2bpp create mode 100644 gfx/sprites/young_boy.png delete mode 100644 gfx/ss_anne_smoke_puff.2bpp create mode 100644 gfx/ss_anne_smoke_puff.png delete mode 100644 gfx/text_box.2bpp create mode 100644 gfx/text_box.png delete mode 100644 gfx/theend.2bpp create mode 100644 gfx/theend.w40.interleave.png delete mode 100644 gfx/tilesets/cavern.2bpp create mode 100644 gfx/tilesets/cavern.w128.t14.png delete mode 100644 gfx/tilesets/cemetery.2bpp create mode 100644 gfx/tilesets/cemetery.w128.t4.png delete mode 100644 gfx/tilesets/club.2bpp create mode 100644 gfx/tilesets/club.w128.t5.png delete mode 100644 gfx/tilesets/facility.2bpp create mode 100644 gfx/tilesets/facility.w128.png delete mode 100644 gfx/tilesets/flower/flower1.2bpp create mode 100644 gfx/tilesets/flower/flower1.png delete mode 100644 gfx/tilesets/flower/flower2.2bpp create mode 100644 gfx/tilesets/flower/flower2.png delete mode 100644 gfx/tilesets/flower/flower3.2bpp create mode 100644 gfx/tilesets/flower/flower3.png delete mode 100644 gfx/tilesets/forest.2bpp create mode 100644 gfx/tilesets/forest.w128.png delete mode 100644 gfx/tilesets/gate.2bpp create mode 100644 gfx/tilesets/gate.w128.t1.png delete mode 100644 gfx/tilesets/gym.2bpp create mode 100644 gfx/tilesets/gym.w128.png delete mode 100644 gfx/tilesets/house.2bpp create mode 100644 gfx/tilesets/house.w128.png delete mode 100644 gfx/tilesets/interior.2bpp create mode 100644 gfx/tilesets/interior.w128.t1.png delete mode 100644 gfx/tilesets/lab.2bpp create mode 100644 gfx/tilesets/lab.w128.t4.png delete mode 100644 gfx/tilesets/lobby.2bpp create mode 100644 gfx/tilesets/lobby.w128.t2.png delete mode 100644 gfx/tilesets/mansion.2bpp create mode 100644 gfx/tilesets/mansion.w128.t2.png delete mode 100644 gfx/tilesets/overworld.2bpp create mode 100644 gfx/tilesets/overworld.w128.t2.png delete mode 100644 gfx/tilesets/plateau.2bpp create mode 100644 gfx/tilesets/plateau.w128.t10.png delete mode 100644 gfx/tilesets/pokecenter.2bpp create mode 100644 gfx/tilesets/pokecenter.w128.png delete mode 100644 gfx/tilesets/reds_house.2bpp create mode 100644 gfx/tilesets/reds_house.w128.t7.png delete mode 100644 gfx/tilesets/ship.2bpp create mode 100644 gfx/tilesets/ship.w128.t6.png delete mode 100644 gfx/tilesets/ship_port.2bpp create mode 100644 gfx/tilesets/ship_port.w128.png delete mode 100644 gfx/tilesets/underground.2bpp create mode 100644 gfx/tilesets/underground.w128.t7.png delete mode 100755 gfx/town_map.2bpp create mode 100644 gfx/town_map.png delete mode 100755 gfx/town_map_cursor.1bpp create mode 100644 gfx/town_map_cursor.png delete mode 100755 gfx/trade.2bpp delete mode 100755 gfx/trade2.2bpp create mode 100644 gfx/trade2.png delete mode 100755 gfx/trainer_info.2bpp create mode 100644 gfx/trainer_info.png delete mode 100755 gfx/up_arrow.1bpp create mode 100644 gfx/up_arrow.png diff --git a/gfx/AB.2bpp b/gfx/AB.2bpp deleted file mode 100755 index 5116536b..00000000 Binary files a/gfx/AB.2bpp and /dev/null differ diff --git a/gfx/AB.png b/gfx/AB.png new file mode 100644 index 00000000..89ac01db Binary files /dev/null and b/gfx/AB.png differ diff --git a/gfx/ED_tile.1bpp b/gfx/ED_tile.1bpp deleted file mode 100755 index 7bbee183..00000000 --- a/gfx/ED_tile.1bpp +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/gfx/ED_tile.png b/gfx/ED_tile.png new file mode 100644 index 00000000..c8e132b9 Binary files /dev/null and b/gfx/ED_tile.png differ diff --git a/gfx/attack_anim_1.2bpp b/gfx/attack_anim_1.2bpp deleted file mode 100755 index 55dcfef5..00000000 Binary files a/gfx/attack_anim_1.2bpp and /dev/null differ diff --git a/gfx/attack_anim_1.png b/gfx/attack_anim_1.png new file mode 100644 index 00000000..12bd7aa2 Binary files /dev/null and b/gfx/attack_anim_1.png differ diff --git a/gfx/attack_anim_2.2bpp b/gfx/attack_anim_2.2bpp deleted file mode 100755 index 51d87b27..00000000 Binary files a/gfx/attack_anim_2.2bpp and /dev/null differ diff --git a/gfx/attack_anim_2.png b/gfx/attack_anim_2.png new file mode 100644 index 00000000..57abbfde Binary files /dev/null and b/gfx/attack_anim_2.png differ diff --git a/gfx/badge_numbers.2bpp b/gfx/badge_numbers.2bpp deleted file mode 100755 index 664758aa..00000000 Binary files a/gfx/badge_numbers.2bpp and /dev/null differ diff --git a/gfx/badge_numbers.png b/gfx/badge_numbers.png new file mode 100644 index 00000000..c9283065 Binary files /dev/null and b/gfx/badge_numbers.png differ diff --git a/gfx/badges.2bpp b/gfx/badges.2bpp deleted file mode 100755 index 8a717ff7..00000000 Binary files a/gfx/badges.2bpp and /dev/null differ diff --git a/gfx/badges.w16.png b/gfx/badges.w16.png new file mode 100644 index 00000000..8b0fc516 Binary files /dev/null and b/gfx/badges.w16.png differ diff --git a/gfx/battle_hud1.1bpp b/gfx/battle_hud1.1bpp deleted file mode 100755 index 3d489cab..00000000 Binary files a/gfx/battle_hud1.1bpp and /dev/null differ diff --git a/gfx/battle_hud1.png b/gfx/battle_hud1.png new file mode 100644 index 00000000..097c8453 Binary files /dev/null and b/gfx/battle_hud1.png differ diff --git a/gfx/battle_hud2.1bpp b/gfx/battle_hud2.1bpp deleted file mode 100755 index 6ac1cb0b..00000000 Binary files a/gfx/battle_hud2.1bpp and /dev/null differ diff --git a/gfx/battle_hud2.png b/gfx/battle_hud2.png new file mode 100644 index 00000000..ef120166 Binary files /dev/null and b/gfx/battle_hud2.png differ diff --git a/gfx/battle_hud3.1bpp b/gfx/battle_hud3.1bpp deleted file mode 100755 index 0a43bdda..00000000 Binary files a/gfx/battle_hud3.1bpp and /dev/null differ diff --git a/gfx/battle_hud3.png b/gfx/battle_hud3.png new file mode 100644 index 00000000..e4c452b1 Binary files /dev/null and b/gfx/battle_hud3.png differ diff --git a/gfx/battle_transition.2bpp b/gfx/battle_transition.2bpp deleted file mode 100755 index 13ff23b1..00000000 --- a/gfx/battle_transition.2bpp +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gfx/battle_transition.png b/gfx/battle_transition.png new file mode 100644 index 00000000..e2bd6299 Binary files /dev/null and b/gfx/battle_transition.png differ diff --git a/gfx/blank_leader_names.2bpp b/gfx/blank_leader_names.2bpp deleted file mode 100755 index 2bdf7c63..00000000 Binary files a/gfx/blank_leader_names.2bpp and /dev/null differ diff --git a/gfx/blank_leader_names.png b/gfx/blank_leader_names.png new file mode 100644 index 00000000..867a39fe Binary files /dev/null and b/gfx/blank_leader_names.png differ diff --git a/gfx/blue/blueversion.1bpp b/gfx/blue/blueversion.1bpp deleted file mode 100644 index 12f0531f..00000000 Binary files a/gfx/blue/blueversion.1bpp and /dev/null differ diff --git a/gfx/blue/blueversion.h8.png b/gfx/blue/blueversion.h8.png new file mode 100644 index 00000000..dd7e2b6f Binary files /dev/null and b/gfx/blue/blueversion.h8.png differ diff --git a/gfx/blue/intro_purin_1.6x6.png b/gfx/blue/intro_purin_1.6x6.png new file mode 100644 index 00000000..0e53582c Binary files /dev/null and b/gfx/blue/intro_purin_1.6x6.png differ diff --git a/gfx/blue/intro_purin_2.6x6.png b/gfx/blue/intro_purin_2.6x6.png new file mode 100644 index 00000000..21107af0 Binary files /dev/null and b/gfx/blue/intro_purin_2.6x6.png differ diff --git a/gfx/blue/intro_purin_3.6x6.png b/gfx/blue/intro_purin_3.6x6.png new file mode 100644 index 00000000..1c30a0e8 Binary files /dev/null and b/gfx/blue/intro_purin_3.6x6.png differ diff --git a/gfx/blue/introfight.2bpp b/gfx/blue/introfight.2bpp deleted file mode 100755 index 4666bbf9..00000000 Binary files a/gfx/blue/introfight.2bpp and /dev/null differ diff --git a/gfx/blue/sgbborder.2bpp b/gfx/blue/sgbborder.2bpp deleted file mode 100644 index a7261b18..00000000 Binary files a/gfx/blue/sgbborder.2bpp and /dev/null differ diff --git a/gfx/blue/sgbborder.w128.png b/gfx/blue/sgbborder.w128.png new file mode 100644 index 00000000..098df2b6 Binary files /dev/null and b/gfx/blue/sgbborder.w128.png differ diff --git a/gfx/blue/slotmachine1.2bpp b/gfx/blue/slotmachine1.2bpp deleted file mode 100755 index 0b79d447..00000000 Binary files a/gfx/blue/slotmachine1.2bpp and /dev/null differ diff --git a/gfx/blue/slotmachine1.png b/gfx/blue/slotmachine1.png new file mode 100644 index 00000000..41ebfdea Binary files /dev/null and b/gfx/blue/slotmachine1.png differ diff --git a/gfx/blue/slotmachine2.2bpp b/gfx/blue/slotmachine2.2bpp deleted file mode 100644 index ae018bb6..00000000 Binary files a/gfx/blue/slotmachine2.2bpp and /dev/null differ diff --git a/gfx/blue/slotmachine2.png b/gfx/blue/slotmachine2.png new file mode 100644 index 00000000..ee8c688e Binary files /dev/null and b/gfx/blue/slotmachine2.png differ diff --git a/gfx/circle_tile.2bpp b/gfx/circle_tile.2bpp deleted file mode 100755 index b06a180a..00000000 Binary files a/gfx/circle_tile.2bpp and /dev/null differ diff --git a/gfx/circle_tile.png b/gfx/circle_tile.png new file mode 100644 index 00000000..64c00c9f Binary files /dev/null and b/gfx/circle_tile.png differ diff --git a/gfx/copyright.2bpp b/gfx/copyright.2bpp deleted file mode 100755 index 1e7b762b..00000000 Binary files a/gfx/copyright.2bpp and /dev/null differ diff --git a/gfx/copyright.h8.png b/gfx/copyright.h8.png new file mode 100644 index 00000000..49174349 Binary files /dev/null and b/gfx/copyright.h8.png differ diff --git a/gfx/diagonal_lines.2bpp b/gfx/diagonal_lines.2bpp deleted file mode 100755 index ed8d1e78..00000000 Binary files a/gfx/diagonal_lines.2bpp and /dev/null differ diff --git a/gfx/diagonal_lines.png b/gfx/diagonal_lines.png new file mode 100644 index 00000000..400c04b5 Binary files /dev/null and b/gfx/diagonal_lines.png differ diff --git a/gfx/emotion_bubbles.2bpp b/gfx/emotion_bubbles.2bpp deleted file mode 100755 index b1900c58..00000000 Binary files a/gfx/emotion_bubbles.2bpp and /dev/null differ diff --git a/gfx/emotion_bubbles.w16.png b/gfx/emotion_bubbles.w16.png new file mode 100644 index 00000000..31deacf4 Binary files /dev/null and b/gfx/emotion_bubbles.w16.png differ diff --git a/gfx/falling_star.2bpp b/gfx/falling_star.2bpp deleted file mode 100755 index 4cab94c8..00000000 Binary files a/gfx/falling_star.2bpp and /dev/null differ diff --git a/gfx/falling_star.png b/gfx/falling_star.png new file mode 100644 index 00000000..9093bef4 Binary files /dev/null and b/gfx/falling_star.png differ diff --git a/gfx/font.1bpp b/gfx/font.1bpp deleted file mode 100644 index 663a4207..00000000 Binary files a/gfx/font.1bpp and /dev/null differ diff --git a/gfx/font.w128.png b/gfx/font.w128.png new file mode 100644 index 00000000..d5548c09 Binary files /dev/null and b/gfx/font.w128.png differ diff --git a/gfx/game_boy.norepeat.png b/gfx/game_boy.norepeat.png new file mode 100644 index 00000000..62144956 Binary files /dev/null and b/gfx/game_boy.norepeat.png differ diff --git a/gfx/gamefreak.2bpp b/gfx/gamefreak.2bpp deleted file mode 100755 index 6524eb2e..00000000 Binary files a/gfx/gamefreak.2bpp and /dev/null differ diff --git a/gfx/gamefreak.h8.png b/gfx/gamefreak.h8.png new file mode 100644 index 00000000..509232bd Binary files /dev/null and b/gfx/gamefreak.h8.png differ diff --git a/gfx/gamefreak_intro.2bpp b/gfx/gamefreak_intro.2bpp deleted file mode 100755 index fed4d67f..00000000 Binary files a/gfx/gamefreak_intro.2bpp and /dev/null differ diff --git a/gfx/gamefreak_intro.h8.png b/gfx/gamefreak_intro.h8.png new file mode 100644 index 00000000..0fa6832c Binary files /dev/null and b/gfx/gamefreak_intro.h8.png differ diff --git a/gfx/gamefreak_logo.png b/gfx/gamefreak_logo.png new file mode 100644 index 00000000..1671943b Binary files /dev/null and b/gfx/gamefreak_logo.png differ diff --git a/gfx/hp_bar_and_status.2bpp b/gfx/hp_bar_and_status.2bpp deleted file mode 100644 index d6fcb22c..00000000 Binary files a/gfx/hp_bar_and_status.2bpp and /dev/null differ diff --git a/gfx/hp_bar_and_status.png b/gfx/hp_bar_and_status.png new file mode 100644 index 00000000..1a832831 Binary files /dev/null and b/gfx/hp_bar_and_status.png differ diff --git a/gfx/hp_bar_and_status.w80.png b/gfx/hp_bar_and_status.w80.png new file mode 100644 index 00000000..79830885 Binary files /dev/null and b/gfx/hp_bar_and_status.w80.png differ diff --git a/gfx/intro_fight.2bpp b/gfx/intro_fight.2bpp deleted file mode 100755 index 5672e387..00000000 Binary files a/gfx/intro_fight.2bpp and /dev/null differ diff --git a/gfx/intro_fight.png b/gfx/intro_fight.png new file mode 100644 index 00000000..d7774c01 Binary files /dev/null and b/gfx/intro_fight.png differ diff --git a/gfx/ledge_hopping_shadow.1bpp b/gfx/ledge_hopping_shadow.1bpp deleted file mode 100755 index 61d484f2..00000000 Binary files a/gfx/ledge_hopping_shadow.1bpp and /dev/null differ diff --git a/gfx/ledge_hopping_shadow.png b/gfx/ledge_hopping_shadow.png new file mode 100644 index 00000000..cad35624 Binary files /dev/null and b/gfx/ledge_hopping_shadow.png differ diff --git a/gfx/link_cable.png b/gfx/link_cable.png new file mode 100644 index 00000000..d0421472 Binary files /dev/null and b/gfx/link_cable.png differ diff --git a/gfx/minimized_mon_sprite.1bpp b/gfx/minimized_mon_sprite.1bpp deleted file mode 100644 index 326360b9..00000000 --- a/gfx/minimized_mon_sprite.1bpp +++ /dev/null @@ -1 +0,0 @@ -<~<$ \ No newline at end of file diff --git a/gfx/minimized_mon_sprite.h5.png b/gfx/minimized_mon_sprite.h5.png new file mode 100644 index 00000000..24304b69 Binary files /dev/null and b/gfx/minimized_mon_sprite.h5.png differ diff --git a/gfx/minimized_mon_sprite.png b/gfx/minimized_mon_sprite.png new file mode 100644 index 00000000..24304b69 Binary files /dev/null and b/gfx/minimized_mon_sprite.png differ diff --git a/gfx/mon_nest_icon.1bpp b/gfx/mon_nest_icon.1bpp deleted file mode 100755 index e15ff415..00000000 --- a/gfx/mon_nest_icon.1bpp +++ /dev/null @@ -1 +0,0 @@ -BfZ$ \ No newline at end of file diff --git a/gfx/mon_nest_icon.png b/gfx/mon_nest_icon.png new file mode 100644 index 00000000..87c644da Binary files /dev/null and b/gfx/mon_nest_icon.png differ diff --git a/gfx/mon_ow_sprites.2bpp b/gfx/mon_ow_sprites.2bpp deleted file mode 100755 index b318eba5..00000000 Binary files a/gfx/mon_ow_sprites.2bpp and /dev/null differ diff --git a/gfx/mon_ow_sprites.png b/gfx/mon_ow_sprites.png new file mode 100644 index 00000000..8402af2d Binary files /dev/null and b/gfx/mon_ow_sprites.png differ diff --git a/gfx/p_tile.1bpp b/gfx/p_tile.1bpp deleted file mode 100644 index e863449f..00000000 Binary files a/gfx/p_tile.1bpp and /dev/null differ diff --git a/gfx/p_tile.png b/gfx/p_tile.png new file mode 100644 index 00000000..309fb763 Binary files /dev/null and b/gfx/p_tile.png differ diff --git a/gfx/player_title.2bpp b/gfx/player_title.2bpp deleted file mode 100755 index 756cfcd5..00000000 Binary files a/gfx/player_title.2bpp and /dev/null differ diff --git a/gfx/player_title.png b/gfx/player_title.png new file mode 100644 index 00000000..093664d1 Binary files /dev/null and b/gfx/player_title.png differ diff --git a/gfx/pokeball.2bpp b/gfx/pokeball.2bpp deleted file mode 100755 index 626c4e3e..00000000 Binary files a/gfx/pokeball.2bpp and /dev/null differ diff --git a/gfx/pokeball.png b/gfx/pokeball.png new file mode 100644 index 00000000..830f72b2 Binary files /dev/null and b/gfx/pokeball.png differ diff --git a/gfx/pokecenter_ball.2bpp b/gfx/pokecenter_ball.2bpp deleted file mode 100755 index 292f6954..00000000 Binary files a/gfx/pokecenter_ball.2bpp and /dev/null differ diff --git a/gfx/pokecenter_ball.png b/gfx/pokecenter_ball.png new file mode 100644 index 00000000..1832c842 Binary files /dev/null and b/gfx/pokecenter_ball.png differ diff --git a/gfx/pokedex.2bpp b/gfx/pokedex.2bpp deleted file mode 100755 index 04a47d39..00000000 Binary files a/gfx/pokedex.2bpp and /dev/null differ diff --git a/gfx/pokedex.png b/gfx/pokedex.png new file mode 100644 index 00000000..0a2c89ea Binary files /dev/null and b/gfx/pokedex.png differ diff --git a/gfx/pokemon_logo.2bpp b/gfx/pokemon_logo.2bpp deleted file mode 100644 index c23a2ec3..00000000 Binary files a/gfx/pokemon_logo.2bpp and /dev/null differ diff --git a/gfx/pokemon_logo.w128.png b/gfx/pokemon_logo.w128.png new file mode 100644 index 00000000..cc7582c5 Binary files /dev/null and b/gfx/pokemon_logo.w128.png differ diff --git a/gfx/red/intro_nido_1.6x6.png b/gfx/red/intro_nido_1.6x6.png new file mode 100644 index 00000000..4c7804a1 Binary files /dev/null and b/gfx/red/intro_nido_1.6x6.png differ diff --git a/gfx/red/intro_nido_2.6x6.png b/gfx/red/intro_nido_2.6x6.png new file mode 100644 index 00000000..a29a4814 Binary files /dev/null and b/gfx/red/intro_nido_2.6x6.png differ diff --git a/gfx/red/intro_nido_3.6x6.png b/gfx/red/intro_nido_3.6x6.png new file mode 100644 index 00000000..e920d55d Binary files /dev/null and b/gfx/red/intro_nido_3.6x6.png differ diff --git a/gfx/red/introfight.2bpp b/gfx/red/introfight.2bpp deleted file mode 100755 index bbed4572..00000000 Binary files a/gfx/red/introfight.2bpp and /dev/null differ diff --git a/gfx/red/redgreenversion.1bpp b/gfx/red/redgreenversion.1bpp deleted file mode 100644 index 2d99e99d..00000000 Binary files a/gfx/red/redgreenversion.1bpp and /dev/null differ diff --git a/gfx/red/redgreenversion.h8.png b/gfx/red/redgreenversion.h8.png new file mode 100644 index 00000000..8b34ec09 Binary files /dev/null and b/gfx/red/redgreenversion.h8.png differ diff --git a/gfx/red/sgbborder.2bpp b/gfx/red/sgbborder.2bpp deleted file mode 100644 index 17266d99..00000000 Binary files a/gfx/red/sgbborder.2bpp and /dev/null differ diff --git a/gfx/red/sgbborder.w128.png b/gfx/red/sgbborder.w128.png new file mode 100644 index 00000000..7549bb47 Binary files /dev/null and b/gfx/red/sgbborder.w128.png differ diff --git a/gfx/red/slotmachine1.2bpp b/gfx/red/slotmachine1.2bpp deleted file mode 100755 index be40a1df..00000000 Binary files a/gfx/red/slotmachine1.2bpp and /dev/null differ diff --git a/gfx/red/slotmachine1.png b/gfx/red/slotmachine1.png new file mode 100644 index 00000000..785c74f9 Binary files /dev/null and b/gfx/red/slotmachine1.png differ diff --git a/gfx/red/slotmachine2.2bpp b/gfx/red/slotmachine2.2bpp deleted file mode 100644 index 13e1dd30..00000000 Binary files a/gfx/red/slotmachine2.2bpp and /dev/null differ diff --git a/gfx/red/slotmachine2.png b/gfx/red/slotmachine2.png new file mode 100644 index 00000000..779d0cd8 Binary files /dev/null and b/gfx/red/slotmachine2.png differ diff --git a/gfx/red_fishing_tile_back.2bpp b/gfx/red_fishing_tile_back.2bpp deleted file mode 100644 index 76d4653e..00000000 --- a/gfx/red_fishing_tile_back.2bpp +++ /dev/null @@ -1 +0,0 @@ -?3,?+?4x8pp \ No newline at end of file diff --git a/gfx/red_fishing_tile_back.png b/gfx/red_fishing_tile_back.png new file mode 100644 index 00000000..0972377c Binary files /dev/null and b/gfx/red_fishing_tile_back.png differ diff --git a/gfx/red_fishing_tile_front.2bpp b/gfx/red_fishing_tile_front.2bpp deleted file mode 100644 index 9662a623..00000000 --- a/gfx/red_fishing_tile_front.2bpp +++ /dev/null @@ -1 +0,0 @@ -?2/?'?L \ No newline at end of file diff --git a/gfx/red_fishing_tile_front.png b/gfx/red_fishing_tile_front.png new file mode 100644 index 00000000..e18a27d8 Binary files /dev/null and b/gfx/red_fishing_tile_front.png differ diff --git a/gfx/red_fishing_tile_side.2bpp b/gfx/red_fishing_tile_side.2bpp deleted file mode 100644 index c5fab8e6..00000000 --- a/gfx/red_fishing_tile_side.2bpp +++ /dev/null @@ -1 +0,0 @@ -??<'?'`0pp \ No newline at end of file diff --git a/gfx/red_fishing_tile_side.png b/gfx/red_fishing_tile_side.png new file mode 100644 index 00000000..11f25c2a Binary files /dev/null and b/gfx/red_fishing_tile_side.png differ diff --git a/gfx/red_fishingrod_tiles.2bpp b/gfx/red_fishingrod_tiles.2bpp deleted file mode 100644 index 2efaa47e..00000000 Binary files a/gfx/red_fishingrod_tiles.2bpp and /dev/null differ diff --git a/gfx/red_fishingrod_tiles.png b/gfx/red_fishingrod_tiles.png new file mode 100644 index 00000000..e097c6c9 Binary files /dev/null and b/gfx/red_fishingrod_tiles.png differ diff --git a/gfx/spinner_arrow.2bpp b/gfx/spinner_arrow.2bpp deleted file mode 100755 index 5c0d27c6..00000000 Binary files a/gfx/spinner_arrow.2bpp and /dev/null differ diff --git a/gfx/spinner_arrow.png b/gfx/spinner_arrow.png new file mode 100644 index 00000000..aea0672b Binary files /dev/null and b/gfx/spinner_arrow.png differ diff --git a/gfx/sprites/agatha.2bpp b/gfx/sprites/agatha.2bpp deleted file mode 100644 index b4586c62..00000000 Binary files a/gfx/sprites/agatha.2bpp and /dev/null differ diff --git a/gfx/sprites/agatha.png b/gfx/sprites/agatha.png new file mode 100644 index 00000000..e4541970 Binary files /dev/null and b/gfx/sprites/agatha.png differ diff --git a/gfx/sprites/balding_guy.2bpp b/gfx/sprites/balding_guy.2bpp deleted file mode 100644 index 027de603..00000000 --- a/gfx/sprites/balding_guy.2bpp +++ /dev/null @@ -1,3 +0,0 @@ -?0PFB8 -bB?0>9OyN0? |r pp????WSoP -p?8w_p_8? pp |||LH `00 \ No newline at end of file diff --git a/gfx/sprites/balding_guy.png b/gfx/sprites/balding_guy.png new file mode 100644 index 00000000..a404f378 Binary files /dev/null and b/gfx/sprites/balding_guy.png differ diff --git a/gfx/sprites/ball.2bpp b/gfx/sprites/ball.2bpp deleted file mode 100644 index c693499d..00000000 Binary files a/gfx/sprites/ball.2bpp and /dev/null differ diff --git a/gfx/sprites/ball.png b/gfx/sprites/ball.png new file mode 100644 index 00000000..dcce4700 Binary files /dev/null and b/gfx/sprites/ball.png differ diff --git a/gfx/sprites/bike_shop_guy.2bpp b/gfx/sprites/bike_shop_guy.2bpp deleted file mode 100644 index af7e2a60..00000000 --- a/gfx/sprites/bike_shop_guy.2bpp +++ /dev/null @@ -1 +0,0 @@ -????{q^~_z~/>>1O}N;<||r<pp????__?3?<[X69<lxpp   p(0 \ No newline at end of file diff --git a/gfx/sprites/bike_shop_guy.png b/gfx/sprites/bike_shop_guy.png new file mode 100644 index 00000000..1ea83685 Binary files /dev/null and b/gfx/sprites/bike_shop_guy.png differ diff --git a/gfx/sprites/biker.2bpp b/gfx/sprites/biker.2bpp deleted file mode 100644 index e650a0fa..00000000 --- a/gfx/sprites/biker.2bpp +++ /dev/null @@ -1,2 +0,0 @@ -???:?0ToR\ *J?0?'<' x3 > ~` \ No newline at end of file diff --git a/gfx/sprites/cable_club_woman.png b/gfx/sprites/cable_club_woman.png new file mode 100644 index 00000000..3858c52f Binary files /dev/null and b/gfx/sprites/cable_club_woman.png differ diff --git a/gfx/sprites/clefairy.2bpp b/gfx/sprites/clefairy.2bpp deleted file mode 100644 index 32e75d48..00000000 Binary files a/gfx/sprites/clefairy.2bpp and /dev/null differ diff --git a/gfx/sprites/clefairy.png b/gfx/sprites/clefairy.png new file mode 100644 index 00000000..06fe0076 Binary files /dev/null and b/gfx/sprites/clefairy.png differ diff --git a/gfx/sprites/clipboard.2bpp b/gfx/sprites/clipboard.2bpp deleted file mode 100644 index 6db37ef6..00000000 Binary files a/gfx/sprites/clipboard.2bpp and /dev/null differ diff --git a/gfx/sprites/clipboard.png b/gfx/sprites/clipboard.png new file mode 100644 index 00000000..0fdc9bfe Binary files /dev/null and b/gfx/sprites/clipboard.png differ diff --git a/gfx/sprites/cook.2bpp b/gfx/sprites/cook.2bpp deleted file mode 100644 index 8274625a..00000000 Binary files a/gfx/sprites/cook.2bpp and /dev/null differ diff --git a/gfx/sprites/cook.png b/gfx/sprites/cook.png new file mode 100644 index 00000000..3dd57b6d Binary files /dev/null and b/gfx/sprites/cook.png differ diff --git a/gfx/sprites/cycling.2bpp b/gfx/sprites/cycling.2bpp deleted file mode 100755 index 7a92c2ba..00000000 Binary files a/gfx/sprites/cycling.2bpp and /dev/null differ diff --git a/gfx/sprites/cycling.png b/gfx/sprites/cycling.png new file mode 100644 index 00000000..ed117d0b Binary files /dev/null and b/gfx/sprites/cycling.png differ diff --git a/gfx/sprites/daisy.2bpp b/gfx/sprites/daisy.2bpp deleted file mode 100644 index 43caac45..00000000 Binary files a/gfx/sprites/daisy.2bpp and /dev/null differ diff --git a/gfx/sprites/daisy.png b/gfx/sprites/daisy.png new file mode 100644 index 00000000..9bad9116 Binary files /dev/null and b/gfx/sprites/daisy.png differ diff --git a/gfx/sprites/erika.2bpp b/gfx/sprites/erika.2bpp deleted file mode 100644 index 28bcd82b..00000000 Binary files a/gfx/sprites/erika.2bpp and /dev/null differ diff --git a/gfx/sprites/erika.png b/gfx/sprites/erika.png new file mode 100644 index 00000000..37f2e5da Binary files /dev/null and b/gfx/sprites/erika.png differ diff --git a/gfx/sprites/fat_bald_guy.2bpp b/gfx/sprites/fat_bald_guy.2bpp deleted file mode 100644 index 2e167caf..00000000 Binary files a/gfx/sprites/fat_bald_guy.2bpp and /dev/null differ diff --git a/gfx/sprites/fat_bald_guy.png b/gfx/sprites/fat_bald_guy.png new file mode 100644 index 00000000..fea7979d Binary files /dev/null and b/gfx/sprites/fat_bald_guy.png differ diff --git a/gfx/sprites/fisher.2bpp b/gfx/sprites/fisher.2bpp deleted file mode 100644 index c0d3042a..00000000 --- a/gfx/sprites/fisher.2bpp +++ /dev/null @@ -1 +0,0 @@ - ppOoR0J?0>9wO~I6? |~lpp ppOoW0?3?8WwX0? pp?0pO?0  , p0 \ No newline at end of file diff --git a/gfx/sprites/fisher.png b/gfx/sprites/fisher.png new file mode 100644 index 00000000..ef3f864b Binary files /dev/null and b/gfx/sprites/fisher.png differ diff --git a/gfx/sprites/fisher2.2bpp b/gfx/sprites/fisher2.2bpp deleted file mode 100644 index 0c62b196..00000000 Binary files a/gfx/sprites/fisher2.2bpp and /dev/null differ diff --git a/gfx/sprites/fisher2.png b/gfx/sprites/fisher2.png new file mode 100644 index 00000000..a84a2e37 Binary files /dev/null and b/gfx/sprites/fisher2.png differ diff --git a/gfx/sprites/foulard_woman.2bpp b/gfx/sprites/foulard_woman.2bpp deleted file mode 100644 index d02dea02..00000000 Binary files a/gfx/sprites/foulard_woman.2bpp and /dev/null differ diff --git a/gfx/sprites/foulard_woman.png b/gfx/sprites/foulard_woman.png new file mode 100644 index 00000000..4e510400 Binary files /dev/null and b/gfx/sprites/foulard_woman.png differ diff --git a/gfx/sprites/gambler.2bpp b/gfx/sprites/gambler.2bpp deleted file mode 100644 index 30b6e420..00000000 Binary files a/gfx/sprites/gambler.2bpp and /dev/null differ diff --git a/gfx/sprites/gambler.png b/gfx/sprites/gambler.png new file mode 100644 index 00000000..d7b3cb1b Binary files /dev/null and b/gfx/sprites/gambler.png differ diff --git a/gfx/sprites/gameboy_kid.2bpp b/gfx/sprites/gameboy_kid.2bpp deleted file mode 100644 index ec1facf4..00000000 --- a/gfx/sprites/gameboy_kid.2bpp +++ /dev/null @@ -1 +0,0 @@ -?7S@oRJ?3  p(0pp????_Oo_;718  -0@``` \ No newline at end of file diff --git a/gfx/sprites/guard.png b/gfx/sprites/guard.png new file mode 100644 index 00000000..f641bbf5 Binary files /dev/null and b/gfx/sprites/guard.png differ diff --git a/gfx/sprites/gym_helper.2bpp b/gfx/sprites/gym_helper.2bpp deleted file mode 100644 index 043ef767..00000000 --- a/gfx/sprites/gym_helper.2bpp +++ /dev/null @@ -1 +0,0 @@ -?&?9V@dj.1=&?'tdXpp????o_uO^?0???? 8(pp|X ` \ No newline at end of file diff --git a/gfx/sprites/gym_helper.png b/gfx/sprites/gym_helper.png new file mode 100644 index 00000000..15d83d9c Binary files /dev/null and b/gfx/sprites/gym_helper.png differ diff --git a/gfx/sprites/hiker.2bpp b/gfx/sprites/hiker.2bpp deleted file mode 100644 index 963f2730..00000000 Binary files a/gfx/sprites/hiker.2bpp and /dev/null differ diff --git a/gfx/sprites/hiker.png b/gfx/sprites/hiker.png new file mode 100644 index 00000000..c8df8a54 Binary files /dev/null and b/gfx/sprites/hiker.png differ diff --git a/gfx/sprites/lance.2bpp b/gfx/sprites/lance.2bpp deleted file mode 100644 index 12fc0c18..00000000 Binary files a/gfx/sprites/lance.2bpp and /dev/null differ diff --git a/gfx/sprites/lance.png b/gfx/sprites/lance.png new file mode 100644 index 00000000..5a2372df Binary files /dev/null and b/gfx/sprites/lance.png differ diff --git a/gfx/sprites/lapras_giver.2bpp b/gfx/sprites/lapras_giver.2bpp deleted file mode 100644 index 5719ea7a..00000000 --- a/gfx/sprites/lapras_giver.2bpp +++ /dev/null @@ -1,2 +0,0 @@ -???7P@oV -j?0>9OyO9OyO?8|HH ?/?(?<p<8;?=?px?/_X~~>?=3 xp;>?8|HH ?/?(?<p<8;?=?px?/_X~x7?=7?10`p \ No newline at end of file diff --git a/gfx/sprites/mom_geisha.png b/gfx/sprites/mom_geisha.png new file mode 100644 index 00000000..c9b556ea Binary files /dev/null and b/gfx/sprites/mom_geisha.png differ diff --git a/gfx/sprites/mr_fuji.2bpp b/gfx/sprites/mr_fuji.2bpp deleted file mode 100644 index 94df75fc..00000000 --- a/gfx/sprites/mr_fuji.2bpp +++ /dev/null @@ -1,7 +0,0 @@ - (7P@oR`0 -J?0/9M~^??9??? ~z /0PP@`0 - -?0_xW~Os?39?>> ~8||>!? ? ?( pd? x (7P@oR`0 -J?0Oy_~?? ~80 /0P@oP`0 - -?0_x_~Os?3 ~80 #<}B@@P@ (@>1=#(p pp \ No newline at end of file diff --git a/gfx/sprites/mr_fuji.png b/gfx/sprites/mr_fuji.png new file mode 100644 index 00000000..90b499f1 Binary files /dev/null and b/gfx/sprites/mr_fuji.png differ diff --git a/gfx/sprites/mr_masterball.2bpp b/gfx/sprites/mr_masterball.2bpp deleted file mode 100644 index 0d416a13..00000000 --- a/gfx/sprites/mr_masterball.2bpp +++ /dev/null @@ -1 +0,0 @@ -?6yoYF>1lb|x?????/xx??_O?0 wx?????/xx<|   88 \ No newline at end of file diff --git a/gfx/sprites/mr_masterball.png b/gfx/sprites/mr_masterball.png new file mode 100644 index 00000000..81818568 Binary files /dev/null and b/gfx/sprites/mr_masterball.png differ diff --git a/gfx/sprites/nurse.2bpp b/gfx/sprites/nurse.2bpp deleted file mode 100644 index 033dcb37..00000000 Binary files a/gfx/sprites/nurse.2bpp and /dev/null differ diff --git a/gfx/sprites/nurse.png b/gfx/sprites/nurse.png new file mode 100644 index 00000000..b49768c8 Binary files /dev/null and b/gfx/sprites/nurse.png differ diff --git a/gfx/sprites/oak.2bpp b/gfx/sprites/oak.2bpp deleted file mode 100644 index c4f817c1..00000000 Binary files a/gfx/sprites/oak.2bpp and /dev/null differ diff --git a/gfx/sprites/oak.png b/gfx/sprites/oak.png new file mode 100644 index 00000000..7a76574d Binary files /dev/null and b/gfx/sprites/oak.png differ diff --git a/gfx/sprites/oak_aide.2bpp b/gfx/sprites/oak_aide.2bpp deleted file mode 100644 index a2195ad5..00000000 Binary files a/gfx/sprites/oak_aide.2bpp and /dev/null differ diff --git a/gfx/sprites/oak_aide.png b/gfx/sprites/oak_aide.png new file mode 100644 index 00000000..a91708e6 Binary files /dev/null and b/gfx/sprites/oak_aide.png differ diff --git a/gfx/sprites/old_amber.2bpp b/gfx/sprites/old_amber.2bpp deleted file mode 100644 index d15b30a7..00000000 Binary files a/gfx/sprites/old_amber.2bpp and /dev/null differ diff --git a/gfx/sprites/old_amber.png b/gfx/sprites/old_amber.png new file mode 100644 index 00000000..6f6c41f5 Binary files /dev/null and b/gfx/sprites/old_amber.png differ diff --git a/gfx/sprites/old_medium_woman.2bpp b/gfx/sprites/old_medium_woman.2bpp deleted file mode 100644 index 072c48cb..00000000 --- a/gfx/sprites/old_medium_woman.2bpp +++ /dev/null @@ -1,2 +0,0 @@ - ? ?!?&_x?&08dd  >l~|| /0PP@08 - -?0_xW~Os?39?>> ~8|| >!?8<'?$0xd|?8x \ No newline at end of file diff --git a/gfx/sprites/old_person.png b/gfx/sprites/old_person.png new file mode 100644 index 00000000..729092db Binary files /dev/null and b/gfx/sprites/old_person.png differ diff --git a/gfx/sprites/omanyte.2bpp b/gfx/sprites/omanyte.2bpp deleted file mode 100644 index 1d280a10..00000000 Binary files a/gfx/sprites/omanyte.2bpp and /dev/null differ diff --git a/gfx/sprites/omanyte.png b/gfx/sprites/omanyte.png new file mode 100644 index 00000000..9dd1e5c5 Binary files /dev/null and b/gfx/sprites/omanyte.png differ diff --git a/gfx/sprites/paper_sheet.2bpp b/gfx/sprites/paper_sheet.2bpp deleted file mode 100644 index dc2a72ab..00000000 Binary files a/gfx/sprites/paper_sheet.2bpp and /dev/null differ diff --git a/gfx/sprites/paper_sheet.png b/gfx/sprites/paper_sheet.png new file mode 100644 index 00000000..675183b6 Binary files /dev/null and b/gfx/sprites/paper_sheet.png differ diff --git a/gfx/sprites/red.2bpp b/gfx/sprites/red.2bpp deleted file mode 100644 index e550d7ad..00000000 Binary files a/gfx/sprites/red.2bpp and /dev/null differ diff --git a/gfx/sprites/red.png b/gfx/sprites/red.png new file mode 100644 index 00000000..018b676f Binary files /dev/null and b/gfx/sprites/red.png differ diff --git a/gfx/sprites/rocker.2bpp b/gfx/sprites/rocker.2bpp deleted file mode 100644 index f6fee5c2..00000000 Binary files a/gfx/sprites/rocker.2bpp and /dev/null differ diff --git a/gfx/sprites/rocker.png b/gfx/sprites/rocker.png new file mode 100644 index 00000000..9634d31f Binary files /dev/null and b/gfx/sprites/rocker.png differ diff --git a/gfx/sprites/rocket.2bpp b/gfx/sprites/rocket.2bpp deleted file mode 100644 index 4086866b..00000000 Binary files a/gfx/sprites/rocket.2bpp and /dev/null differ diff --git a/gfx/sprites/rocket.png b/gfx/sprites/rocket.png new file mode 100644 index 00000000..ebb4a514 Binary files /dev/null and b/gfx/sprites/rocket.png differ diff --git a/gfx/sprites/sailor.2bpp b/gfx/sprites/sailor.2bpp deleted file mode 100644 index 90e39f5e..00000000 Binary files a/gfx/sprites/sailor.2bpp and /dev/null differ diff --git a/gfx/sprites/sailor.png b/gfx/sprites/sailor.png new file mode 100644 index 00000000..ddf80ef0 Binary files /dev/null and b/gfx/sprites/sailor.png differ diff --git a/gfx/sprites/seel.2bpp b/gfx/sprites/seel.2bpp deleted file mode 100644 index 4dcb9600..00000000 Binary files a/gfx/sprites/seel.2bpp and /dev/null differ diff --git a/gfx/sprites/seel.png b/gfx/sprites/seel.png new file mode 100644 index 00000000..06ef575d Binary files /dev/null and b/gfx/sprites/seel.png differ diff --git a/gfx/sprites/slowbro.2bpp b/gfx/sprites/slowbro.2bpp deleted file mode 100644 index 542d6ef2..00000000 Binary files a/gfx/sprites/slowbro.2bpp and /dev/null differ diff --git a/gfx/sprites/slowbro.png b/gfx/sprites/slowbro.png new file mode 100644 index 00000000..80d615b2 Binary files /dev/null and b/gfx/sprites/slowbro.png differ diff --git a/gfx/sprites/snorlax.2bpp b/gfx/sprites/snorlax.2bpp deleted file mode 100644 index 2dc67985..00000000 Binary files a/gfx/sprites/snorlax.2bpp and /dev/null differ diff --git a/gfx/sprites/snorlax.png b/gfx/sprites/snorlax.png new file mode 100644 index 00000000..347ee781 Binary files /dev/null and b/gfx/sprites/snorlax.png differ diff --git a/gfx/sprites/ss_captain.2bpp b/gfx/sprites/ss_captain.2bpp deleted file mode 100644 index 7bcb2078..00000000 --- a/gfx/sprites/ss_captain.2bpp +++ /dev/null @@ -1 +0,0 @@ -7???wXFxxb>1=:LL?:|\22\pp0???p_pO 87?8__??pp????   h`00 \ No newline at end of file diff --git a/gfx/sprites/ss_captain.png b/gfx/sprites/ss_captain.png new file mode 100644 index 00000000..d2967e0f Binary files /dev/null and b/gfx/sprites/ss_captain.png differ diff --git a/gfx/sprites/swimmer.2bpp b/gfx/sprites/swimmer.2bpp deleted file mode 100644 index 882f016c..00000000 Binary files a/gfx/sprites/swimmer.2bpp and /dev/null differ diff --git a/gfx/sprites/swimmer.png b/gfx/sprites/swimmer.png new file mode 100644 index 00000000..4c1818b2 Binary files /dev/null and b/gfx/sprites/swimmer.png differ diff --git a/gfx/sprites/waiter.2bpp b/gfx/sprites/waiter.2bpp deleted file mode 100644 index f269b3e5..00000000 Binary files a/gfx/sprites/waiter.2bpp and /dev/null differ diff --git a/gfx/sprites/waiter.png b/gfx/sprites/waiter.png new file mode 100644 index 00000000..747f62a3 Binary files /dev/null and b/gfx/sprites/waiter.png differ diff --git a/gfx/sprites/warden.2bpp b/gfx/sprites/warden.2bpp deleted file mode 100644 index 9764383b..00000000 --- a/gfx/sprites/warden.2bpp +++ /dev/null @@ -1 +0,0 @@ -?6poR@>1lJ|x|3?,?3/>4xx??_O?0 wx|3?>?3/>|xx<||  (( \ No newline at end of file diff --git a/gfx/sprites/warden.png b/gfx/sprites/warden.png new file mode 100644 index 00000000..0aaccae4 Binary files /dev/null and b/gfx/sprites/warden.png differ diff --git a/gfx/sprites/white_player.2bpp b/gfx/sprites/white_player.2bpp deleted file mode 100644 index 68c8adf0..00000000 --- a/gfx/sprites/white_player.2bpp +++ /dev/null @@ -1,3 +0,0 @@ -;9OI?8 |xpp?0?8_O ?7?8_P?8 -xpp;4}B?? `00 \ No newline at end of file diff --git a/gfx/sprites/white_player.png b/gfx/sprites/white_player.png new file mode 100644 index 00000000..e55dab9d Binary files /dev/null and b/gfx/sprites/white_player.png differ diff --git a/gfx/sprites/young_boy.2bpp b/gfx/sprites/young_boy.2bpp deleted file mode 100644 index 657df63f..00000000 Binary files a/gfx/sprites/young_boy.2bpp and /dev/null differ diff --git a/gfx/sprites/young_boy.png b/gfx/sprites/young_boy.png new file mode 100644 index 00000000..24996549 Binary files /dev/null and b/gfx/sprites/young_boy.png differ diff --git a/gfx/ss_anne_smoke_puff.2bpp b/gfx/ss_anne_smoke_puff.2bpp deleted file mode 100644 index 5e46add5..00000000 Binary files a/gfx/ss_anne_smoke_puff.2bpp and /dev/null differ diff --git a/gfx/ss_anne_smoke_puff.png b/gfx/ss_anne_smoke_puff.png new file mode 100644 index 00000000..5bcaf18a Binary files /dev/null and b/gfx/ss_anne_smoke_puff.png differ diff --git a/gfx/text_box.2bpp b/gfx/text_box.2bpp deleted file mode 100644 index 684cec1a..00000000 Binary files a/gfx/text_box.2bpp and /dev/null differ diff --git a/gfx/text_box.png b/gfx/text_box.png new file mode 100644 index 00000000..3673e74c Binary files /dev/null and b/gfx/text_box.png differ diff --git a/gfx/theend.2bpp b/gfx/theend.2bpp deleted file mode 100644 index 19898a71..00000000 --- a/gfx/theend.2bpp +++ /dev/null @@ -1 +0,0 @@ -<<<<<<<<<<<<<<<<<<<<<<<<((祥㣣 \ No newline at end of file diff --git a/gfx/theend.w40.interleave.png b/gfx/theend.w40.interleave.png new file mode 100644 index 00000000..025ebb61 Binary files /dev/null and b/gfx/theend.w40.interleave.png differ diff --git a/gfx/tilesets/cavern.2bpp b/gfx/tilesets/cavern.2bpp deleted file mode 100644 index 1f3b5a86..00000000 Binary files a/gfx/tilesets/cavern.2bpp and /dev/null differ diff --git a/gfx/tilesets/cavern.w128.t14.png b/gfx/tilesets/cavern.w128.t14.png new file mode 100644 index 00000000..5397fd65 Binary files /dev/null and b/gfx/tilesets/cavern.w128.t14.png differ diff --git a/gfx/tilesets/cemetery.2bpp b/gfx/tilesets/cemetery.2bpp deleted file mode 100644 index d24c6437..00000000 Binary files a/gfx/tilesets/cemetery.2bpp and /dev/null differ diff --git a/gfx/tilesets/cemetery.w128.t4.png b/gfx/tilesets/cemetery.w128.t4.png new file mode 100644 index 00000000..b1df015a Binary files /dev/null and b/gfx/tilesets/cemetery.w128.t4.png differ diff --git a/gfx/tilesets/club.2bpp b/gfx/tilesets/club.2bpp deleted file mode 100644 index da3072dc..00000000 Binary files a/gfx/tilesets/club.2bpp and /dev/null differ diff --git a/gfx/tilesets/club.w128.t5.png b/gfx/tilesets/club.w128.t5.png new file mode 100644 index 00000000..05a55879 Binary files /dev/null and b/gfx/tilesets/club.w128.t5.png differ diff --git a/gfx/tilesets/facility.2bpp b/gfx/tilesets/facility.2bpp deleted file mode 100644 index a06ce48b..00000000 Binary files a/gfx/tilesets/facility.2bpp and /dev/null differ diff --git a/gfx/tilesets/facility.w128.png b/gfx/tilesets/facility.w128.png new file mode 100644 index 00000000..3654900e Binary files /dev/null and b/gfx/tilesets/facility.w128.png differ diff --git a/gfx/tilesets/flower/flower1.2bpp b/gfx/tilesets/flower/flower1.2bpp deleted file mode 100644 index 156bb6a3..00000000 Binary files a/gfx/tilesets/flower/flower1.2bpp and /dev/null differ diff --git a/gfx/tilesets/flower/flower1.png b/gfx/tilesets/flower/flower1.png new file mode 100644 index 00000000..e7445b95 Binary files /dev/null and b/gfx/tilesets/flower/flower1.png differ diff --git a/gfx/tilesets/flower/flower2.2bpp b/gfx/tilesets/flower/flower2.2bpp deleted file mode 100644 index bac3ed27..00000000 Binary files a/gfx/tilesets/flower/flower2.2bpp and /dev/null differ diff --git a/gfx/tilesets/flower/flower2.png b/gfx/tilesets/flower/flower2.png new file mode 100644 index 00000000..f064f8cb Binary files /dev/null and b/gfx/tilesets/flower/flower2.png differ diff --git a/gfx/tilesets/flower/flower3.2bpp b/gfx/tilesets/flower/flower3.2bpp deleted file mode 100644 index 67a3dffe..00000000 Binary files a/gfx/tilesets/flower/flower3.2bpp and /dev/null differ diff --git a/gfx/tilesets/flower/flower3.png b/gfx/tilesets/flower/flower3.png new file mode 100644 index 00000000..56bb6f9c Binary files /dev/null and b/gfx/tilesets/flower/flower3.png differ diff --git a/gfx/tilesets/forest.2bpp b/gfx/tilesets/forest.2bpp deleted file mode 100644 index 06cf7a20..00000000 Binary files a/gfx/tilesets/forest.2bpp and /dev/null differ diff --git a/gfx/tilesets/forest.w128.png b/gfx/tilesets/forest.w128.png new file mode 100644 index 00000000..fd534d48 Binary files /dev/null and b/gfx/tilesets/forest.w128.png differ diff --git a/gfx/tilesets/gate.2bpp b/gfx/tilesets/gate.2bpp deleted file mode 100644 index 68f93945..00000000 Binary files a/gfx/tilesets/gate.2bpp and /dev/null differ diff --git a/gfx/tilesets/gate.w128.t1.png b/gfx/tilesets/gate.w128.t1.png new file mode 100644 index 00000000..372e6751 Binary files /dev/null and b/gfx/tilesets/gate.w128.t1.png differ diff --git a/gfx/tilesets/gym.2bpp b/gfx/tilesets/gym.2bpp deleted file mode 100644 index acca6721..00000000 Binary files a/gfx/tilesets/gym.2bpp and /dev/null differ diff --git a/gfx/tilesets/gym.w128.png b/gfx/tilesets/gym.w128.png new file mode 100644 index 00000000..bffb472b Binary files /dev/null and b/gfx/tilesets/gym.w128.png differ diff --git a/gfx/tilesets/house.2bpp b/gfx/tilesets/house.2bpp deleted file mode 100644 index 2c15989c..00000000 Binary files a/gfx/tilesets/house.2bpp and /dev/null differ diff --git a/gfx/tilesets/house.w128.png b/gfx/tilesets/house.w128.png new file mode 100644 index 00000000..b5d67c95 Binary files /dev/null and b/gfx/tilesets/house.w128.png differ diff --git a/gfx/tilesets/interior.2bpp b/gfx/tilesets/interior.2bpp deleted file mode 100644 index cef7ede4..00000000 Binary files a/gfx/tilesets/interior.2bpp and /dev/null differ diff --git a/gfx/tilesets/interior.w128.t1.png b/gfx/tilesets/interior.w128.t1.png new file mode 100644 index 00000000..3123d81c Binary files /dev/null and b/gfx/tilesets/interior.w128.t1.png differ diff --git a/gfx/tilesets/lab.2bpp b/gfx/tilesets/lab.2bpp deleted file mode 100644 index 65a56f55..00000000 Binary files a/gfx/tilesets/lab.2bpp and /dev/null differ diff --git a/gfx/tilesets/lab.w128.t4.png b/gfx/tilesets/lab.w128.t4.png new file mode 100644 index 00000000..4a114337 Binary files /dev/null and b/gfx/tilesets/lab.w128.t4.png differ diff --git a/gfx/tilesets/lobby.2bpp b/gfx/tilesets/lobby.2bpp deleted file mode 100644 index 779ed27f..00000000 Binary files a/gfx/tilesets/lobby.2bpp and /dev/null differ diff --git a/gfx/tilesets/lobby.w128.t2.png b/gfx/tilesets/lobby.w128.t2.png new file mode 100644 index 00000000..f2a1c180 Binary files /dev/null and b/gfx/tilesets/lobby.w128.t2.png differ diff --git a/gfx/tilesets/mansion.2bpp b/gfx/tilesets/mansion.2bpp deleted file mode 100644 index c0063628..00000000 Binary files a/gfx/tilesets/mansion.2bpp and /dev/null differ diff --git a/gfx/tilesets/mansion.w128.t2.png b/gfx/tilesets/mansion.w128.t2.png new file mode 100644 index 00000000..557c23b4 Binary files /dev/null and b/gfx/tilesets/mansion.w128.t2.png differ diff --git a/gfx/tilesets/overworld.2bpp b/gfx/tilesets/overworld.2bpp deleted file mode 100644 index 6e480769..00000000 Binary files a/gfx/tilesets/overworld.2bpp and /dev/null differ diff --git a/gfx/tilesets/overworld.w128.t2.png b/gfx/tilesets/overworld.w128.t2.png new file mode 100644 index 00000000..c7533e40 Binary files /dev/null and b/gfx/tilesets/overworld.w128.t2.png differ diff --git a/gfx/tilesets/plateau.2bpp b/gfx/tilesets/plateau.2bpp deleted file mode 100644 index e277c12b..00000000 Binary files a/gfx/tilesets/plateau.2bpp and /dev/null differ diff --git a/gfx/tilesets/plateau.w128.t10.png b/gfx/tilesets/plateau.w128.t10.png new file mode 100644 index 00000000..b87162d8 Binary files /dev/null and b/gfx/tilesets/plateau.w128.t10.png differ diff --git a/gfx/tilesets/pokecenter.2bpp b/gfx/tilesets/pokecenter.2bpp deleted file mode 100644 index 8f10e418..00000000 Binary files a/gfx/tilesets/pokecenter.2bpp and /dev/null differ diff --git a/gfx/tilesets/pokecenter.w128.png b/gfx/tilesets/pokecenter.w128.png new file mode 100644 index 00000000..ab4821d9 Binary files /dev/null and b/gfx/tilesets/pokecenter.w128.png differ diff --git a/gfx/tilesets/reds_house.2bpp b/gfx/tilesets/reds_house.2bpp deleted file mode 100644 index 1287b9a5..00000000 Binary files a/gfx/tilesets/reds_house.2bpp and /dev/null differ diff --git a/gfx/tilesets/reds_house.w128.t7.png b/gfx/tilesets/reds_house.w128.t7.png new file mode 100644 index 00000000..5f210d04 Binary files /dev/null and b/gfx/tilesets/reds_house.w128.t7.png differ diff --git a/gfx/tilesets/ship.2bpp b/gfx/tilesets/ship.2bpp deleted file mode 100644 index 7a032775..00000000 Binary files a/gfx/tilesets/ship.2bpp and /dev/null differ diff --git a/gfx/tilesets/ship.w128.t6.png b/gfx/tilesets/ship.w128.t6.png new file mode 100644 index 00000000..cf5b6b95 Binary files /dev/null and b/gfx/tilesets/ship.w128.t6.png differ diff --git a/gfx/tilesets/ship_port.2bpp b/gfx/tilesets/ship_port.2bpp deleted file mode 100644 index 06dedfed..00000000 Binary files a/gfx/tilesets/ship_port.2bpp and /dev/null differ diff --git a/gfx/tilesets/ship_port.w128.png b/gfx/tilesets/ship_port.w128.png new file mode 100644 index 00000000..fa5bbb27 Binary files /dev/null and b/gfx/tilesets/ship_port.w128.png differ diff --git a/gfx/tilesets/underground.2bpp b/gfx/tilesets/underground.2bpp deleted file mode 100644 index 9c827e13..00000000 Binary files a/gfx/tilesets/underground.2bpp and /dev/null differ diff --git a/gfx/tilesets/underground.w128.t7.png b/gfx/tilesets/underground.w128.t7.png new file mode 100644 index 00000000..baa86c17 Binary files /dev/null and b/gfx/tilesets/underground.w128.t7.png differ diff --git a/gfx/town_map.2bpp b/gfx/town_map.2bpp deleted file mode 100755 index 54e45869..00000000 Binary files a/gfx/town_map.2bpp and /dev/null differ diff --git a/gfx/town_map.png b/gfx/town_map.png new file mode 100644 index 00000000..23e52130 Binary files /dev/null and b/gfx/town_map.png differ diff --git a/gfx/town_map_cursor.1bpp b/gfx/town_map_cursor.1bpp deleted file mode 100755 index 46328979..00000000 Binary files a/gfx/town_map_cursor.1bpp and /dev/null differ diff --git a/gfx/town_map_cursor.png b/gfx/town_map_cursor.png new file mode 100644 index 00000000..6c5720d4 Binary files /dev/null and b/gfx/town_map_cursor.png differ diff --git a/gfx/trade.2bpp b/gfx/trade.2bpp deleted file mode 100755 index e7c18503..00000000 Binary files a/gfx/trade.2bpp and /dev/null differ diff --git a/gfx/trade2.2bpp b/gfx/trade2.2bpp deleted file mode 100755 index 975f4da0..00000000 Binary files a/gfx/trade2.2bpp and /dev/null differ diff --git a/gfx/trade2.png b/gfx/trade2.png new file mode 100644 index 00000000..ccd3a222 Binary files /dev/null and b/gfx/trade2.png differ diff --git a/gfx/trainer_info.2bpp b/gfx/trainer_info.2bpp deleted file mode 100755 index 4baf4888..00000000 Binary files a/gfx/trainer_info.2bpp and /dev/null differ diff --git a/gfx/trainer_info.png b/gfx/trainer_info.png new file mode 100644 index 00000000..d3ac169f Binary files /dev/null and b/gfx/trainer_info.png differ diff --git a/gfx/up_arrow.1bpp b/gfx/up_arrow.1bpp deleted file mode 100755 index a3c69389..00000000 Binary files a/gfx/up_arrow.1bpp and /dev/null differ diff --git a/gfx/up_arrow.png b/gfx/up_arrow.png new file mode 100644 index 00000000..6f2b957f Binary files /dev/null and b/gfx/up_arrow.png differ diff --git a/main.asm b/main.asm index 7d02ab90..feb3fe19 100644 --- a/main.asm +++ b/main.asm @@ -27447,7 +27447,7 @@ DrawBadges: ; ea03 (3:6a03) db $20, $28, $30, $38, $40, $48, $50, $58 GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e) - INCBIN "gfx/badges.2bpp" + INCBIN "gfx/badges.w16.2bpp" Func_ee9e: ; ee9e (3:6e9e) call Load16BitRegisters @@ -29734,9 +29734,10 @@ LyingOldManSprite: ; 11340 (4:5340) INCBIN "gfx/sprites/lying_old_man.2bpp" ; was $11340 PokemonLogoGraphics: ; 11380 (4:5380) - INCBIN "gfx/pokemon_logo.2bpp" + INCBIN "gfx/pokemon_logo.w128.2bpp" + FontGraphics: ; 11a80 (4:5a80) - INCBIN "gfx/font.1bpp" + INCBIN "gfx/font.w128.1bpp" ABTiles: ; 11e80 (4:5e80) INCBIN "gfx/AB.2bpp" @@ -29754,10 +29755,10 @@ BattleHudTiles3: ; 120b0 (4:60b0) INCBIN "gfx/battle_hud3.1bpp" NintendoCopyrightLogoGraphics: ; 120c8 (4:60c8) - INCBIN "gfx/copyright.2bpp" + INCBIN "gfx/copyright.h8.2bpp" GamefreakLogoGraphics: ; 121f8 (4:61f8) - INCBIN "gfx/gamefreak.2bpp" + INCBIN "gfx/gamefreak.h8.2bpp" TextBoxGraphics: ; 12288 (4:6288) INCBIN "gfx/text_box.2bpp" @@ -33228,7 +33229,7 @@ EmotionBubblesOAM: ; 17cb5 (5:7cb5) db $FA,$00,$FB,$00 EmotionBubbles: ; 17cbd (5:7cbd) - INCBIN "gfx/emotion_bubbles.2bpp" + INCBIN "gfx/emotion_bubbles.w16.2bpp" Func_17d7d: ; 17d7d (5:7d7d) ld a, [wPlayerMonAccuracyMod] ; $cd1e @@ -53235,7 +53236,8 @@ PokeballTileGraphics:: ; 3a97e (e:697e) ; tiles for gameboy and link cable graphics used for trading sequence animation TradingAnimationGraphics: ; 3a9be (e:69be) - INCBIN "gfx/trade.2bpp" + INCBIN "gfx/game_boy.norepeat.2bpp" + INCBIN "gfx/link_cable.2bpp" ; 4 tiles for actual wire transfer animation (pokeball wandering inside wire) TradingAnimationGraphics2: ; 3acce (e:6cce) @@ -68161,7 +68163,9 @@ IntroNidorinoAnimation7: ; 41950 (10:5950) db $50 ; list terminator GameFreakIntro: ; 41959 (10:5959) - INCBIN "gfx/gamefreak_intro.2bpp" + INCBIN "gfx/gamefreak_intro.h8.2bpp" + INCBIN "gfx/gamefreak_logo.2bpp" + ds $10 ; blank tile FightIntroBackMon: ; 41a99 (10:5a99) INCBIN "gfx/intro_fight.2bpp" @@ -68169,10 +68173,16 @@ FightIntroBackMon: ; 41a99 (10:5a99) FightIntroFrontMon: ; 42099 (10:6099) IF _RED - INCBIN "gfx/red/introfight.2bpp" + INCBIN "gfx/red/intro_nido_1.6x6.2bpp" + INCBIN "gfx/red/intro_nido_2.6x6.2bpp" + INCBIN "gfx/red/intro_nido_3.6x6.2bpp" + ds $10 ; blank tile ENDC IF _BLUE - INCBIN "gfx/blue/introfight.2bpp" + INCBIN "gfx/blue/intro_purin_1.6x6.2bpp" + INCBIN "gfx/blue/intro_purin_2.6x6.2bpp" + INCBIN "gfx/blue/intro_purin_3.6x6.2bpp" + ds $10 ; blank tile ENDC ; XXX what do these do @@ -98031,33 +98041,33 @@ Unknown_62529: ; 62529 (18:6529) SECTION "bank19",ROMX,BANK[$19] Overworld_GFX: ; 64000 (19:4000) - INCBIN "gfx/tilesets/overworld.2bpp" + INCBIN "gfx/tilesets/overworld.w128.t2.2bpp" Overworld_Block: ; 645e0 (19:45e0) INCBIN "gfx/blocksets/overworld.bst" RedsHouse1_GFX: RedsHouse2_GFX: ; 64de0 (19:4de0) - INCBIN "gfx/tilesets/reds_house.2bpp" + INCBIN "gfx/tilesets/reds_house.w128.t7.2bpp" RedsHouse1_Block: RedsHouse2_Block: ; 65270 (19:5270) INCBIN "gfx/blocksets/reds_house.bst" House_GFX: ; 653a0 (19:53a0) - INCBIN "gfx/tilesets/house.2bpp" + INCBIN "gfx/tilesets/house.w128.2bpp" House_Block: ; 65980 (19:5980) INCBIN "gfx/blocksets/house.bst" Mansion_GFX: ; 65bb0 (19:5bb0) - INCBIN "gfx/tilesets/mansion.2bpp" + INCBIN "gfx/tilesets/mansion.w128.t2.2bpp" Mansion_Block: ; 66190 (19:6190) INCBIN "gfx/blocksets/mansion.bst" ShipPort_GFX: ; 66610 (19:6610) - INCBIN "gfx/tilesets/ship_port.2bpp" + INCBIN "gfx/tilesets/ship_port.w128.2bpp" ShipPort_Block: ; 66bf0 (19:6bf0) INCBIN "gfx/blocksets/ship_port.bst" Interior_GFX: ; 66d60 (19:6d60) - INCBIN "gfx/tilesets/interior.2bpp" + INCBIN "gfx/tilesets/interior.w128.t1.2bpp" Interior_Block: ; 67350 (19:7350) INCBIN "gfx/blocksets/interior.bst" Plateau_GFX: ; 676f0 (19:76f0) - INCBIN "gfx/tilesets/plateau.2bpp" + INCBIN "gfx/tilesets/plateau.w128.t10.2bpp" Plateau_Block: ; 67b50 (19:7b50) INCBIN "gfx/blocksets/plateau.bst" @@ -98106,71 +98116,71 @@ DecrementPP: ; 68000 (1a:4000) Version_GFX: ; 6802f (1a:402f) IF _RED - INCBIN "gfx/red/redgreenversion.1bpp" + INCBIN "gfx/red/redgreenversion.h8.1bpp" ; 80 bytes ENDC IF _BLUE - INCBIN "gfx/blue/blueversion.1bpp" + INCBIN "gfx/blue/blueversion.h8.1bpp" ; 64 bytes ENDC Dojo_GFX: Gym_GFX: ; 6807f (1a:407f) - INCBIN "gfx/tilesets/gym.2bpp" + INCBIN "gfx/tilesets/gym.w128.2bpp" Dojo_Block: Gym_Block: ; 6867f (1a:467f) INCBIN "gfx/blocksets/gym.bst" Mart_GFX: Pokecenter_GFX: ; 68dbf (1a:4dbf) - INCBIN "gfx/tilesets/pokecenter.2bpp" + INCBIN "gfx/tilesets/pokecenter.w128.2bpp" Mart_Block: Pokecenter_Block: ; 693bf (1a:53bf) INCBIN "gfx/blocksets/pokecenter.bst" ForestGate_GFX: Museum_GFX: Gate_GFX: ; 6960f (1a:560f) - INCBIN "gfx/tilesets/gate.2bpp" + INCBIN "gfx/tilesets/gate.w128.t1.2bpp" ForestGate_Block: Museum_Block: Gate_Block: ; 69bff (1a:5bff) INCBIN "gfx/blocksets/gate.bst" Forest_GFX: ; 6a3ff (1a:63ff) - INCBIN "gfx/tilesets/forest.2bpp" + INCBIN "gfx/tilesets/forest.w128.2bpp" Forest_Block: ; 6a9ff (1a:69ff) INCBIN "gfx/blocksets/forest.bst" Facility_GFX: ; 6b1ff (1a:71ff) - INCBIN "gfx/tilesets/facility.2bpp" + INCBIN "gfx/tilesets/facility.w128.2bpp" Facility_Block: ; 6b7ff (1a:77ff) INCBIN "gfx/blocksets/facility.bst" SECTION "bank1B",ROMX,BANK[$1B] Cemetery_GFX: ; 6c000 (1b:4000) - INCBIN "gfx/tilesets/cemetery.2bpp" + INCBIN "gfx/tilesets/cemetery.w128.t4.2bpp" Cemetery_Block: ; 6c5c0 (1b:45c0) INCBIN "gfx/blocksets/cemetery.bst" Cavern_GFX: ; 6cca0 (1b:4ca0) - INCBIN "gfx/tilesets/cavern.2bpp" + INCBIN "gfx/tilesets/cavern.w128.t14.2bpp" Cavern_Block: ; 6d0c0 (1b:50c0) INCBIN "gfx/blocksets/cavern.bst" Lobby_GFX: ; 6d8c0 (1b:58c0) - INCBIN "gfx/tilesets/lobby.2bpp" + INCBIN "gfx/tilesets/lobby.w128.t2.2bpp" Lobby_Block: ; 6dea0 (1b:5ea0) INCBIN "gfx/blocksets/lobby.bst" Ship_GFX: ; 6e390 (1b:6390) - INCBIN "gfx/tilesets/ship.2bpp" + INCBIN "gfx/tilesets/ship.w128.t6.2bpp" Ship_Block: ; 6e930 (1b:6930) INCBIN "gfx/blocksets/ship.bst" Lab_GFX: ; 6ed10 (1b:6d10) - INCBIN "gfx/tilesets/lab.2bpp" + INCBIN "gfx/tilesets/lab.w128.t4.2bpp" Lab_Block: ; 6f2d0 (1b:72d0) INCBIN "gfx/blocksets/lab.bst" Club_GFX: ; 6f670 (1b:7670) - INCBIN "gfx/tilesets/club.2bpp" + INCBIN "gfx/tilesets/club.w128.t5.2bpp" Club_Block: ; 6fb20 (1b:7b20) INCBIN "gfx/blocksets/club.bst" Underground_GFX: ; 6fd60 (1b:7d60) - INCBIN "gfx/tilesets/underground.2bpp" + INCBIN "gfx/tilesets/underground.w128.t7.2bpp" Underground_Block: ; 6fef0 (1b:7ef0) INCBIN "gfx/blocksets/underground.bst" @@ -103063,10 +103073,10 @@ ENDC SGBBorderGraphics: ; 72fe8 (1c:6fe8) IF _RED - INCBIN "gfx/red/sgbborder.2bpp" + INCBIN "gfx/red/sgbborder.w128.2bpp" ENDC IF _BLUE - INCBIN "gfx/blue/sgbborder.2bpp" + INCBIN "gfx/blue/sgbborder.w128.2bpp" ENDC LoadSAV: ; 735e8 (1c:75e8) @@ -104307,7 +104317,7 @@ CredPAAD: ; 74730 (1d:4730) db -5, "PAAD TESTING@" TheEndGfx: ; 7473e (1d:473e) ; 473E (473F on blue) - INCBIN "gfx/theend.2bpp" + INCBIN "gfx/theend.w40.interleave.2bpp" PrintStatusAilment: ; 747de (1d:47de) ld a, [de] -- cgit v1.2.3