From f8455e9b4f0270811dac718810811292beb41da6 Mon Sep 17 00:00:00 2001 From: Fredrik Ljungdahl Date: Sun, 8 Jan 2017 01:26:48 +0100 Subject: [PATCH 01/46] Reverse the LastEnemyCounterMove and LastPlayerCounterMove labels They were swapped --- battle/ai/items.asm | 2 +- battle/ai/scoring.asm | 22 +++++++++++----------- battle/ai/switch.asm | 8 ++++---- battle/core.asm | 8 ++++---- home/battle.asm | 2 +- wram.asm | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 4405ae756..155e0bd3b 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -238,7 +238,7 @@ AI_TryItem: ; 38105 res SUBSTATUS_RAGE, [hl] xor a - ld [LastPlayerCounterMove], a + ld [LastEnemyCounterMove], a scf ret diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 3091697e5..733322f82 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -756,7 +756,7 @@ AI_Smart_AlwaysHit: ; 38947 AI_Smart_MirrorMove: ; 3895b ; If the player did not use any move last turn... - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] and a jr nz, .asm_38968 @@ -1353,7 +1353,7 @@ AI_Smart_Rage: ; 38b7f AI_Smart_Mimic: ; 38ba8 - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] and a jr z, .asm_38be9 @@ -1361,7 +1361,7 @@ AI_Smart_Mimic: ; 38ba8 jr nc, .asm_38bef push hl - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] call AIGetEnemyMove ld a, $1 @@ -1380,7 +1380,7 @@ AI_Smart_Mimic: ; 38ba8 dec [hl] .asm_38bd4 - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] push hl ld hl, UsefulMoves ld de, 1 @@ -1438,7 +1438,7 @@ AI_Smart_Counter: ; 38bf1 cp $3 jr nc, .asm_38c30 - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] and a jr z, .asm_38c38 @@ -1499,7 +1499,7 @@ AI_Smart_Encore: ; 38c3b .asm_38c68 push hl - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] ld hl, .EncoreMoves ld de, 1 call IsInArray @@ -1615,7 +1615,7 @@ AI_Smart_DefrostOpponent: ; 38ccb AI_Smart_Spite: ; 38cd5 - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] and a jr nz, .asm_38ce7 @@ -1837,7 +1837,7 @@ AI_Smart_Disable: ; 38dd1 jr nc, .asm_38df3 push hl - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] ld hl, UsefulMoves ld de, 1 call IsInArray @@ -2367,7 +2367,7 @@ AI_Smart_Magnitude: AI_Smart_Earthquake: ; 39044 ; Greatly encourage this move if the player is underground and the enemy is faster. - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] cp DIG ret nz @@ -2741,7 +2741,7 @@ AI_Smart_MirrorCoat: ; 3918b cp $3 jr nc, .asm_391ca - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] and a jr z, .asm_391d2 @@ -2775,7 +2775,7 @@ AI_Smart_Twister: AI_Smart_Gust: ; 391d5 ; Greatly encourage this move if the player is flying and the enemy is faster. - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] cp FLY ret nz diff --git a/battle/ai/switch.asm b/battle/ai/switch.asm index cb1fe3660..c2f83fa1f 100755 --- a/battle/ai/switch.asm +++ b/battle/ai/switch.asm @@ -229,7 +229,7 @@ CheckAbleToSwitch: ; 34941 cp 11 ret nc - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] and a jr z, .no_last_counter_move @@ -378,8 +378,8 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a ld [CurSpecies], a call GetBaseData - ; the enemy's last move is damaging... - ld a, [LastEnemyCounterMove] + ; the player's last move is damaging... + ld a, [LastPlayerCounterMove] dec a ld hl, Moves + MOVE_POWER call GetMoveAttr @@ -568,7 +568,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20 push hl ld [CurSpecies], a call GetBaseData - ld a, [LastEnemyCounterMove] + ld a, [LastPlayerCounterMove] and a jr z, .skip_move diff --git a/battle/core.asm b/battle/core.asm index 81376edc6..89a8c4c10 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3366,8 +3366,8 @@ CheckWhetherSwitchmonIsPredetermined: ; 3d533 ResetEnemyBattleVars: ; 3d557 ; and draw empty TextBox xor a - ld [LastEnemyCounterMove], a ld [LastPlayerCounterMove], a + ld [LastEnemyCounterMove], a ld [LastEnemyMove], a ld [CurEnemyMove], a dec a @@ -3766,8 +3766,8 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 NewEnemyMonStatus: ; 3d834 xor a - ld [LastEnemyCounterMove], a ld [LastPlayerCounterMove], a + ld [LastEnemyCounterMove], a ld [LastEnemyMove], a ld hl, EnemySubStatus1 rept 4 @@ -4217,8 +4217,8 @@ SendOutPlayerMon: ; 3db5f ld [CurMoveNum], a ld [TypeModifier], a ld [wPlayerMoveStruct + MOVE_ANIM], a - ld [LastEnemyCounterMove], a ld [LastPlayerCounterMove], a + ld [LastEnemyCounterMove], a ld [LastPlayerMove], a call CheckAmuletCoin call FinishBattleAnim @@ -4258,8 +4258,8 @@ SendOutPlayerMon: ; 3db5f NewBattleMonStatus: ; 3dbde xor a - ld [LastEnemyCounterMove], a ld [LastPlayerCounterMove], a + ld [LastEnemyCounterMove], a ld [LastPlayerMove], a ld hl, PlayerSubStatus1 rept 4 diff --git a/home/battle.asm b/home/battle.asm index e8aa0747c..3c2e4de43 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -227,7 +227,7 @@ GetBattleVarAddr:: ; 39e7 dw wPlayerMoveStructPower, wEnemyMoveStructPower dw wPlayerMoveStructType, wEnemyMoveStructType dw CurPlayerMove, CurEnemyMove - dw LastEnemyCounterMove, LastPlayerCounterMove + dw LastPlayerCounterMove, LastEnemyCounterMove dw LastPlayerMove, LastEnemyMove ; 3a90 diff --git a/wram.asm b/wram.asm index 65d1b1aa7..663f57893 100644 --- a/wram.asm +++ b/wram.asm @@ -635,9 +635,9 @@ EnemyDisabledMove:: ; c6f6 wWhichMonFaintedFirst:: ds 1 ; exists so you can't counter on switch -LastEnemyCounterMove:: ; c6f8 +LastPlayerCounterMove:: ; c6f8 ds 1 -LastPlayerCounterMove:: ; c6f9 +LastEnemyCounterMove:: ; c6f9 ds 1 wEnemyMinimized:: ds 1 ; c6fa From 9b8f57a7308691f67f9025b5dcc621941dbc3afd Mon Sep 17 00:00:00 2001 From: Fredrik Ljungdahl Date: Sun, 8 Jan 2017 01:33:38 +0100 Subject: [PATCH 02/46] Explain a major AI-related bug with type matchup checks --- battle/effect_commands.asm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 8e0c694b3..e730c457a 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -1542,6 +1542,12 @@ BattleCheckTypeMatchup: ; 347c8 jr z, CheckTypeMatchup ld hl, BattleMonType1 CheckTypeMatchup: ; 347d3 +; There is an incorrect assumption about this function made in the AI related code: when +; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the +; offensive type in a will make this function do the right thing. Since a is overwritten, +; this assumption is incorrect. A simple fix would be to load the move type for the +; current move into a in BattleCheckTypeMatchup, before falling through, which is +; consistent with how the rest of the code assumes this code works like. push hl push de push bc From 0e76127da878efbe86997eb5a58e6bcd4bf66ff5 Mon Sep 17 00:00:00 2001 From: Fredrik Ljungdahl Date: Sun, 8 Jan 2017 01:43:25 +0100 Subject: [PATCH 03/46] Fix an overlooked replace The build should match now... --- battle/effect_commands.asm | 2 +- misc/mobile_5c.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index e730c457a..9ebf26209 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -971,7 +971,7 @@ BattleCommand_CheckObedience: ; 343db .EndDisobedience: xor a ld [LastPlayerMove], a - ld [LastEnemyCounterMove], a + ld [LastPlayerCounterMove], a ; Break Encore too. ld hl, PlayerSubStatus5 diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index 5f72f32c7..b057e8c66 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -206,7 +206,7 @@ Function170c06: ; 170c06 ; 170c8b Function170c8b: ; 170c8b - ld hl, LastPlayerCounterMove + ld hl, LastEnemyCounterMove ld b, $5 .asm_170c90 ld a, [hl] From cd159dcf399b935913d541413863ae3a8222c87b Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 4 Jun 2017 21:06:36 -0400 Subject: [PATCH 04/46] pngs in gfx/overworld --- gfx/overworld/000.2bpp | Bin 384 -> 0 bytes gfx/overworld/000.png | Bin 0 -> 300 bytes gfx/overworld/001.2bpp | 2 -- gfx/overworld/001.png | Bin 0 -> 373 bytes gfx/overworld/002.2bpp | 1 - gfx/overworld/002.png | Bin 0 -> 209 bytes gfx/overworld/003.2bpp | Bin 384 -> 0 bytes gfx/overworld/003.png | Bin 0 -> 300 bytes gfx/overworld/004.2bpp | Bin 384 -> 0 bytes gfx/overworld/004.png | Bin 0 -> 305 bytes gfx/overworld/005.2bpp | Bin 384 -> 0 bytes gfx/overworld/005.png | Bin 0 -> 294 bytes gfx/overworld/006.2bpp | Bin 384 -> 0 bytes gfx/overworld/006.png | Bin 0 -> 321 bytes gfx/overworld/007.2bpp | Bin 384 -> 0 bytes gfx/overworld/007.png | Bin 0 -> 307 bytes gfx/overworld/008.2bpp | 7 ------- gfx/overworld/008.png | Bin 0 -> 319 bytes gfx/overworld/009.2bpp | Bin 384 -> 0 bytes gfx/overworld/009.png | Bin 0 -> 259 bytes gfx/overworld/010.2bpp | Bin 384 -> 0 bytes gfx/overworld/010.png | Bin 0 -> 309 bytes gfx/overworld/011.2bpp | Bin 384 -> 0 bytes gfx/overworld/011.png | Bin 0 -> 253 bytes gfx/overworld/012.2bpp | Bin 384 -> 0 bytes gfx/overworld/012.png | Bin 0 -> 304 bytes gfx/overworld/013.2bpp | Bin 384 -> 0 bytes gfx/overworld/013.png | Bin 0 -> 281 bytes gfx/overworld/014.2bpp | Bin 384 -> 0 bytes gfx/overworld/014.png | Bin 0 -> 277 bytes gfx/overworld/015.2bpp | Bin 384 -> 0 bytes gfx/overworld/015.png | Bin 0 -> 314 bytes gfx/overworld/016.2bpp | 1 - gfx/overworld/016.png | Bin 0 -> 216 bytes gfx/overworld/017.2bpp | Bin 384 -> 0 bytes gfx/overworld/017.png | Bin 0 -> 303 bytes gfx/overworld/018.2bpp | Bin 384 -> 0 bytes gfx/overworld/018.png | Bin 0 -> 298 bytes gfx/overworld/019.2bpp | Bin 384 -> 0 bytes gfx/overworld/019.png | Bin 0 -> 277 bytes gfx/overworld/020.2bpp | Bin 384 -> 0 bytes gfx/overworld/020.png | Bin 0 -> 282 bytes gfx/overworld/021.2bpp | Bin 384 -> 0 bytes gfx/overworld/021.png | Bin 0 -> 276 bytes gfx/overworld/022.2bpp | Bin 384 -> 0 bytes gfx/overworld/022.png | Bin 0 -> 293 bytes gfx/overworld/023.2bpp | Bin 384 -> 0 bytes gfx/overworld/023.png | Bin 0 -> 298 bytes gfx/overworld/024.2bpp | Bin 384 -> 0 bytes gfx/overworld/024.png | Bin 0 -> 350 bytes gfx/overworld/025.2bpp | Bin 384 -> 0 bytes gfx/overworld/025.png | Bin 0 -> 276 bytes gfx/overworld/026.2bpp | 2 -- gfx/overworld/026.png | Bin 0 -> 207 bytes gfx/overworld/027.2bpp | Bin 384 -> 0 bytes gfx/overworld/027.png | Bin 0 -> 286 bytes gfx/overworld/028.2bpp | Bin 384 -> 0 bytes gfx/overworld/028.png | Bin 0 -> 274 bytes gfx/overworld/029.2bpp | Bin 384 -> 0 bytes gfx/overworld/029.png | Bin 0 -> 287 bytes gfx/overworld/030.2bpp | Bin 384 -> 0 bytes gfx/overworld/030.png | Bin 0 -> 277 bytes gfx/overworld/031.2bpp | Bin 384 -> 0 bytes gfx/overworld/031.png | Bin 0 -> 233 bytes gfx/overworld/032.2bpp | Bin 384 -> 0 bytes gfx/overworld/032.png | Bin 0 -> 253 bytes gfx/overworld/033.2bpp | Bin 384 -> 0 bytes gfx/overworld/033.png | Bin 0 -> 260 bytes gfx/overworld/034.2bpp | Bin 384 -> 0 bytes gfx/overworld/034.png | Bin 0 -> 286 bytes gfx/overworld/035.2bpp | Bin 384 -> 0 bytes gfx/overworld/035.png | Bin 0 -> 349 bytes gfx/overworld/036.2bpp | Bin 384 -> 0 bytes gfx/overworld/036.png | Bin 0 -> 237 bytes gfx/overworld/037.2bpp | Bin 384 -> 0 bytes gfx/overworld/037.png | Bin 0 -> 254 bytes gfx/overworld/038.2bpp | Bin 384 -> 0 bytes gfx/overworld/038.png | Bin 0 -> 281 bytes gfx/overworld/039.2bpp | Bin 384 -> 0 bytes gfx/overworld/039.png | Bin 0 -> 305 bytes gfx/overworld/040.2bpp | Bin 384 -> 0 bytes gfx/overworld/040.png | Bin 0 -> 283 bytes gfx/overworld/041.2bpp | Bin 384 -> 0 bytes gfx/overworld/041.png | Bin 0 -> 263 bytes gfx/overworld/042.2bpp | Bin 384 -> 0 bytes gfx/overworld/042.png | Bin 0 -> 293 bytes gfx/overworld/043.2bpp | Bin 384 -> 0 bytes gfx/overworld/043.png | Bin 0 -> 296 bytes gfx/overworld/044.2bpp | Bin 384 -> 0 bytes gfx/overworld/044.png | Bin 0 -> 289 bytes gfx/overworld/045.2bpp | 1 - gfx/overworld/045.png | Bin 0 -> 264 bytes gfx/overworld/046.2bpp | Bin 384 -> 0 bytes gfx/overworld/046.png | Bin 0 -> 338 bytes gfx/overworld/047.2bpp | Bin 384 -> 0 bytes gfx/overworld/047.png | Bin 0 -> 360 bytes gfx/overworld/048.2bpp | Bin 384 -> 0 bytes gfx/overworld/048.png | Bin 0 -> 303 bytes gfx/overworld/049.2bpp | Bin 384 -> 0 bytes gfx/overworld/049.png | Bin 0 -> 328 bytes gfx/overworld/050.2bpp | Bin 128 -> 0 bytes gfx/overworld/050.png | Bin 0 -> 183 bytes gfx/overworld/051.2bpp | Bin 384 -> 0 bytes gfx/overworld/051.png | Bin 0 -> 443 bytes gfx/overworld/052.2bpp | Bin 384 -> 0 bytes gfx/overworld/052.png | Bin 0 -> 247 bytes gfx/overworld/053.2bpp | Bin 384 -> 0 bytes gfx/overworld/053.png | Bin 0 -> 253 bytes gfx/overworld/054.2bpp | Bin 192 -> 0 bytes gfx/overworld/054.png | Bin 0 -> 210 bytes gfx/overworld/055.2bpp | Bin 384 -> 0 bytes gfx/overworld/055.png | Bin 0 -> 266 bytes gfx/overworld/056.2bpp | Bin 384 -> 0 bytes gfx/overworld/056.png | Bin 0 -> 292 bytes gfx/overworld/057.2bpp | Bin 384 -> 0 bytes gfx/overworld/057.png | Bin 0 -> 308 bytes gfx/overworld/058.2bpp | Bin 384 -> 0 bytes gfx/overworld/058.png | Bin 0 -> 269 bytes gfx/overworld/059.2bpp | Bin 384 -> 0 bytes gfx/overworld/059.png | Bin 0 -> 283 bytes gfx/overworld/060.2bpp | Bin 384 -> 0 bytes gfx/overworld/060.png | Bin 0 -> 305 bytes gfx/overworld/061.2bpp | Bin 384 -> 0 bytes gfx/overworld/061.png | Bin 0 -> 305 bytes gfx/overworld/062.2bpp | Bin 384 -> 0 bytes gfx/overworld/062.png | Bin 0 -> 250 bytes gfx/overworld/063.2bpp | Bin 384 -> 0 bytes gfx/overworld/063.png | Bin 0 -> 264 bytes gfx/overworld/064.2bpp | Bin 384 -> 0 bytes gfx/overworld/064.png | Bin 0 -> 279 bytes gfx/overworld/065.2bpp | Bin 384 -> 0 bytes gfx/overworld/065.png | Bin 0 -> 237 bytes gfx/overworld/066.2bpp | Bin 384 -> 0 bytes gfx/overworld/066.png | Bin 0 -> 285 bytes gfx/overworld/067.2bpp | Bin 384 -> 0 bytes gfx/overworld/067.png | Bin 0 -> 305 bytes gfx/overworld/068.2bpp | 1 - gfx/overworld/068.png | Bin 0 -> 139 bytes gfx/overworld/069.2bpp | Bin 384 -> 0 bytes gfx/overworld/069.png | Bin 0 -> 227 bytes gfx/overworld/070.2bpp | Bin 128 -> 0 bytes gfx/overworld/070.png | Bin 0 -> 193 bytes gfx/overworld/071.2bpp | Bin 384 -> 0 bytes gfx/overworld/071.png | Bin 0 -> 295 bytes gfx/overworld/072.2bpp | Bin 384 -> 0 bytes gfx/overworld/072.png | Bin 0 -> 307 bytes gfx/overworld/073.2bpp | 2 -- gfx/overworld/073.png | Bin 0 -> 346 bytes gfx/overworld/074.2bpp | Bin 384 -> 0 bytes gfx/overworld/074.png | Bin 0 -> 292 bytes gfx/overworld/075.2bpp | Bin 384 -> 0 bytes gfx/overworld/075.png | Bin 0 -> 350 bytes gfx/overworld/076.2bpp | Bin 384 -> 0 bytes gfx/overworld/076.png | Bin 0 -> 317 bytes gfx/overworld/077.2bpp | Bin 384 -> 0 bytes gfx/overworld/077.png | Bin 0 -> 354 bytes gfx/overworld/078.2bpp | Bin 384 -> 0 bytes gfx/overworld/078.png | Bin 0 -> 327 bytes gfx/overworld/079.2bpp | Bin 192 -> 0 bytes gfx/overworld/079.png | Bin 0 -> 262 bytes gfx/overworld/080.2bpp | 1 - gfx/overworld/080.png | Bin 0 -> 142 bytes gfx/overworld/081.2bpp | Bin 128 -> 0 bytes gfx/overworld/081.png | Bin 0 -> 180 bytes gfx/overworld/082.2bpp | Bin 384 -> 0 bytes gfx/overworld/082.png | Bin 0 -> 355 bytes gfx/overworld/083.2bpp | Bin 384 -> 0 bytes gfx/overworld/083.png | Bin 0 -> 119 bytes gfx/overworld/084.2bpp | Bin 384 -> 0 bytes gfx/overworld/084.png | Bin 0 -> 121 bytes gfx/overworld/085.2bpp | Bin 384 -> 0 bytes gfx/overworld/085.png | Bin 0 -> 111 bytes gfx/overworld/086.2bpp | Bin 64 -> 0 bytes gfx/overworld/086.png | Bin 0 -> 127 bytes gfx/overworld/087.2bpp | 1 - gfx/overworld/087.png | Bin 0 -> 141 bytes gfx/overworld/088.2bpp | 1 - gfx/overworld/088.png | Bin 0 -> 146 bytes gfx/overworld/089.2bpp | 1 - gfx/overworld/089.png | Bin 0 -> 143 bytes gfx/overworld/090.2bpp | Bin 64 -> 0 bytes gfx/overworld/090.png | Bin 0 -> 109 bytes gfx/overworld/091.2bpp | Bin 64 -> 0 bytes gfx/overworld/091.png | Bin 0 -> 110 bytes gfx/overworld/092.2bpp | 1 - gfx/overworld/092.png | Bin 0 -> 148 bytes gfx/overworld/093.2bpp | Bin 64 -> 0 bytes gfx/overworld/093.png | Bin 0 -> 121 bytes gfx/overworld/094.2bpp | Bin 64 -> 0 bytes gfx/overworld/094.png | Bin 0 -> 120 bytes gfx/overworld/095.2bpp | Bin 384 -> 0 bytes gfx/overworld/095.png | Bin 0 -> 308 bytes gfx/overworld/096.2bpp | 2 -- gfx/overworld/096.png | Bin 0 -> 414 bytes gfx/overworld/097.2bpp | 2 -- gfx/overworld/097.png | Bin 0 -> 224 bytes gfx/overworld/098.2bpp | 1 - gfx/overworld/098.png | Bin 0 -> 140 bytes gfx/overworld/099.2bpp | 1 - gfx/overworld/099.png | Bin 0 -> 144 bytes gfx/overworld/100.2bpp | 1 - gfx/overworld/100.png | Bin 0 -> 145 bytes gfx/overworld/101.2bpp | 1 - gfx/overworld/101.png | Bin 0 -> 214 bytes gfx/overworld/chris_fish.2bpp | Bin 144 -> 0 bytes gfx/overworld/chris_fish.png | Bin 0 -> 190 bytes gfx/overworld/kris_fish.2bpp | Bin 144 -> 0 bytes gfx/overworld/kris_fish.png | Bin 0 -> 193 bytes gfx/overworld/trainer_battle_pokeball_tiles.2bpp | 1 - gfx/overworld/trainer_battle_pokeball_tiles.png | Bin 0 -> 89 bytes 210 files changed, 31 deletions(-) delete mode 100644 gfx/overworld/000.2bpp create mode 100644 gfx/overworld/000.png delete mode 100644 gfx/overworld/001.2bpp create mode 100644 gfx/overworld/001.png delete mode 100644 gfx/overworld/002.2bpp create mode 100644 gfx/overworld/002.png delete mode 100644 gfx/overworld/003.2bpp create mode 100644 gfx/overworld/003.png delete mode 100644 gfx/overworld/004.2bpp create mode 100644 gfx/overworld/004.png delete mode 100644 gfx/overworld/005.2bpp create mode 100644 gfx/overworld/005.png delete mode 100644 gfx/overworld/006.2bpp create mode 100644 gfx/overworld/006.png delete mode 100644 gfx/overworld/007.2bpp create mode 100644 gfx/overworld/007.png delete mode 100644 gfx/overworld/008.2bpp create mode 100644 gfx/overworld/008.png delete mode 100644 gfx/overworld/009.2bpp create mode 100644 gfx/overworld/009.png delete mode 100644 gfx/overworld/010.2bpp create mode 100644 gfx/overworld/010.png delete mode 100644 gfx/overworld/011.2bpp create mode 100644 gfx/overworld/011.png delete mode 100644 gfx/overworld/012.2bpp create mode 100644 gfx/overworld/012.png delete mode 100644 gfx/overworld/013.2bpp create mode 100644 gfx/overworld/013.png delete mode 100644 gfx/overworld/014.2bpp create mode 100644 gfx/overworld/014.png delete mode 100644 gfx/overworld/015.2bpp create mode 100644 gfx/overworld/015.png delete mode 100644 gfx/overworld/016.2bpp create mode 100644 gfx/overworld/016.png delete mode 100644 gfx/overworld/017.2bpp create mode 100644 gfx/overworld/017.png delete mode 100644 gfx/overworld/018.2bpp create mode 100644 gfx/overworld/018.png delete mode 100644 gfx/overworld/019.2bpp create mode 100644 gfx/overworld/019.png delete mode 100644 gfx/overworld/020.2bpp create mode 100644 gfx/overworld/020.png delete mode 100644 gfx/overworld/021.2bpp create mode 100644 gfx/overworld/021.png delete mode 100644 gfx/overworld/022.2bpp create mode 100644 gfx/overworld/022.png delete mode 100644 gfx/overworld/023.2bpp create mode 100644 gfx/overworld/023.png delete mode 100644 gfx/overworld/024.2bpp create mode 100644 gfx/overworld/024.png delete mode 100644 gfx/overworld/025.2bpp create mode 100644 gfx/overworld/025.png delete mode 100644 gfx/overworld/026.2bpp create mode 100644 gfx/overworld/026.png delete mode 100644 gfx/overworld/027.2bpp create mode 100644 gfx/overworld/027.png delete mode 100644 gfx/overworld/028.2bpp create mode 100644 gfx/overworld/028.png delete mode 100644 gfx/overworld/029.2bpp create mode 100644 gfx/overworld/029.png delete mode 100644 gfx/overworld/030.2bpp create mode 100644 gfx/overworld/030.png delete mode 100644 gfx/overworld/031.2bpp create mode 100644 gfx/overworld/031.png delete mode 100644 gfx/overworld/032.2bpp create mode 100644 gfx/overworld/032.png delete mode 100644 gfx/overworld/033.2bpp create mode 100644 gfx/overworld/033.png delete mode 100644 gfx/overworld/034.2bpp create mode 100644 gfx/overworld/034.png delete mode 100644 gfx/overworld/035.2bpp create mode 100644 gfx/overworld/035.png delete mode 100644 gfx/overworld/036.2bpp create mode 100644 gfx/overworld/036.png delete mode 100644 gfx/overworld/037.2bpp create mode 100644 gfx/overworld/037.png delete mode 100644 gfx/overworld/038.2bpp create mode 100644 gfx/overworld/038.png delete mode 100644 gfx/overworld/039.2bpp create mode 100644 gfx/overworld/039.png delete mode 100644 gfx/overworld/040.2bpp create mode 100644 gfx/overworld/040.png delete mode 100644 gfx/overworld/041.2bpp create mode 100644 gfx/overworld/041.png delete mode 100644 gfx/overworld/042.2bpp create mode 100644 gfx/overworld/042.png delete mode 100644 gfx/overworld/043.2bpp create mode 100644 gfx/overworld/043.png delete mode 100644 gfx/overworld/044.2bpp create mode 100644 gfx/overworld/044.png delete mode 100644 gfx/overworld/045.2bpp create mode 100644 gfx/overworld/045.png delete mode 100644 gfx/overworld/046.2bpp create mode 100644 gfx/overworld/046.png delete mode 100644 gfx/overworld/047.2bpp create mode 100644 gfx/overworld/047.png delete mode 100644 gfx/overworld/048.2bpp create mode 100644 gfx/overworld/048.png delete mode 100644 gfx/overworld/049.2bpp create mode 100644 gfx/overworld/049.png delete mode 100644 gfx/overworld/050.2bpp create mode 100644 gfx/overworld/050.png delete mode 100644 gfx/overworld/051.2bpp create mode 100644 gfx/overworld/051.png delete mode 100644 gfx/overworld/052.2bpp create mode 100644 gfx/overworld/052.png delete mode 100644 gfx/overworld/053.2bpp create mode 100644 gfx/overworld/053.png delete mode 100644 gfx/overworld/054.2bpp create mode 100644 gfx/overworld/054.png delete mode 100644 gfx/overworld/055.2bpp create mode 100644 gfx/overworld/055.png delete mode 100644 gfx/overworld/056.2bpp create mode 100644 gfx/overworld/056.png delete mode 100644 gfx/overworld/057.2bpp create mode 100644 gfx/overworld/057.png delete mode 100644 gfx/overworld/058.2bpp create mode 100644 gfx/overworld/058.png delete mode 100644 gfx/overworld/059.2bpp create mode 100644 gfx/overworld/059.png delete mode 100644 gfx/overworld/060.2bpp create mode 100644 gfx/overworld/060.png delete mode 100644 gfx/overworld/061.2bpp create mode 100644 gfx/overworld/061.png delete mode 100644 gfx/overworld/062.2bpp create mode 100644 gfx/overworld/062.png delete mode 100644 gfx/overworld/063.2bpp create mode 100644 gfx/overworld/063.png delete mode 100644 gfx/overworld/064.2bpp create mode 100644 gfx/overworld/064.png delete mode 100644 gfx/overworld/065.2bpp create mode 100644 gfx/overworld/065.png delete mode 100644 gfx/overworld/066.2bpp create mode 100644 gfx/overworld/066.png delete mode 100644 gfx/overworld/067.2bpp create mode 100644 gfx/overworld/067.png delete mode 100644 gfx/overworld/068.2bpp create mode 100644 gfx/overworld/068.png delete mode 100644 gfx/overworld/069.2bpp create mode 100644 gfx/overworld/069.png delete mode 100644 gfx/overworld/070.2bpp create mode 100644 gfx/overworld/070.png delete mode 100644 gfx/overworld/071.2bpp create mode 100644 gfx/overworld/071.png delete mode 100644 gfx/overworld/072.2bpp create mode 100644 gfx/overworld/072.png delete mode 100644 gfx/overworld/073.2bpp create mode 100644 gfx/overworld/073.png delete mode 100644 gfx/overworld/074.2bpp create mode 100644 gfx/overworld/074.png delete mode 100644 gfx/overworld/075.2bpp create mode 100644 gfx/overworld/075.png delete mode 100644 gfx/overworld/076.2bpp create mode 100644 gfx/overworld/076.png delete mode 100644 gfx/overworld/077.2bpp create mode 100644 gfx/overworld/077.png delete mode 100644 gfx/overworld/078.2bpp create mode 100644 gfx/overworld/078.png delete mode 100644 gfx/overworld/079.2bpp create mode 100644 gfx/overworld/079.png delete mode 100644 gfx/overworld/080.2bpp create mode 100644 gfx/overworld/080.png delete mode 100644 gfx/overworld/081.2bpp create mode 100644 gfx/overworld/081.png delete mode 100644 gfx/overworld/082.2bpp create mode 100644 gfx/overworld/082.png delete mode 100644 gfx/overworld/083.2bpp create mode 100644 gfx/overworld/083.png delete mode 100644 gfx/overworld/084.2bpp create mode 100644 gfx/overworld/084.png delete mode 100644 gfx/overworld/085.2bpp create mode 100644 gfx/overworld/085.png delete mode 100644 gfx/overworld/086.2bpp create mode 100644 gfx/overworld/086.png delete mode 100644 gfx/overworld/087.2bpp create mode 100644 gfx/overworld/087.png delete mode 100644 gfx/overworld/088.2bpp create mode 100644 gfx/overworld/088.png delete mode 100644 gfx/overworld/089.2bpp create mode 100644 gfx/overworld/089.png delete mode 100644 gfx/overworld/090.2bpp create mode 100644 gfx/overworld/090.png delete mode 100644 gfx/overworld/091.2bpp create mode 100644 gfx/overworld/091.png delete mode 100644 gfx/overworld/092.2bpp create mode 100644 gfx/overworld/092.png delete mode 100644 gfx/overworld/093.2bpp create mode 100644 gfx/overworld/093.png delete mode 100644 gfx/overworld/094.2bpp create mode 100644 gfx/overworld/094.png delete mode 100644 gfx/overworld/095.2bpp create mode 100644 gfx/overworld/095.png delete mode 100644 gfx/overworld/096.2bpp create mode 100644 gfx/overworld/096.png delete mode 100644 gfx/overworld/097.2bpp create mode 100644 gfx/overworld/097.png delete mode 100644 gfx/overworld/098.2bpp create mode 100644 gfx/overworld/098.png delete mode 100644 gfx/overworld/099.2bpp create mode 100644 gfx/overworld/099.png delete mode 100644 gfx/overworld/100.2bpp create mode 100644 gfx/overworld/100.png delete mode 100644 gfx/overworld/101.2bpp create mode 100644 gfx/overworld/101.png delete mode 100644 gfx/overworld/chris_fish.2bpp create mode 100644 gfx/overworld/chris_fish.png delete mode 100644 gfx/overworld/kris_fish.2bpp create mode 100644 gfx/overworld/kris_fish.png delete mode 100644 gfx/overworld/trainer_battle_pokeball_tiles.2bpp create mode 100644 gfx/overworld/trainer_battle_pokeball_tiles.png diff --git a/gfx/overworld/000.2bpp b/gfx/overworld/000.2bpp deleted file mode 100644 index e05a2c3f1803b01b346abaa929163fbd25b9c12e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+=u}Z^G6vpwO=&d#+5eudmdKbY>MTZu9>48iYiggn~=;8x};t)}CR|hAj45j!e z#VLai(4j*HhYlS=$#5u#i%nzDp8W^s|1nlFExyMuK!CiFZX8=l319Jx1gTx+!g;OQ ztOr+5*8uz6FsS2)lUeXS>=Q-kd2Hn^eg;h;d$ODR66!P&YN6%;hX<$Pu_y0;J&mWS zI9aI6|K8>e0N@o~$-OgceZCP9hTJOajBT;a4Ys{wGL~40hf##sPP~tJG}5&EgQ7sw z)(fO7`@tR5t2M*SymG1YGDr#Aev~BI^41FqUlho$l+U*y9B%66%+HC&NJruu8*%*S di-N)z15p)E&BJX-;8LiG?KrH4K~}$LQ>(88|?cGN7CyLJU?;lQLT}?;lu@ z3ia?L|L^^u{ERea3CZpfVqH7LopqQiWiYGCAPhr}srN_By*G$OL$_TROht3Vw0flh z(5RF{%0{Ao@kHjjCU5;l9zY)Ov(_#gPP!`*?jLgm-R1xB>@!jJMF5sLFJZr-F}yRk z-phvO?xz60Jmo`X%UdxFg$I|G9;I|B8X9|)h%4b;Jy4bqN;<%_44iiWfR00009OO3>L||Hp0?;<_O Œ?"?(?!!?9?<OO?>&>|x@?/?'5;?.>?X谰 ? ?p?)?) 8|0? ?KP)=LtR%L49$G18_g?7(Mn74Av(yeyJjq%c|pq0 z3wY#w=vqg?1GiNnr4@JV#HRvTCIr??!-TXvSA)KHs$8ljL_C4r4NhQ#B7!;Wo?zO# zh0g0aeY5Cq-|&&!o=awf$?tvJKEkGozQG%PfPg8H!vZXL8_Z$CRzL^EF;#8EG??9- z5%!2GB);mE!$uVzHxj+NU!q4LVRCp>4yJ2-UqMvD_YE6lVAX7Y%D(5}%U9n|vTC>s T&tyc+00000NkvXXu0mjf{)VTs literal 0 HcmV?d00001 diff --git a/gfx/overworld/002.2bpp b/gfx/overworld/002.2bpp deleted file mode 100644 index ec1facf43..000000000 --- a/gfx/overworld/002.2bpp +++ /dev/null @@ -1 +0,0 @@ -?7S@oRJ?3  p(0pp????_Oo_;7X4{Pku;}w|5s3KNyQ~04BgMU^OUnir)dyrc_UHx3v IIVCg!0EEj+YybcN literal 0 HcmV?d00001 diff --git a/gfx/overworld/003.2bpp b/gfx/overworld/003.2bpp deleted file mode 100644 index 1db1ee7e2dda597fb27ed5b58baf2aa0c4a790a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZQ(=HVBRSF~5Q^RJ07h%Y;Ez~BSNkCs12YChTh;`@~sU!-SgZ(i$N>2Gf@EzZaH z%dce4pEvt1&HMD{&y5!a1@;J^U}28at_K44%#^+9|Y#0Q-GeEi(}?Cihtz&`l%<3z=Y4I3DM z0M!RD{V*Rm)GGkpR^nd`^glB*0|V1PwtsrRbpG7<@!`V-pbHonPwergZSXbj4yM(ypfOq0OoC%PXGV_ diff --git a/gfx/overworld/003.png b/gfx/overworld/003.png new file mode 100644 index 0000000000000000000000000000000000000000..7d82d400c96da4794cd9ffefcc97997600f6a494 GIT binary patch literal 300 zcmV+{0n`48P)3_wzv4Q=;|WEA22=_)f+eZrR~K;nWWsg2{lIpV3_a0000X6VokLZ)!&BhRE*Z13hTcOOES0qd~E^tSCCJM}P(D2{QHD<2i_F|IM) zI~Vuj#=Br;0Mq1(cPA#|#e3sVh^|YBCIbb^bpOP+96Jno5oMIQlB^{8xKcgvTR#t? z=Qpa;e(;)%l z5xqw`?%^|H5J(bP5J=LZz^P{f|I{qAT>wJj8dom6$+tV=qv5dA$@+Og*3SzZI~AO@ uub2+B1ez9CrhNs9s~%mjxFKvnxzM588-`E9z~Fn$4j_M#F1 diff --git a/gfx/overworld/004.png b/gfx/overworld/004.png new file mode 100644 index 0000000000000000000000000000000000000000..7a76574d0929ee373f08c2f3dfc1366e924c99fd GIT binary patch literal 305 zcmV-10nYx3P)L(4GljWHDl7oE zDX+2mg6%aHBDZ1l5wXwq>?=F=T~iHjdxb;2i*X=|F%T7)uj#W-OTJ6MgE-`j)o0m! z%Nbe8D9`c{zlOA6_*l>|emaLRBn;2K09FM)cy;I##vDh??PrBKk0jq-r0%cpzeA5Q zw6AwYN{kdMEN^vq%J00000NkvXXu0mjf D*iwqy literal 0 HcmV?d00001 diff --git a/gfx/overworld/005.2bpp b/gfx/overworld/005.2bpp deleted file mode 100644 index e550d7ad6c54ec3271d5fa6ac792ad048530d60a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmYk&ze>YE9Ki8_g^O)SA{MP!JO>}ZKSNV`_=C6>($&SRj-@(O4c_V_WC(qRK0?P1 zeS{(z95OhB(BUXQ4)2Ud{Vg|re|MiF#P)pZ(*c7XAMr5H{n8e;STp>VO&P-VZJ$Rx z>cbH|pstIW%?CRdI5*(|3s<0oneEP)^pFbq;*3BeZU|^KE*ajmQVB2ukAZ ziF(E>3VP$5JRrGwzb5RB*X)I(1kH4pbfsGcJv`Y{+A~p-gUjVr=5*BG+?##UX2%pc z+~ooeF7FgE6h8bN8h8wCeduPf$^2jo7xK>II7^Ly9(+{ s4NVX4U!ncgz~0a6JcC;Y8Sm%PU#)z@!?F|JiU0rr07*qoM6N<$f^>XrT%M2b zk5A2be$BQ2Y1z&jeo(iabnEmqd@*?sg5c^sFu>5KHv!mjNhr9qc4?8c#!bn!v_N(yzt<`fddQ-%qTu!U_kXjeo%c;U8KD|KPNvQH$OZ3H?KcF zC3F6K`ElZh$A%3IK!EB4kbamCK$Oka{VLkx*3G4%T8GRdhVEFy;_#p71;KPR>Gycr^@<&1f0P*ykO8@`> diff --git a/gfx/overworld/006.png b/gfx/overworld/006.png new file mode 100644 index 0000000000000000000000000000000000000000..17fc2fdc648b211de0686cb6abba39de40be15af GIT binary patch literal 321 zcmV-H0lxl;P)1p=5Ji713&J+*Mqtv)h3qOfP#V=zh_?^8F+PRCotoqb!fIrlLPY|SPqXS5CVxW` z3{K%K9_-BU=l_9NE$G5R@M%nn@j1(3voJ?Ltzz_T8)G<@8`xv1VV7HtGf?9^U(~RR zxrS?2DcsXt3JE&Fx1NMW0B6h#Mq_dhjXpEfi-;jwZ_w>08l$SX2w-D(iecN9dZ*o$ z-lad|{SgikQNDAyEQz+^@WX-VK=jog?un1!*BT#g4c+jA-i$xCO2w`A5q%TO!vTT z9(wTNhd#hjoiVh-{v3bOW{UVd6T&imm7hQhZsmg%LEe{D2@h~bZ)ui2`)zoVkHIxG zd7U$MpSJN=e`d!Rs+kgk(z5AWa0O=`-{rNUf5#GT=r=uyc(r0vYMI%j`5uRfn#n0Lh=h%0z%dWvJ39(od??vb1Dv{x`%c&n4=np;?bbJNB+`Y&f#%+!&k@m`zCole$WLLUB1L(cl-ZKG6ABD0 zP!A_rr~7?>kOrNQ@+u)dZY<8_++ldyYrId}ErRzMx~5rR@LnUXb{0dSH2T@(h~Csk z3;-`)t}Rj)81=&=Vjhvh+0+gvq8q#s-J>H~pr4m~n^zj4P^?kqtYK> ~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/overworld/008.png b/gfx/overworld/008.png new file mode 100644 index 0000000000000000000000000000000000000000..90b499f162eb0dbc9076fc34cea5469070d00263 GIT binary patch literal 319 zcmV-F0l@x=P)LYxMUw9nK@!lMW|H;5_$IYj zL=ZRsOd$N27g(b#?Arr#b!}lp6#D0Ufp?KhbRs)^Y#&$9A_4j+TA)39O3`>p2n_@< zS*D<;(_sJlt0(g1eWRn-#AS$PejlRU_$lNdSTUWAEM*Ssm|n z-jBUUUhTYDL8{{D{-(6(UWs-x##fZL?!@To++ui1__3EVaDNDqqY{^i{RI5u*US=U Rz1jc(002ovPDHLkV1hJnlwbe= literal 0 HcmV?d00001 diff --git a/gfx/overworld/009.2bpp b/gfx/overworld/009.2bpp deleted file mode 100644 index 65cbdb1a27ab628009cdf2a76727d9fc0af12b3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+=v1$S_7{KvBiosU$2_k2~8aLO&MZtsY;!u2nyEnKSyXhnN0DX{-H+B$b2ZxL| z93|5cj*rm9E2MrQQ~1O83#9;4v60c6Tp!-^eOYR~HaD!kaB82Mtz7bcG>c}y0s7GE z;jTDUruxu@)+e21)b$fF5-Ta?AM6_+wZsY(W_YQ7+f5TW;=G$mDUC$VR zcojo;#$tTECisaLd$BeC*g6rzmw|8#aA53-QL1C*X09?-mUDLr@f!pIA&-K59|XQ{ uwn3oO@!0i2(Dgx(r$KP<+aU0@@Ba%3c@#L)pI{+Jg7Z4*1jYRq;`kRhp`ynC diff --git a/gfx/overworld/009.png b/gfx/overworld/009.png new file mode 100644 index 0000000000000000000000000000000000000000..b49f8e573b814215125339e55de697cdfdda2d5c GIT binary patch literal 259 zcmV+e0sQ`nP)w6HZ1p@Bc4GipbtWob5tTtDTTb?g*&rT6+cG8gbk-4ohL}DPLxO*#}N0cSe`(_8` z0$0QOiU8;X=mVnHN8$#|`KryCPWA1Z@S+G9hR4=cu7f&nL1~>TR_TRRer9;?&=)sI zLLSwQD4K?<@ZB00{vWz>8jJb$4IH{^R8~H|fkXR(M{jnlJOKdM$XF|FWu^cC002ov JPDHLkV1j7|ZvOxP literal 0 HcmV?d00001 diff --git a/gfx/overworld/010.2bpp b/gfx/overworld/010.2bpp deleted file mode 100644 index 1f21db12d58157bffd2ef1de1c83a936c6b5e78b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+9F-rqM5QPsTT#$oJDi1v}0Sg=9V$z(jX47k76#^FaX%etGP}r1~miZ}`_X9*E zRS=OYQ^^z|3}IND%?aXsFxC6uy;@DF!((Ws9eZO3lVMRHu9oz)j@*IU+l=kh^d7G5 zmC;!W5QZGNx38{Suuj%QWmyv+ysd?O?}f iHY-cSDN-&FWp>cNxIAeAG#g?oMH#*$Vh5iEEXyC9dAJw= diff --git a/gfx/overworld/010.png b/gfx/overworld/010.png new file mode 100644 index 0000000000000000000000000000000000000000..bd7fc20ea552b5c0853ecac23efc7d5758db280f GIT binary patch literal 309 zcmV-50m}Y~P)1pw7=>T(;%d?4rBfh_t4k>K0?iQbg)Tit2y||bAaDlfKZQoer%^l`)c3nBH7yh> z%xCFIdjJ1~oNPu0zv=PDW9pp8RpbG^$OeN*i_7u&geYQ>f+;ZEo>~m+vPCk%VyyPB zm;jF)3tD~qsWu}47Co?8VAifCu+X}s<~nLkV;9$c`nfGP|#NRy0Uct@GW%eA?swJmM*JP*Q*L5|U360XXK6 zPrILxCHq<_;rb{^?B&gpfUbRRjGNCU<6%(mU$c4-farF&`}9mb>K6TniR{w;TC*Yl zsRhski4q^7(a48Nea-dww2gVJ)70~>7nB0es|#pA9SRFU3x(h*$J#FhbG=^Q`ciP~ iOF=-D!1Wndf_LTmy5Qd51=Ots4**TL=b{c(Sp8DaXvXOf)sV}&k;Uy zg!_>LcOiozryEW}G?`Wia$^xJBa1e6DQH?HpnaWyV<)%uAi<>^Z9yiNwkYJmm+DVwmQwxbU zla@Rsg|C*T*zxNpSzE6p@7`}qvreD9zn4DGy{GsF;0wIj9{TZQ00000NkvXXu0mjf D$HQqb literal 0 HcmV?d00001 diff --git a/gfx/overworld/012.2bpp b/gfx/overworld/012.2bpp deleted file mode 100644 index fc40c0f15c0a37c56021d0e7ae74ecd0be6d9e6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+AJxjwt7=TmLTw;t#pb!sHFQ8aA1A-qQz1_v&P;u(wAXRC8K=A%VMt?`=4h|h0 zGKph`OiqWCa+H_D3!#|2H$U$^&#UX6Lww@Xke)w}*l;%Ek+6gXU3i?X5h+eXL7So8}ieEUeCx4_3j=&Y) z>6pl~JWDwQyMzQauYOlAEg>WRmSdX8Fb#dfK)NpQlgN1y<`K`iUlf|wFgSi4Xm?(34LUyVfZF&eT?S(Rj5{?As dTvO97So7-w64V9mcJH9#A*&12j;sWX{{U{Yji>+s diff --git a/gfx/overworld/012.png b/gfx/overworld/012.png new file mode 100644 index 0000000000000000000000000000000000000000..6ce1f30925a74d30aee10b0e764ad12656b8ddba GIT binary patch literal 304 zcmV-00nh%4P)w_aHPxfsww z1-JNEc6Pp*AIY19ly4HENOeFEY2dAGFf0~pIBN@d5d(kqV6X>T>@S{L_)TsQo^Kn( zyVDA3+EewDZ-f&mFo>-2F0z6zI|ElwibG+X5zDUn>Wk`or7x9K5sgX-t2n#S+ois- zEuCKzea6p2OSl&z%!s#6SDO+%zbt93!H{L2p?h7(X=qG6ztN`_s`ICHQ%$4mM1IvV)X&l66|{cicoU^0000$SDcQN-{m&+&dX)z!2-*AtaX0KPIS+O66f zm%E8=8qxcezQn-b@92dCh;dq%Cu;9=x7}|3`P~JTK2ycu6Scf$R)x${fDE!UOF;-` zGDOeyyLmNFu4$5FxIp6)>m(U1gaZHOKl#UhKitLwDR~|X+=tuP$GdR<$ggmLIP$v! rzX!4W^Fvc#5c_+-FBtj6U%XXCEC7H5d3byj{>Nbuy=T6l+*$hzhrr5G diff --git a/gfx/overworld/013.png b/gfx/overworld/013.png new file mode 100644 index 0000000000000000000000000000000000000000..5644764c021f1f250e0937df454c5a09515cd77b GIT binary patch literal 281 zcmV+!0p|XRP)b;z6ox;=s)V|D2|L{&mq>GhGLSoPj8v#gmh=b}6UVS3)S;&_%$8o?0|Z1Wsb&4L zWxvnwGZMWZ=uA)&!CxY4JfYY*`fa-*Y+FZMto5MDJjXomh*edR>bgXxE2RXd@fXi3 z;$)^gaCdQg?Fb!d`Sc$z-TG^^B7RLAspS$rq=L@)?UniL3I zQC_ZIs%%n-_5y2-u~ukf>VBKjT6oWs1&x8{{Wriq4zC|??(Y^jmIXW)gDpQ4>%afX zHwMZ#2C{#)nyq@+1>t3xPhC1M+*h7wnevT6&DRE%Q*F=^gH3w5d#>{F^u1$t?ib#r BmQ(-$ diff --git a/gfx/overworld/014.png b/gfx/overworld/014.png new file mode 100644 index 0000000000000000000000000000000000000000..84f330f1d7b94bdeb521873f193f2c9bbdc7c388 GIT binary patch literal 277 zcmV+w0qXvVP)TafLppa=;WxUND-V{ths~7(4kA0I=bp4Jw*q*c$(C?5Z_+~L4{%{A8p>B zkG#S=?cr78(I(2EjRJ#4B{7=GF@`Hkjr%z-;Lf>5v)D2K80?n}h9Lt$qXi6nHK6M4 zv(`M(SR41iSxcWvikAv}K7E0xA~|s&+RK>8J7h%3JwN5AuLLfWw>^QGTuppVd|dde zbSyoeKKf*He0xO6gQer&5}@1*!Z$ b-Iaa-vd76BLd$}Q00000NkvXXu0mjfe_43J literal 0 HcmV?d00001 diff --git a/gfx/overworld/015.2bpp b/gfx/overworld/015.2bpp deleted file mode 100644 index 5de055557dbef828e63e68ab1b52399747568c11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZQ(=HVBUmKU^Fus6$(tPeYIz~Dp1jUOF1@fG19{Tx3yey{)y;QJ-_%HF`0`kbvnImIZ27us5*Ow>M~LNO&Odq2ou#k0XDc*u1c?R}h!r z=jZ1FLQWQTX66$=CVY6H@F4&QCnP**XkcIfxd7n<1_o3g)Q8y{$Vu9(+pEb*v$HcW z{LA{sS2yX;n?EiUFMuXJfapi~0HPn^gNpF_g8B%1bD$UHIQiMw6<$^dud8OQr_MDf50(lPvE)1WUSR@E=8dVa~Rb>Sh3 z|MLEo?t-8Vg074hWnMWVUQ!xRZ}iPOUHX|1Pxpl56>s>P@PD|VPaD|UWhXNu&Hw-a M07*qoM6N<$f@h$P?f?J) literal 0 HcmV?d00001 diff --git a/gfx/overworld/016.2bpp b/gfx/overworld/016.2bpp deleted file mode 100644 index bdce93ada..000000000 --- a/gfx/overworld/016.2bpp +++ /dev/null @@ -1 +0,0 @@ - "?"?*?O_y0$4r/??'>' |p``  ? ? ?@D0"$??/?/ $Xp`` ?DI.?0   ``@ \ No newline at end of file diff --git a/gfx/overworld/016.png b/gfx/overworld/016.png new file mode 100644 index 0000000000000000000000000000000000000000..5229bb40497db22bdc5f2016da3dfdf154506491 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ1SA;BTlQ)JsrjBRjv*DdQqMVZ9WoGTeHgwp zd!^e4j-%d7IwI8bt}Ih)475{py1LZFf#z@^%Zjv|3^p=L1RJO&g<)1g>4@7t%O+Zv9@y0@IZF`dZsK PK~DB`^>bP0l+XkK8#z~z literal 0 HcmV?d00001 diff --git a/gfx/overworld/017.2bpp b/gfx/overworld/017.2bpp deleted file mode 100644 index f51ec247057ab5e55eeff3e040451d69cc309ff5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+=F-yZh6u|ML7jsc#t{R6zLoSqni_l;?D8?SRS;TyVERGHtTtua-AE1MS^s{7i zaCC5x5+s9zLkJlTc^sx3A$ah{KkxkxW0UT(qp{Ctj~DZBnq@(02n~FwKjoI34P741 zF2j|XG_G)>Z^?ag|$>PZa(9`XD5A!&Ou;Nc=wyTRFwrosooo0IxtDucwjPAm7jy!I+6$B* zoDN-TGMm{uln{jEOkT;oA9xbqqU`6n>N`Q#D?yqB{AA47KBJTxglJ&E3qTPS15uW! gdFlsRLE9g`D*>Mx^?X~Lc&qJbr+nWP^0eG$Y$ z#C3`{#qfXpZy+ueNUQ~ZYYHs2sW6vyh4J>1p^h2crp@55+Y~P8Q%r!xq?CozaS9*n z0{)N`kZ>UN?HPKrp|=>*Vczc=oQ(O53T}OMv8HzwS)5{>o#oZfq@D!!18*7R7q8x(S31b~buT&5oV>jG;sY+S%a)7mk+T2*002ovPDHLkV1m{k Biv$1w literal 0 HcmV?d00001 diff --git a/gfx/overworld/018.2bpp b/gfx/overworld/018.2bpp deleted file mode 100644 index 354fcfdca0f1ceda2fc9d32c181b4debc7a478d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+jPWldn)7!MMmk!omai1~~8#3=Fr) z;Na-k7>65-x$)XusIB!v`0wBR{vQY}Y?G$j3kLLQxk(xGg(;hSw%@9sFo~i^Iwo#7 za9h~C!j(#TuiBC?xBNrc&tg7@f4xnHqh7FBt+TQ>W&L}$_m16cx*AjB(!TC5j%_8m z>gygMGvB`rhIBIWT+%4|V%<=Ndd(6_?5c$jxT2d{g2f?!+&QO&MbVlpkmT z0Ox{DnhPex@f?g10w9TUL0x?As=6vzJ<0&SL1dI#01wwqrf9qM40Q<4+9Nul4v4uWRsWr^+K6&uDw6;r=TEWa1 z_RD{Poo51eoyVY#AM(bOH?}{F-E$LEspiKI|2sM;I4x^2@(K6h##O~mb$Q5tPfw)*55G_jPh8r~qfoN+9b7te@BwZV#22{fMh73INXL5w zC&|#^5QhvIGK6AdEffP80{Qdt`v`HI0B9Ix5r24zQ$p%Gk#wI|x%qlmMVun#%k1U~ zPv8h96IEzxn(FaGujN*jCHd`7k?|zXpBe9aU%Mty(Wh$`e2#p%is@g!Fe`1ExuXAi zig(%VJ%&Sn@ts!(?WV;`Jevldcj!5e+uh?fFj@;HSS?CX*Q7gRfqjn!acTtsIJ-Uv zAVd{bp!eIglx)-wf}tM-j9USQK1{*R??jzI@1Ayv6vF-9(F9a6_&7hl3;w37GATDXCuiycCk51xN5IumpcnqO>AKN()pC~SZUmgAs zNPf*5SbnhAI#cm2%y#Y}TSOXJFxEIvx=m!gm43twjvn&3m>^%S6PQNXgDnhsw$)XKeH00000NkvXXu0mjf{}Ol6 literal 0 HcmV?d00001 diff --git a/gfx/overworld/020.2bpp b/gfx/overworld/020.2bpp deleted file mode 100644 index 2c1da80ccf8fb8538024c21c7cb1950b814f7aaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+1{5?9a(kCb7su=7m^^@(R}d$MJcN&s!J&f> z5klx74xvamj^pss8XLd68-K_5$JnMWT(gixEWVFddG6N(VXIIn)qFM!oqOqVxo z0z+^d={#n7r*~iKR%}F);Jx>aXY7HmdEalPCGXOJr99@H%!Ss& zcse?IsY_i(;9l6o%qhY6#Ju-#BkH=CnPYCABXroHD?sS@Lt7B9+5$Fba}NkXs99*| z=|w4F=D9A4&UXd>{Z_8I&w@*UF;F_7gjljIP?f5L*#nuuxL?rsZNYSOD4=u*XVkLF OXkYLqUca+SdEO7K|DiSj diff --git a/gfx/overworld/020.png b/gfx/overworld/020.png new file mode 100644 index 0000000000000000000000000000000000000000..dcee550e0948c98b8f623ced9d208187b1f7900d GIT binary patch literal 282 zcmV+#0pU|9@AtZw} zoI#Iwbgz)2OGwryNC-9Jb8v{(69x{)F5BYxzT09Nh5~W@;&1}`Gh$;L#QGZIZH<(V zR9*SPzYpqb41FQc7Xp1{>F@>04O(k!z^* g>nh%rhWL>B2W57^JR(~pCIA2c07*qoM6N<$f{ZbFhX4Qo literal 0 HcmV?d00001 diff --git a/gfx/overworld/021.2bpp b/gfx/overworld/021.2bpp deleted file mode 100644 index 82240e622a785fdf9270f958c3f99fa094c0d4f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZ9IF-pWh6ov<8A-E1ZGcL#qA9q)cD{;)ln@ zvb}Q-SFq1_c?41dJNtJg6P%=>#|@#5ZBrbCn5eMO|c#OdDhf7Ph7U8$ zyqUicrvw6qkK+_B(F)EO%JHIbKg~9{88d;)bJn6l!2%U*qAR%dS;6<_DSQ#7kWNk1 zmj{pss2{ljlb3vJwm)jei^%gyM!8Pex8m$$Pw|F_`<#c%C}VRrWV645kE0000FaFKcL=T-Co7N!oP@*@8W&K|6Kq6Jo%&YN$!)Mf02Jhe7TjXyo9^}KL{Y?M3 zfKcYkju#O93=GW7Jp2Okl4AC1cFJ~|1_md7bO7O%nwA=-e~13rYuYQw3G(vub3*h# zvU_BA=--i=CpJHBfb3^ru&{8i_o+9qhxmYjK}P1$Kcjy=8dKOZ9_(?6&W{_J@1!Qj9F1|UH80Rsc759~Bi Ye87L`-$VO{_6Pqzs(WPj=gxx%0M0<12mk;8 diff --git a/gfx/overworld/022.png b/gfx/overworld/022.png new file mode 100644 index 0000000000000000000000000000000000000000..0d8be19ec084c7574740f50e9ed4622f57dadb88 GIT binary patch literal 293 zcmV+=0owkFP)b;z6o&sMSn7ae36wj~Oxz${I-AOVNIgJ%jugSdl8H*)2veF_`vs?cojE6juE8iald|GAjb)A9J zioyGsanE-oGB|GL2F=^MScoq8+n%3HocNZb8y|BkXqB9)M79+0wKV7!8$l_S?nwzI zrJxr09~pVDGT=#R#P@jZV@8{Kjpq45zM*CoEs^dQ&A)m0Rd(xpd9{6_^*NfOt*E@d r_@xk>E$GhX>@m$ju=b$&)e@_=}Y_dq8gta z4R&dG5^fRVlO4yIKIJ#E^h;BSSbQXjw(KK%o(43cx7X=V^|suobZN`pch#m5!SsOc zd)Ozcm$txiA@#2;7OHQx42VqP61USOJr6S$@kjAFeZSY`p%7WW+p!_EkckWkbxjkP zC&deQ`7Gf@z!(5(K_dWQU677yK^*!7SrAs^S}-qjq3XJC1a;pC(&0)F^alt5P_1D1qEO37Wy9!iTnFd}}*IR@n@4(3{M6fI)GLLm-<9j#M~(EA3RI+ap< z1Rp?3h7JyWf>OkxqeGAkAsnu~(V_Hw^LO}u7)x?YQAv(8M#f#CXqppCbb9a%t2Z}n z*PBD*o|Ll0pv}=a2?SORHv!8ZaM^193f(ToVcyS_RZ^pEnj)q-uuh%cRD~4Fu^LqA zH7$`esn81b`c?MAmhb^S=3`!85aLRbbm-ONO<&LJc}<%+Dzv9j<|WAV^!||~hk1k@ zQ5J+CYun>Rgl`m`iDjAyVH}bpN`{<~=7TXn$TT&+fd7Eu+lxFQI4 zoeT8u?` fw!1!9bJIqUP_krCk)+T%=w4dmMcnbj%+a)8{A!(> diff --git a/gfx/overworld/024.png b/gfx/overworld/024.png new file mode 100644 index 0000000000000000000000000000000000000000..c4e721b7527fcc488a987ff4a5b81cce536013a2 GIT binary patch literal 350 zcmV-k0iphhP)i>0JEpW&R(a8?UR;pt3J)LBg(k)+Ml zMN2^`L211PYRAho^DKCG58xRKfUy7=3!XJNt-+}jcsc{GDe%twc0VV)RRF3ifbyVp zT+ z=ieu}Pd0yk{5bKWpnw;mA1G^YUmu?z57iHp{qyJFuW!HX&Fn48{R`sZ`g8usy!*uW z3#OlqjUNc)#pMO1MZ_iKWiDI*+yCbe&;%fuAuqtq!_Uvn$Ir*k&ce>j{A0!kg9i^5 zBs@qsa6sX~fddQ-P!~Xbz`%g&gZ!}ig1Sh1d!QlwocwHT-?BhH`18c($&Vim4Gchl z>I1lbs1NevK|T0o4ccG7uj~%B$Oh!tcin Phz~v(yx4K#hk*eAjM1vG diff --git a/gfx/overworld/025.png b/gfx/overworld/025.png new file mode 100644 index 0000000000000000000000000000000000000000..f9f8ec431c7f4e583c47d135df939cfc706d5e2f GIT binary patch literal 276 zcmV+v0qg#WP)?r~wL{GE!3*(GR5K$Dj z_;|bQe#~1?b40K}aEIw`6|B~rl1!n@k{(V`w1ClC!3>rPXCTGdpQSMFSUuj3-2mhi zgjXM+o>B?04`5#uv2U2OFRY~~=kwls-=WEnvm5MMe7PWz?Ml$-Gc<$Rd%5f|T02I4 z!zdKvIAs_~yzp!3LQ0oX+MphT+)4bH#S3IK`r!Ls+J@}2e&zEalUBa}N?VW9CG1rH aXXpw=__qeXwFv|O0000Vi?Gm@oyDhU**Y@h|hD$R!v#i*TO^gVCv|L?i--ga5ZQD}6zr4%$ zhVg&Z(?ijg;T-!@%kI=%J+oq-%*O?*)@D6&U}Zj^?Y)<=`fGXI-khvBkV`#X{an^L HB{Ts5eOpzW literal 0 HcmV?d00001 diff --git a/gfx/overworld/027.2bpp b/gfx/overworld/027.2bpp deleted file mode 100644 index 9381d755554ff2c9d55c283e749e253d837a89cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmWd@*0EQxH?()J)3>M($PYVkz~BSN50*bIf4o>Faue3Li7n2u&>2LY-q~?pv4+(hzZXS7Yc|m@DHg#GVfI6J+UQm`tckcBZOfud~H;RqB+ z!SHTzRQT<4;uDO5-Z}O;S4%@-m~T2Vzt{Gv0G7lgni z1gC;wS}9qT`Qaa-m4vqF{iH=KO^bw*L9h_nZQq}vuk#K2b_@2I@5g-iLmwpco`1gN kx$?8cRW40mP{>8HKP+O&qzhL;WdHyG07*qoM6N<$f~6^bW&i*H literal 0 HcmV?d00001 diff --git a/gfx/overworld/028.2bpp b/gfx/overworld/028.2bpp deleted file mode 100644 index f5450a0f142af2c18a4f144b207f5cbb4aebb940..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZQ(=HVBRmk?L7Rkb&_(YHEqz~BSN4~Z8pdzSopWAi1(zewLgUff1qM4FG2lb?<4 zliwGaA1`d4Xxu26FyTW&0y9{@fV_selC6Qgf;~h(#}AP=E_-5hT*RV&{&-72^ z52k)CTMc^~b2)K&QILL+?JPjONB%sslNaFTWoKt)XJKb%0%GPzb}WB7eta-^u;74$ z!+`?_7#JWffcb!d0o4ckRuCV6+z-5I w9SjUCe;_^p`Cs7y!hVwLkQascKw4JaMp&MY@0lIU2QPM<_+elG0I>#xZU6uP diff --git a/gfx/overworld/028.png b/gfx/overworld/028.png new file mode 100644 index 0000000000000000000000000000000000000000..8b9857a858797eec93af0e6cd8d0f76c13c1efc0 GIT binary patch literal 274 zcmV+t0qy>YP)s9CsW--n0>4*AA!Mra&C-9c1y8;k=qwkaC_u z2cHDGUB>aq_~lu|dgd-@@SdLc^t`8+zCYqwwZ2tL34|3xmI-6sj38f40qyZk4=I)J zEx(=K80X4v?n?3CpQEMBt>1@vEmQP{cjstnZ11z}JrqX$)$f7P(&OluzwkCmD7S+C Y0Jb{Y=?#<&vj6}907*qoM6N<$g0q!$dwA=rWYUK(08!9GEbnb z#UXis6pKZ&9^!OXQvAXW;|x-|UC#D3%7JA49%a0ETAiTuXl zWFE>PLsStrEqC^=YY7yHwHLWi8a1EB0v~&O)EO)+D-DmZ}E+R5W5D@`!_i0tJL%5 OP)8Q|i(jZ9isL`xyTz*bDScq>T_ya09#Uo*6 zzL}RGMU{|%3L~IIG~#-$(Yw-MXxa|fwmBkt&qPsc3_yorap-`e2C&=%L3)!4M7{H3 z<~=0W^?*UN6OFNS)l1?TuRLU)79OOSP%Bp_(pnB`P89E0x3ZKluh@3hBBWfVJO!ad zO<{aqQcOoz(s|RGyXoM)K`*8m7Fg`KTCtO7+Hyunzj)tFqjZ^PB#}kD$!hA!`_DAQ lG`E^kN^P9-i>eo diff --git a/gfx/overworld/030.png b/gfx/overworld/030.png new file mode 100644 index 0000000000000000000000000000000000000000..ae165c7ab223e92d4915428e8a3bdff49c87a2ab GIT binary patch literal 277 zcmV+w0qXvVP)X(Y$6Oq1S9TnKSa5m7-sO-#KoPKa6vzP9+; zg_&=67M$A*Zmk)HNTFEPV_e;IgsU%cUL^s}n<&76sEyoP*th^17iXrCTVoprP%vXl zfg71nFCI~hBHRj^ti&SAlRN+di9no~I8i}a zDGPAb|6YG(jB|hpRui!ibFs{GM5494mhvnknZSUzLYPf_7($CX4(+gar*T=(hatNn-41m+JJOPkro`qv6o04x~JfQT!iA%E2vYBQ3vl6ItPBgh=M2%#SmU7O&;7ycevROG$+;Y}V|lKAGJ jzrE>0XC=Knehymh$M?Z$L+E}Y00000NkvXXu0mjfP>*E$ literal 0 HcmV?d00001 diff --git a/gfx/overworld/032.2bpp b/gfx/overworld/032.2bpp deleted file mode 100644 index db7652bbd94a67ab95e2c1487ee9df3d10d58ff5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+Av1-FG6h#Fo5iOC_l7a#;dD*&j@X(ylHT{kUsE?`qh=cBpaQLb#<+674g=&f#<^0U;bHlx7Z8;t zBDrA$-6y!e6A%VS#rX}NOxyy|+OS+2ujtY6R)lvj?eRGHeZk<< o^PwP1#)8&w{7^tP(H1Pb0>-WjAi5MhnK?-5PF+Ec^b2wP4_1z<6951J diff --git a/gfx/overworld/032.png b/gfx/overworld/032.png new file mode 100644 index 0000000000000000000000000000000000000000..8afd066bd4969ea69b21e425f1eb828593f20181 GIT binary patch literal 253 zcmVEH;83hz8g&G_Z9|6s18|7Asuy{0O_Q3}k*_IB^(GvIsIs1p;32eWGcIkqpQk4<_S|r`x~qa# zpH?Rx{9n3t)fav6{a(6Nm6fM&R66*!bS${N%&wI?v}|~D#N|an`Xyet>|y!C^bZ8(1-W_I*jdw>z<~n{3@{f!e89i}a{|pu&kxei@(1FBh!+JPK)PZ2VLpK9NBBTq6y^hv|Jm7@{vmt-3O@iT=f{-nK5c2gBwwVJ5dfBhY4(Vl;Bom3F;zq!Q+)wf#c#H#yRTY!GN7W1fC}- zOF@h8i7U|_HeHJJ)zjO#zKe|_m$8ZXfOo!yObk+)^+ix^Np{&Nc8a5{%l%FSKKlY2 zit4g%1U70aIru-c)zFps;QJ=DKh?advZ|`M#rJb)tegKkmHYsztl1V|Hkx7p0000< KMNUMnLSTaN@^4ZA literal 0 HcmV?d00001 diff --git a/gfx/overworld/034.2bpp b/gfx/overworld/034.2bpp deleted file mode 100644 index ae075c338fbf1c46696ab2f2b989a99c82819987..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+i3Quz!f#;JT?$Y$oM_Vhb_X GjQs))!L%a) diff --git a/gfx/overworld/034.png b/gfx/overworld/034.png new file mode 100644 index 0000000000000000000000000000000000000000..ffd94f410649464273bf5d2c4474800a67c4fb26 GIT binary patch literal 286 zcmV+(0pb3MP)y{P6P*L`|Lr1D#Sk6| zdH>7%;Lm}F2W9A3Ee31)-2m&IO|zW@LL07*qoM6N<$f+&u4ng9R* literal 0 HcmV?d00001 diff --git a/gfx/overworld/035.2bpp b/gfx/overworld/035.2bpp deleted file mode 100644 index 17c6687a566223ad3c66403e39a6a488b28e4f56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+Aze~eF6o4Dzy=;O5_6ETjjMHh}@%thc_627}#yn3^(ptVy+Ok1X0qKXm?$8#Jwpb z{v$WIn24jfuW1HpIOjLF_jR}FLNyHiQ6sh{t3vWDV0+!jVw_7zK0@BaxZ9$XMgwm^ zX%HZ!D2oLMQMy<_bfTZu!A<7p{`QvzjQbWRaub7cnOZ1K*-DV Pefo73P}*X>kVVlir;ClZ diff --git a/gfx/overworld/035.png b/gfx/overworld/035.png new file mode 100644 index 0000000000000000000000000000000000000000..53bf81b137d52b84ff8fdac7e64152c138d5bd8c GIT binary patch literal 349 zcmV-j0iyniP)1Y1|Gx z|5p^c5e(sj37L=gJxFZ@QeF`z5ro$xi_LVLVsmp!^j9gua$$dPac9xYTOQ3~=@AZx z7SdnwF8IoNO$7D5tMA~6zVVd4QI_r^8&T>Eea6uT(AR$c!&eSyF%$k*+YdB1-QcDTq^EYj+f9M0ch>9s_hVJ{+?1|LA%f4Loo@jv;M+6T~{7{Q9;_ z{7~QVkiPSRKEuj7H-yVInh5(jRmO?>be)$T(&8osk=^x`16|HF_fljp8a>nKM57ap vt~9#R=t`r%Akhi0^}L|&&50=1-aYvS6s*-+$f(h$00000NkvXXu0mjf19O=& literal 0 HcmV?d00001 diff --git a/gfx/overworld/036.2bpp b/gfx/overworld/036.2bpp deleted file mode 100644 index 6edb8a30526158be8a1d7ed09767e3f45ee76eec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZvYEe^s!5JopF{UZ(A0D-zmFyN>MG6sR<2t5Kv;Q)v|2x28iKvq;BS0Gl5VA>^3 zA&i^Myv+AT2qC0Y3b=5O1-HT&YaJKeD8(gA#tF|>IjAHI>EMp%3(xA@*-KeA`yG#n zP2cfEgd3QuxW~WT-DdxIhPROY@-Ty$ilZn9+yS!rXM{a%8-@4Eyy zEItMcl}1D6Q*ZEiat`aadwiR}Z@{V80M`JqYW<14!E;wT_sus3KlceTZ@?d(t5Fc} NOIm}fvL}1e`VC%^jw%2E diff --git a/gfx/overworld/036.png b/gfx/overworld/036.png new file mode 100644 index 0000000000000000000000000000000000000000..e1306b6a0223905b261d9eddbad0968ea4100d03 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=1SA-$xwhT~Qd>M-978H@CI8@O;SqSmY(F7^ zVUax#&o>~uoyq=id+6#Pl6JbUUZwxoyyEn{hx^mmLQXDcQ(G`2gCoGlnR&(c4~a7Z zEzTw=7%aQ@@95f!!UC@!-{td9v?TJba*7( zVX=_Mm?2T_<-EKE=1n^s^6ZW>T>3rV;`4@zU&2Q&`#3CiY5vvtk9F1W`WXu^VTUF-k= literal 0 HcmV?d00001 diff --git a/gfx/overworld/037.2bpp b/gfx/overworld/037.2bpp deleted file mode 100644 index 597f0e4ba3ef67e2807f984cec56913b3d964de3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+

D%K41nQNPf0o{ilePkZcSwQ!K>Pz7W?>R~#&B z47RP7@lO4Iy>gWDfN@NlK1qTwX!Tl`MLG9iB3$3)V8a*&gP$CIb(|bI#(2OeVyu4O z6Sp3m!>H-C)=uWY*=dh4YUYGhx9XuUrMx#s?)Pa*Nb3hiKuEKp5`=3peVz&Ta%d0x zeL{+bT5diN<$EN*&4x~I1fAXp!eH)+$G6pHB?P6WFS9@WkSpK#>%J>!_mu!fwE*Bw PfbnNeEx?`n%oXSV^bE6; diff --git a/gfx/overworld/038.png b/gfx/overworld/038.png new file mode 100644 index 0000000000000000000000000000000000000000..5c0d339396a762b57f673144c8e02624f9070b20 GIT binary patch literal 281 zcmV+!0p|XRP)v^#7}86tsNNOZttCIo%R!HGY_75E z%3yLonht+jI?k4LH>9T8lb)O!l=;>Bva}(Nn<)ohSPrB4`Edu_djDHGQ96#J fQXh->Y?Au~z`41-G|HtB00000NkvXXu0mjfj!Au( literal 0 HcmV?d00001 diff --git a/gfx/overworld/039.2bpp b/gfx/overworld/039.2bpp deleted file mode 100644 index 4e8485fc2f2436b8cb66b0eef497156ce30257b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+AF;2rk5Jgv6ku?IcR)}PzSQ#lzLIb8UC~<}&1;?<&0g|4=S4c_66*vHe%M=up zDJZs}aACn#$x4iDc4ZLC|HV{KGjBMT9k4-+6CC3(&-K#S5S1^~qd9athY;ZC6pp2o z?Y6mFu1rB6YZGa$)0DSPWFPu4LDwnfx6gWGHs+mNrv!oYFm}Ax@P+oNbiCj2TuQe; z#w5lo=+W!8`mUSq>iP+K(i1|odF#Lq&Z~irluFgxa;23GV|>qmv3&y^LU(q9BLHV0 z1kL{p%vx(^^KXz~f|ma^DD9ag&CnS@Fu4rD`G;hzfhkOJW*S}y_q{AzWDkq%o-y-S i(zbHl)n7H9;~0FaeiQ~$4hA)TUZ^zBmAbZHj-nrPhp7($ diff --git a/gfx/overworld/039.png b/gfx/overworld/039.png new file mode 100644 index 0000000000000000000000000000000000000000..762108ad536e28f0724504bd7f23a9394ee59b27 GIT binary patch literal 305 zcmV-10nYx3P)cInJw#Xrd}LTJ4Y6`YxKW9RMAb?g(sW&ifj;k=MSWsQP+H1R z+sBXbVJJ}f()GQFJ;Y^4cFuhjM#IZpmC}rE@6+-9O{2zs4L3th{qs#xM96WZ9;m9azxV#Vrf8 zjv^M&%X@)*f9jKf4XIB8Hn3?7hvwkN&!#3USF`9>-}i3{xK9E^7DUsZpy2T04&PAMnw>G9#A0NRsB@k_@Z^d{c9;mSFEV+?D>0Xf-Be;VRixoS zlh&mGwvAksd&?o$w`ipxfF#5H(q9ycjd@Z(((S3$Iq$#pHFN43`YhdN{gZDF|J(1n hw7!()hIE<3WB1t}q`Y0ss+s@*002ovPDHLkV1gOZff)b* literal 0 HcmV?d00001 diff --git a/gfx/overworld/041.2bpp b/gfx/overworld/041.2bpp deleted file mode 100644 index 00886ad6278d2907438b9c508b27221e6d922589..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZQ(=HVBR*D%+!FR$(YG5^s_uu%z0Sp0z{V*Ru>__+j=qI=jK=v#BL-xUg2LKX(nzsM| diff --git a/gfx/overworld/041.png b/gfx/overworld/041.png new file mode 100644 index 0000000000000000000000000000000000000000..af5a7e7e767af7cff15977518c236f76bfd71ad9 GIT binary patch literal 263 zcmV+i0r>ujP)(XKjr3xYB5QiAJ>?51^vbU^pp;sL%TxO;iSO+kTA4Zgzl6{TQUo8=z{y z@!?skUud=7u%`@r%CKi`jy79pI6q}?+h;HI=$E%*FWIm+7Iezt3d4npEQh>>65J@mMP z58z39^dKXYGD7(gOeT{qIpp;HC7(DBW1Iu{aOcm)Vv=Q2DutNhG+j6J2(E^=B6tY^ zdi?a*b@Bdnu8Xe%v9CVAqli-5+X(<7jDtM4y`6xlt5xA&!ypbt*ayx}OrL(>U{&d= zhe{>?J%9)29`Eo@y+>3DZ#P?%I%Xa0@0nA!WhAA%G+UnKSw@Ic6NoV(b%AcoCgSn^ z0e~@=9X2UlkE{SowR~PK7R0Pw0U`Al=qe80p2XBMdd6C&UlkicF*HA5Z{PM?!ETRe XOdA2`Hy20Tbye~wP)Rv2f4bdY&i}J# diff --git a/gfx/overworld/042.png b/gfx/overworld/042.png new file mode 100644 index 0000000000000000000000000000000000000000..6866c7b307b5c320c3d5f09bbfd018a2823be725 GIT binary patch literal 293 zcmV+=0owkFP)?lz51KmOm_ixc>3|Qu}3PZf{c_Ul$3} zAM@sq&AVT9vtat!**SprYuKCEYnjW7%8MZEzx3~y-Yq?O0d5|4c4i=8We3rJcz#%X z`0&912tPb{aNqy~1H=U|A22W=OaS>HKM3Rldwp49IbmL228M55Kp#x`@#DjUf)5vf zCcyN=d;rrA^Fc~H*a!YK{`U6F%nS@_zvABgvwHK#;>QQ5epDa8^n*eWZq}7=<4pEKwy(4J=(*;1u>kSA!~_APWb{P_b0pfI^fZr(j?poW^9fskShX?EZMB1LD+ZmG3=_~{O3My93>l0k zIE?T(tltyrj;EBo#h?`Nlp6aeUtnI_ zElhQ!IGq^mQ$w{LPNP|3aNpiv)ac=_qu+1=$m)<#<6ThqVeL@<54>MS`)+iMNqBV0 uAm`Bd(EZB$-)Mt`_VzRE_a;#5Ximt;X8-1nJauHA%O?DRIDL>wc} z*7%L9wcSrs$KJ4@=eq(W)w$T4H+L}wzbV*O@+Li2QG}s( MwYKA{DzAw1e@eET=>Px# diff --git a/gfx/overworld/044.png b/gfx/overworld/044.png new file mode 100644 index 0000000000000000000000000000000000000000..fea7979d32cb4ce477d97d7620cbe2f78ee69e73 GIT binary patch literal 289 zcmV++0p9+JP)R5B2)RU#kcGtFI;RM!7MomQ&}Mw6NFzv2W2^_>{<9{qxCol! zXEHp#c|Wv^6q-7P7s+rHG3Z1hTtwFBo91}G>leEt5*sJ@bm{kfWT;L#hH}X$&N+P4 zWq9-edH_9u9x!>SqgT)9iA>&h``^0;uXh2Z=fxUEZN^jMTAmoXlJGbfl)c4B{KHy^so13 nX-1NcOP;H`!0?3v-l+KjyeZeoY4Kti00000NkvXXu0mjfg>8Z; literal 0 HcmV?d00001 diff --git a/gfx/overworld/045.2bpp b/gfx/overworld/045.2bpp deleted file mode 100644 index 1f6239516..000000000 --- a/gfx/overworld/045.2bpp +++ /dev/null @@ -1 +0,0 @@ -;>?8|HH ?/?(?<p<8;?=?px?/_X~~>?=3 xp;>?8|HH ?/?(?<p<8;?=?px?/_X~x>?=3  xp|| \ No newline at end of file diff --git a/gfx/overworld/045.png b/gfx/overworld/045.png new file mode 100644 index 0000000000000000000000000000000000000000..aa1fbc06fa399fea1ca8dab7bd5918bc9464d0f0 GIT binary patch literal 264 zcmV+j0r&oiP)z*rC=Mb$P3RnWzGtk?icmgi`}a#f zP@5A7d_}+_*2*GG_Zp${8u8TF1X^#0oy#nG;DEmJ2ZYIycax({g5*;*?+U}uOu;@= zu&*$@Q?*S3s{HH7r|J%rxL3YJo4Fiuym8pR(fgh{npz_+j^xzOUJkhxc32<39<;DsnoXs O0000ZPmoAfQq&QRCNxhA;A-cCT?!rtD# zre{mcA-hv{e`+{>$o%>9hnbn5M?_j&0;oR#2ptX__+X%M{PF^Va(0ULI`+o)Iw1WO9X~jZ*tFC<`ST@4-NIVM zN>yH*haUvk*}uqS{MhkB=EaI3=F6~$PcqK^sREQF}9JHlaZH~ z|CUwLvnlS8-5Hx76+eD300F8GK>Cq=Q15{7fgDi(KPH$DO3py^v$IPAU9W6Y>r@|6 zpU%M0(C{GPgTM!YjtY(+Cw|mN_!pFUmUUtP)p?Yd4kz}8uNCGuav*|f7 zPMTBkRQK@j3^V`7{2(I;boEGR!d#+xevqiOR@le!5S8n0@e{`jm^>7yM{9*LNPQGR z>cI3Ofo3+7FgH^H0|<1y{)Rf#5!&&z9(Gb`y@kP?{zGp;`Gc=~b8d(r%zZ3C7g1$-p!_$PiiD|9(p`zXDH z?+a4CuNSey1`Ftf_wUdOjdjY~Nk$D`iKAwOI$){3RucO$=lG87wz`!lbs|wMFM0Yj k;pOQI+u$<5;+Akhzu5}X7}-+1_y7O^07*qoM6N<$f*wSfO8@`> literal 0 HcmV?d00001 diff --git a/gfx/overworld/047.2bpp b/gfx/overworld/047.2bpp deleted file mode 100644 index 7b563b1c787e8df3df58c7aaf8c4ad3d11659d13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZQ(=I0TYkQcO7E04$zs1G`D;Df=7h#wt$Qr<~@D)PCal+!m2WF^#eWUu6`lS3quzraj9bbI@sr_^N)@N@JU*TULS8Q)2 zCo3V(&i;qzm)xg+Rp!ty44 z>)LasKA_&g&d^p_PF`M6Mwp-fhsF<$4;KnPRGj#6!r%i)KgUYKa<{XWl$R6a<78+55b$8Z2cYYL?*GB@OB~&a&54@e;#7qD_Zyv>0+MQ7MzHJiz0>DRzJoJ zh~cg;6jqmGQ-ufbZ(i}u`^;>by~*rZ4RVTxQAJy<*$`8F}y9 zMDegP28zfltZ(p$x-DMmo%q26d7_QjiyU{T_YV9yVoiRQo1smRfq-RkS zSJDpH_@;rU{@?{^5lW{Lq&1~=khVcO{gIxc7Nfi)d1<2#++m+>>-k9JzvM0C(O@D? z1zmd^Lgz(@8-u0{JamY1)Z)7*Ho3LxUWfu*-O+j2AN&_bfz!`KaTJ^Y0000CWX~6w ze_sFm>L&gB#KQwt3M2&J`WYA`fDoi#1gKxZUctT~zQW($ygmY?pXCqBAHH95pZ>i0 zCxxv4F!K?h{XG0I^F9Feg4D{3#|y}d0HK7vioLpo1k0b6KTrPrnDIg2fx>|U5Y-Mq z3gUVpxceVG5ct6L!{Z0k^-gw%5cfk}?^M%MFyX-ikp2W9gy;{D2l=0YfeDB~`Z<0e zyPuzfot=RJyZf1$Q`j?ruIJ|l>1SYoxxVQiKZiaSKNmj-3p+D2Naj%8r@B8rKR7-V Le31p=5Ji7tQmfkDu^LBLNTDi_P6T`J5ORub((Ey$MsbrPL|_a;SCPR|S_x17Shi7u z@Zpdq`O$LdPi(mhLgWh%-K20 z1>Zg+Tp;MQugj~7*|)U(jXTcEzee%xrzh3X@^zj@ok*Io4$^_7CYa>-X! zYgMh!sxmbTuDvhN%^ath*OV21W8-vVuDb`Uf+UeMyXgjHMlfG$t$=>5rl3|?I1X|PF4u*f#Bo^aPzAi zo%{$HL^2eoQiDoJ!{h2*gY^HVgZF>;(==T_*EP*BEz5Nw;QTXAlPDU*-$|BX2>!G; z?15LUK)roJDLSH?cCj>m!MS?t`mH&%Y}+ueR38}Qe8w3Y#EI%7z_dT?LkoPUI}Ra; zB2RN%po4SYCo){l=5LT`5<+Ra{fN4!#j+r z3tK(-qfwSc(apTjqoeebyUBH{MaZt)Rr>H*>VLz_@rCD=%dTtNr}aV)pzdw;h=tyz z&mQkwOrgJjSii0x!;p~GO6fU&V#cQX E2M$7?y#N3J diff --git a/gfx/overworld/049.png b/gfx/overworld/049.png new file mode 100644 index 0000000000000000000000000000000000000000..eed753ab20b685447f7b8075cec0bcd5668a9617 GIT binary patch literal 328 zcmV-O0k{5%P)gftvvi>#KCRfa$7Akl$~ zFYQ|M=D&qzQD}4l=ZFB!w;pbQO8(NyDzjgR-d<-(1L!l$kSC7$8nT)upK}O?CN8b!_ z|De9XrT*x?lmA}tDXtNg5tb2``_F(1ks^2u)N}f{0I5^ K`5z1p8~^}c5G-#1 diff --git a/gfx/overworld/050.png b/gfx/overworld/050.png new file mode 100644 index 0000000000000000000000000000000000000000..f53f7110547fd56f97790022528e56cc87fc1a72 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&Qgxm#jv*Ddl7IaFf4IKw|Ns6^ z%$ye)1O!ig`0sziOF?jJ*TetEdGr(}ZsqdRY1s6yfpfy7=7o_w^)83P3~P8;x@1dZ zw{|&R<@MOm#mMQZsZglEP`74a;E=J=*>K{6zz>fP9A`|*BkT+K1=u;{B-QL0?D^%- z8GYmb%l=0G**}Rt2_G057#IXBOl)|C`8jyy>mp!zb`!!G($$DSsILeE7it1dPmVto$5ug7O;n3JeSm2U?Ew zb;VzNXZ%Cth>ftGxD1y#!u~%zujGF5eUW+bL*PTg1Cad;4h{(k1?K+p3icZEK>Z*W zRYW9A_#p6N#vc~{viBS6ALtvHTR7J<)XUpX$e5Awh3A%?(?1TV`$0aIl4IlK1cUnfL5}>$dZ6<{bLR@bAYTkbOW8 zu=8@u3EC>z2Y|Q@4ICXZBKsEIN&BEt@1P!|Zy}}6FJNoz0JOiO;)B2q3!wWgE_`qR Gx*q@>6MowO diff --git a/gfx/overworld/051.png b/gfx/overworld/051.png new file mode 100644 index 0000000000000000000000000000000000000000..e6a3d7d0323132bd59ae593c55740d1befd1da4c GIT binary patch literal 443 zcmV;s0Yv_ZP)xa~a{rTyf1%GX&`T^Jvzkmg3c@`Q-6z(7JFZD`z9}<*l9AoY!eavVS zV7^5T%2rx~Ii{NUC4u!*){n)n`RK>EvvI+N#+auHw;LVC+>V}k4JD0wnCzWsyrdI_ zw?qMQ8rG0S@3%2&hc2$|-eSR%a}VS470Mbn!JWzgT%mK6UL<~=*AulBiFj=vdF&nF z=kvOc$;XC+B3$0Kdq3N~?t&*_l*FZ0;Mb+RP1gsQoqhX`zjUhcn|>(Vw8T00hT{BG l_8N-ii-${$Nx1pn?*XT->YJl_%hLb=002ovPDHLkV1oYT(oO&X literal 0 HcmV?d00001 diff --git a/gfx/overworld/052.2bpp b/gfx/overworld/052.2bpp deleted file mode 100644 index 2bc8793abfe65cc2ad3c700ca5877eb7586085d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+AF^U3F42B;}@nl(?DHgGNSCDNMaWI{gFt);iizgUlJH=dMiaCTwu(a4CSiA#R zgkg)v5W?oI;EZ3okUxL^I0t|V0DRyI7a=fr&wSC;FRHzmxo#!X_$jj zme#t*2HarbeYZhcX<#zTwZD1jU$43L+fJXR_YFFcxlv!QGnIQw2i7KvRg#1<|3yR- zE%N?+Hm38B35@CdV**^@?zoQbsbZ~cdHG%QFaLzg>134W1jh6)kXEyo`_G=f;h5n6 f1JOO|`w5=)%x-i~5U-5?3l(Kl5`~Iu=JEIs;5@_G diff --git a/gfx/overworld/052.png b/gfx/overworld/052.png new file mode 100644 index 0000000000000000000000000000000000000000..43a71bd6e1f903d43c71e34331aceae1252296c1 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=1SA-$xwhT~Qu{nz978H@_4aS%JZvD~Y9ILg z*{>~mZ$fS!P)_0PPn>hkH;kjOYk_76m;Yi$mgl=SGc_h`=;AN`^}kSF^2G!OCx$y} zX3HMBblkfhajej-%6C(C^&zG+vuB)VPez_>C7eI$fST%y_wAY4Yv+U%o4D>|zN!nYlx23io@E;Noe1 vR%xPP+|B>|jvkn;i>ixTcc~3AIjg9F`jM1`pe3A2% zhE)jOpH51(KS)xg-h6FPlurY>-|$sl8_=ITfAC&O+I;4^yync+1{1Mw{520LrJpNZ iL)dO>zH6XV*Fc<}2G)MU$QrZb-*}F<$VVBT&He#Jp}3C# diff --git a/gfx/overworld/053.png b/gfx/overworld/053.png new file mode 100644 index 0000000000000000000000000000000000000000..b8714ba6f709d6df596de52c5e6cf19ec1b3276c GIT binary patch literal 253 zcmVt&=OS%aSTKv1-|>( z=d9nXZjGuwrF|W-lAedXZeQNH#S9bqMU zFDlw;>TKw>+WYp6i*_1aX>_I00+h1Y3V1HRu520}@FdwU~$qYoc`bo@90gfqVU`Q!7)$FI`8-oM)3L|%fQho7IBxoF;_ zf1mFC(fJ|q!QjJ(0|yuw_>oO8U|>KofydqqY(lNQ9X~faJ2Ug2oHCFJ`~K8?xbWb? zfdlgL_6GJAKxiN@FE1i5^5DS-fgc=T_~S&yi3)KEetv#lc_Drtb{3HSmOo7Yn*JTB L`C;)O0i+)Q8f;Us diff --git a/gfx/overworld/054.png b/gfx/overworld/054.png new file mode 100644 index 0000000000000000000000000000000000000000..4cd71fcfc0e9ac676ecb4e1342dd4b62dbdaa730 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ1SA;BTlQ)JshOTGjv*DdTF-6dJ!Bxz`jFiu zOe*|kESr9!3R^+qM&=|gktxT5UDhf2J5E-+JmcSz#~ghw$3^$A`}OVsL$lgzhvdym zU(3WbxO)cH8_Ta}{G6$7sI}n8634Ql2Wcs5xWsiQ9+Wppcl=%FdR{ct?ZV&K=3b!( zl`G^Nw@p&-JiAWKn`6R}#M5iP7JU&qu!?tq$&d5dpYDJ9@$uddujKOl_M`S7$9lT@ KxvXJ+stO%FVvdeBTLt?*$llg7$w4^H)Ih3smZvJ^%m! diff --git a/gfx/overworld/055.png b/gfx/overworld/055.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c98bbefae3880e4496085288d5b8259f044e3b GIT binary patch literal 266 zcmV+l0rmcgP)_^||SG-cL zr?kG$_&I|JTD#sDlg?9!j(tiG?7Hzh^i@|%*|94Zi>e}|@d7I#WM44qm-+afvj~DP z3@Kd?o!}Soqj;ZAiJeAo1^@k4Fc3XfJ}`a;hns$>Yr*4chVD8c`+{cg1kkDlF=U(n Oo2RuvP4Eq|-TnjFH?D^O diff --git a/gfx/overworld/056.png b/gfx/overworld/056.png new file mode 100644 index 0000000000000000000000000000000000000000..77a5fb91448491f48910f948b9e5ce345ee78986 GIT binary patch literal 292 zcmV+<0o(qGP)>j6Zi;64n+1Twzy*B)2#i%`tOO5 zh=!15`I%*AzL}qex8mW!>wpXvBcU7x&C9V5qg0BovfRKbC2*5%D1qSgzOHdfiW)X4 zM4rdjNp>L%?|$G6pZ@K@71Kuv3UhYz?_mouUTXJ8tj{u%E#(WlmQD2~2a$5Mhi6|KY3Cq> z)}%YSiy`8i2f?R@m5=Z8dkL#rYatxdXC|Bjz$r9sUzuo)h(B2HLukGB^4l1~SzkY6 zQYf8Z`jBE^hq`69U$5~R-!@k$y-$>qm(rKvaG048 zVn0|42(cdsHHa31M*DnvJ?V`mN3;8BXD(plpvZG#vMQMOmjY;7!COz=#Bj_R!@>x5 kx?{N7LRU#?`~L-mtO}Sv7s#oa0t7~61>z~`Cw;TU9|cafA^-pY diff --git a/gfx/overworld/057.png b/gfx/overworld/057.png new file mode 100644 index 0000000000000000000000000000000000000000..a84a2e3716887c48f7590239d27bb933af8fa8d3 GIT binary patch literal 308 zcmV-40n7f0P)1pw7)GBFS-NOxmQHcA7+=DME+I=hSRJ}{DLF;R1)9Zsz$vIYg|nqTjl3JwUk)iL z?a&JG@q^H(_eAhI5Rg42`-0)d6?o?~?PjC+aPFDzebvxAch51mbFwnYNbAQ12V?H= z(@Nt(GpM%Uq7RBwjHfLqjxeW#2EV(~r@r)IvLJnXI`R%0-=z;xI*X9AD4o=m#ZM}sM@7Ey zv+qyR4QY98xvgJplven}jMu*U{x7{Oz${;3D$$M@@_(NNnzenU1)#1pw6o6rY3NloY4as0i6ZHUw3JN7%`sQX4WN{Bsh&C@FK0-^U4mpeuP)ZJv zL9+=#^$;{XL~N1{?vh>Kd+!&eF_%ec+(Q$7kJ{tY5DhZ(5nr$Vn@9wC)d z3W0pN-Z!hyH%z_v#?Zdc|M?moU|QzItNQcbcpK{d4L^Iv;z%Z-j0V*%7+LEQA0ZbF za>Q*WlWWcxyP~vx88hZ1XEtu*oU(V;Ruv)r3kd07u$XrRa6cYShJyhihgnzPz56ij x6l*W~yela5QUg%h`a1lC$quL9oqfN6kbZ$2oeHGPp!>gVb}H~+xZYu!9sxiqo%KhYk^@hbb*xT@GOBXKOg=BptAQ(BHj z2jfdWIZ(Ky+#eD TSv%^#00000NkvXXu0mjf!QOC4 literal 0 HcmV?d00001 diff --git a/gfx/overworld/059.2bpp b/gfx/overworld/059.2bpp deleted file mode 100644 index a4e8d6899c5d688021692b6154f45c9ebb3d12a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+9u}T9$5QY~{SfKVksgdHX=ma*1{^)5%LgugnIys zkkTTgw6Iu2!VreV-Bkkj|K;%U&lg2W0tcWl)0ev4&CAjldLqTKy|aVG5D!m}`{%li z8KeNU8s9&UX5V(eF>Mg_dXeW{5Ov2l@I=IHm%ey}&3;E;IDR|uU)-22?WW^jJuhY8 zcimM%9qRMB+YdauPyuQymQt>}u1Oh1CY|4yiOF0i#+0QH;e(Zd5LJV2t{-1=MA%Q_ zB$0A4^alLH?{qdE3zw?FKff~2SNcI;;|Zug-hS{Kx9rsJaLca?Q8CyPqH5rrf&nzJ R>HVoNDc#a16+B{A>K99PuBZS2 diff --git a/gfx/overworld/059.png b/gfx/overworld/059.png new file mode 100644 index 0000000000000000000000000000000000000000..39c44291e1901b2b473ce2ca5756eb5e38707e46 GIT binary patch literal 283 zcmV+$0p$LPP)Q+1Ail7yk#^Sm zyn`H7Mh0&x`VPss4$*ss$=VjP)*~)j{~%hc5cfxgdAk{}jpbePo?}3VTn3^ZJnOBrxqjR)U` z4ib8j(2Vel)YJ;OK65o31e)J@A44})i{K2sdLXZ8HXhWN{SGCZHrSDiAYNSFhh0bP^0k`#s0eXN%Jv|JB5ey84O)TjK)tGJ zO3Ba&ak=n#hj-v@>fyofq%JX3Ngbn~<^p|T1Z<~LxK5R@t96P)l{{kDzSa0_&R=44 zSzE&Qf~aqv)Z_u=0dB&tK){B&yRVhO3R>?&)9B)^v6T+-9_Io=ajl3)3d0F00000NkvXXu0mjf DD!G;n literal 0 HcmV?d00001 diff --git a/gfx/overworld/061.2bpp b/gfx/overworld/061.2bpp deleted file mode 100644 index 69b2e4e703ce751fba412dbeead35e5f4621cce1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZQ(=H(NYkQdN5s1K-j$PYVkU_-$Ri60zac>ZzyWBQh5Z(wg(?^o?_VJ{B^?CgJd z{>=GTbnlbQpC3T*-~lr;KM!0#(1ZgAJ{Z9D15Gfuu(zp>uZTB*>VG5i$L8KIxnDeR z{Sf=@6~IsjVgDbNKPi7i>=ooCW{m4G3cPOu@uc@ww z_@AHuAJZF|e|Gmi*?s!+2c(~!U0O!pz+R!=0SqG=8WJ8{F!&$<3WFafURcyS*csX? a%gYM_Ll5MG9~vJneE9I-!G{Sz2&4g9w4xdS diff --git a/gfx/overworld/061.png b/gfx/overworld/061.png new file mode 100644 index 0000000000000000000000000000000000000000..80223046743d433062edfa0c774a07efd5dff6a9 GIT binary patch literal 305 zcmV-10nYx3P)xQO&Z!XRxV))4gkgG1T-k8Sgk}2M_AYt?3}_4(&E#Y)RxSjjSxfv zAzXZa$urOM2PN5pa`sq|ccVuZ@pu=x#w4;v6dCZ=b+wzD0y?ql2LncM|pMX z@F{_J;laN`2Mrw-t;M0O`T2b_&qo043GeUFK|=@AR|v=b-3*Gd-+954a&c7%*cXje z*h^?sXcXfyZJyLUd!+H4C3|*ea96o;>YSoxUR6E-*6G$^nPg~;00000NkvXXu0mjf DPi=tO literal 0 HcmV?d00001 diff --git a/gfx/overworld/062.2bpp b/gfx/overworld/062.2bpp deleted file mode 100644 index b1f5b464bbb7db8430edb71864169db39e6cb8c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZQ(=HVBYP`A)GurU@s>xEYHVR z)3Yb$-=}{`g!=}1?&~<6~r~Hb@UAy8WJ8{Fqlxl@q^>Xg%2ML%r(R% l`1#pcSlF4FnVA?FKNviC@L|G_j*1f&KRyUNc)&2k0RTenNy`8L diff --git a/gfx/overworld/062.png b/gfx/overworld/062.png new file mode 100644 index 0000000000000000000000000000000000000000..d979b9a6ee319d2bba50f30440d0c02f818b4ecf GIT binary patch literal 250 zcmV5Q!4&0*Qa&w5wRDQ-0g;amlo`W$*(8d?{Ahmv?{j&3q? zd~U{_&it1FFJsQpL<~Gu9ELsDmE2iB<@ZPN1}{x5#oL5;`v3p{07*qoM6N<$f+_fE A4gdfE literal 0 HcmV?d00001 diff --git a/gfx/overworld/063.2bpp b/gfx/overworld/063.2bpp deleted file mode 100644 index e7fd2bc18d4c04e80cd828bc6d413b622fbc6a04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZwCu}Z^G6b9f6qKOpF?NDlqh4Tm&7wgbm$Xv{7rZ_s4ODWZ%dS4@yJVYNroE?0K z3>_RCLZ(AFT$(f;ZpD8--{JqIY|=$zlv>3mEDrI>TITu2hUzxBe|s=dpb+s2fM@IM zb79Lh6VZ>>2Y&QA(UI$+f^u@FCMGe7I{MKsk8EWt{>S%+*mJ#4K4I??F3!*Dc%JM? z`J5Kr{HeYg7h|G47s73@iiL1L%r_=9i}!dMAl7#s&$A)Vmf6RWzv*kc6?I&%lT#0s rj$U8PW7EF%P&NyQc*nam{pApDz^R@AZeila0*kwWg=2I?PSZFysjrx*gC^MFrTz2X zm;V(GaCnPVN#{(%P3E^5Os!H8od@ z1?@3W$<~wIJl?Cc_N513+Dt7G)U`b2ITTKND(gSP>+nsy5S O0000<8UAV literal 0 HcmV?d00001 diff --git a/gfx/overworld/064.2bpp b/gfx/overworld/064.2bpp deleted file mode 100644 index 28c141dfa5abadc8485c68c0fd885744e967c500..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZ9{F-yZh6u|L7N>6D>A{JXgd{uCBD7aKS@*p^LGF!pL?46`8)gIpB;77VQ?*@#T^E4 z5S(*Pj`%S7W=2B4i(AfF-N!O&_`>9P#c>foKX8N|o&^DYaoQBi7fw2(Hz9T&2jwCh zLAUOSbOL_IVazUvwOGrxm7mQ&bvDXIN~MGK+OirKOf0MZf|<%tKEB=~c3jW(_Sd^x+M?eCSZ3Ywk>y1N1Zyx4l3 LR0ZFhe)|1i%Jrs` diff --git a/gfx/overworld/064.png b/gfx/overworld/064.png new file mode 100644 index 0000000000000000000000000000000000000000..9aec228c52861e0de2b10d6a6d0e1a3287dd7187 GIT binary patch literal 279 zcmV+y0qFjTP)2vAxh`f49Ufh21dg1jSo-ZWIg*;UA+Y2fef!f@ dcsP^i^#iGO#?hM2E$9FM002ovPDHLkV1j>mceell literal 0 HcmV?d00001 diff --git a/gfx/overworld/065.2bpp b/gfx/overworld/065.2bpp deleted file mode 100644 index 826e6460e0ce7fc90fd74f884fb7a128a344b6f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZ9Iu?~VT5Qdu|o(82D842g+C}GlsSRa6g@DX?b5?_Re>FDU_*ujC3u|uO?MMLo) zFa3J|cK|bvl1)<)lu}Z{z@wlz zyfzd&b9p;+dCnuWZ`2D{7-Rg;V-zd_e1K`c-||w*lREeN8FLzt0b|Y&WFT@f*d_?@ z<;%L!ZSk-MQZkCeQB?F5 E22a4JHvj+t diff --git a/gfx/overworld/065.png b/gfx/overworld/065.png new file mode 100644 index 0000000000000000000000000000000000000000..0d102b04ae247442c542711203ac86f92f4ba742 GIT binary patch literal 237 zcmV`K&(00000NkvXXu0mjf9dl~U literal 0 HcmV?d00001 diff --git a/gfx/overworld/066.2bpp b/gfx/overworld/066.2bpp deleted file mode 100644 index da551977f94468f8e9b3a9f11e251a8fd32263ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+9u}Z^G6ovy95^TLmu+S7G$H4~>9TW^4$Rt==S3$@tgm&qm-qlCQ(1+*~NFShx z_yFSI(81vnIvm2`;%Q3Ies{Rj$N4|s4wr&D7*^5|ts#6Nc5rg$Fr5ub+o z_6nh=6c45a^Xu4t95b!*+^_urP|%qkZGDeeu$3+G0+UIWX9)t-{*sfoN>vFH{rOQ3 z5klxf_rK3f1qAJm>+T6Hwsra%Trfll@K`5y5I z4wT<^U7PaYamH(2(#?GC2)hN1-xTPPp6G{bjG*J!e#uhsS;l3;o9m6=6zuxU(o`1! ToZ=xUMa8DT7%JAYZ;qm0LVKet diff --git a/gfx/overworld/066.png b/gfx/overworld/066.png new file mode 100644 index 0000000000000000000000000000000000000000..f62252038f62a5fa5edfb8103342f7ac2a4d7013 GIT binary patch literal 285 zcmV+&0pk9NP)!Hs z^Jd<{0S-1vq9+bH0YotAP(fE!faa2wFqcfhu8tG{g=Ts#(fBh8-kw4_jNnGK!>6C1 z?P#F^`T=Y!=B&*N*5XM3og@LwBv#$M>!87j6*jdh6`S8yJ89)dvv$2p`n@*Vk8v+gnJ=LG^$7^XJZ+e?s$$Z2o|3hv|p;0Hz=2 j1E8P4K9G?%*AbTI{m=V?AMIe1JC;q z!9o(JxG;0yJM->?_^Ci_B}lb(NEIcPGlMuQ4Z<*F7>{j-cx(+)-q7984aU6bFkZdV z0BG#z4l?yb{o>W`TVh?4w|FNHAP@Lyd%JY_Soa0O?vNqaDm%xsJEH8P0xauVEpAsd zhMskcC+)bP#0SclsVLz3UJXOx!GA-04IT2v=u|Hda9o*eDa(ygf)n{vm0%QthU3P1LN^^95N~SJkxz^Z5MbnIE=xQ~Hm?2R_Vy=%2B|w&jO} n)GL0)e=HrhjQ>2h{~*us`n&x7_UCJ>LAH3h`njxgN@xNA)sZ(; literal 0 HcmV?d00001 diff --git a/gfx/overworld/069.2bpp b/gfx/overworld/069.2bpp deleted file mode 100644 index 8b5d0dc340eeb0cfb61119c041aa0eb9fe1546ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmd<*mzR^1mykENx3@2ksCWDDq2foy4~ZXd{`~p#PU>HhouRE&y-&T5y_LMMygVOY zP0yZ~e@6d|{>1z^@#9B90YASy7#INc7sMC%fB5hN40wS0`F`Dbf_+|<;|Sw42`#y96M@&c-Y3>+{^(9P>?Yu>{$qpkJ{y6T rbt-389&ocgys3K1r8S(_h zF@r;f4pK6NP|8vM943vSdi(eHzmF^vLMhmA!3OM(d2yWQoTG`VXo&|gfsS?Dh0tZU z04KVp;bS|sV)7jX@}@5rfceZF4eP#KK(Q9ZYSHc8^q>9E1)I{U&!*AaY;6^2 za=z^W;F2Ctlj_?Z5hIMKN%jb7Yow(pyF0SX!#qgS&mbS9>1i6rl2reoT(B#FB>f5y z%}T&L=)8Nce!oYw{kEcrNhRRind4cKNag!4X!=Gl8nP#Le+ASaL@oQ(0zc6CS~_!X hSJ#`q5&Z2d0o7{(HLuT)sH$SL5#)TloW5j+@dNt}uonOT diff --git a/gfx/overworld/071.png b/gfx/overworld/071.png new file mode 100644 index 0000000000000000000000000000000000000000..a1f74da03e4df89499a61a262ab52972ebceddc7 GIT binary patch literal 295 zcmV+?0oeYDP) z5Pp#4<@fjyoC*lw_CN-wYXxVFf;A?FElVOvVz{zY@ach(^+=&z{8VUlUBLl-xXdzy zNki3tUniA_1!A;7gt=R2o6FBnm-P@P{rWJR#;s z;^Ra#a=d;2sknNisw?js+RD&&ExB}eMi~DRt9Q0Fq2D(+bW>~IMOU`v(=)slAFfn= tieSk1($FJ@qa?$9lWgJhuPuV|*#rHvx)oxQ=F?M5kC$?&!gTq|L(s3A!NE9_V5WI5k02~V;(n!DFOgn9?0Y<%CCR! zzVG{4h+EikmUezS{e0-Ylmqc0(iHvqV{%5aUe?k628K{p<$}b$!Tf3dm{PpxQy!S(-%f_psWTof=`g75zVU6G!{ diff --git a/gfx/overworld/072.png b/gfx/overworld/072.png new file mode 100644 index 0000000000000000000000000000000000000000..b4d3b5f2a95a703dc48ceb5fceb724857ec45bf1 GIT binary patch literal 307 zcmV-30nGl1P)xGj36EpswP0mt>#*f@id_+EK_-!X6e1D znLC%XDW9zJpunoQEF_!`<@mVO(pu={%%hdG)+8Elmc69eqQaS(RYTdokhjKIV?DWL zIgZ79^xcrO_U`xdc9O_!rwFz@OJ0YOMmM=)na4jihhJX!@Bb*JOk`y8rsS07nPQh7 spT`fBTGDFXMu@Hv<&-wa>9{!8Uz+W(zc0nHIRF3v07*qoM6N<$f<3vUOaK4? literal 0 HcmV?d00001 diff --git a/gfx/overworld/074.2bpp b/gfx/overworld/074.2bpp deleted file mode 100644 index 2407b11dfcd1398578035e8431f465dc0037d5f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZQ(=HVBRSFzW(t`DdWtB*f$z~BSN50yV(?)>BWm-X+Ly_uY(y?vc$wU52Mq&Oen zpPY&rfBw`>x@Yv~&x{uZ11@RUBdEpTK96wn8@cokeRQAf=(B7s#xZcCw zLR=oKzvqw5zf=E&{>Z%efzS`KUtU07MqVDF|Hz*wd!Fo(m*MB&=jZ3*=VE7PV`XMO zQSqVR!-Wq49|9gcP*M8b@Tpx z0=mEkq#LFm<^!01m=E&8?G5W=>Vxeq`1yH&`paJZf%yPMKg<|A%-jkjX|6tTh7?SrMWtO{rEp6y-;5z8VP?6Df?j_2oiFXaOZ!+_5PkRO qeE%w)a9J%3J|7kwY*r;i2lEA>g~)0#X z%g9{$!}YK8zu!NJA0~f}{IRg$;gJ`X5f+eFuurN#x4+>(14BbY#gCdJH7yn=1U@J{ zs42J8l$U2_VrF7w1Yv^@9zWXt9j#wkKkt*wp9c>Z7+@{{`QQOqKf(v>|L6Ye{~caq zY;SG>asSTxkN02Mo%!=Z;)lhD4-7y6(+~2&!+#+AA^Jf+Xs@61zx#h+y^+0vJ;eQ% z|1bXU`see9|BhMHBX_5)L?NvhM34(U}ELd99M6${(vDd z5x1DkWM;peZxOr+*fbv_e4Rh9P>amr)7)Tt{gh!VlEJqZEc=}dpX1jHC>twmrt1j) z>Ya`5GDH1v#%oDs@F%Y*%>lJ7O7ddMvezO{ggmFo%Tw~SVp!+HJTD|Bd`L(DsR!w=&$Bg_7qC?Z@j?3kmF+q6gJaJTdzCWJyQ^xm^i0L2 z!TMG5ChZR07gn<7#SNH#K0aAtdo_Ivc>#G5kp7yQKY#x8{NQ*Y@rOlT!PeMb!CnDm zKMy}M^FOx#s{fb%PyNdOO3vobfde4*$UcDZ5k9C-xxb*?Gd=-mf}Nl|AKyQ<->mN@ z{Q~;q2S>sOh-zdXAoN3gP@8;zNttJCmaUeaJxKq)W4~4NChZE_6H>9{#t)c&gbyGh g2p`Cczp-P>P(!c0pxn z`O7L2px`a0+c*CYEFb)+l*MxN+(&uv5TklIS7_hD2u+%2Xhbq>ZjWD~MGQ)j7`4a+ z+Sz*qJ025Qt+v!3uQ#Vx1oTAc6+!0F&2&mn8+zK%yPwdz8UEw-mjntZG>cH74oS7b ze4rm*XX!G{V_)^V^jhT6-=OZfy;mnLknQq* zmoAHdUYZ+UdaVsTZRqVyp6KmIyS@**)*9 P00000NkvXXu0mjfrk#y0 literal 0 HcmV?d00001 diff --git a/gfx/overworld/077.2bpp b/gfx/overworld/077.2bpp deleted file mode 100644 index d74e9980d71ac3024feb565914c2fa023d5c1ab2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmX}mKS;ws7>D66N&iV>FX~{GU?Ls56dD{fU}!QpI0#wYjGH)R>)69Zw+JG-*;QQJ z9GjtoZbfjf&_SW%B?OEm2Jaf}{nqd09suA3Ay>?mMKp(m3V=_aI#dT5IVToDD~iE zB#-1rooIO4BP1z}?S|=e2EC)ULwp}&%V+ENHz!8DRa>hm3uRFdc-o^MKFuX(u}d(f ze*^cY-?MK&FH-Lt<4nI1UVc4wf*X(6uBo9C)AKy=0SYULNF=7WEU;M5^t<-m$JNA3 zSkLr};mgDOL13Q7w!5XzdU#dB%2=ND@UK7YJok>3^^AXzdr0qIhZ27)&cJ9KVLa`0zVTyhhg3Ob1t_jC}Na~FZujv2fFZ=p#= zms5`KQB(ZEZ+NEjJ$&zbpgGW6hgcgd6XNQOup+{BiFl~74T3S0lp$&yaZ*+ zSp8#hg7S{pnj*bLBjXj_ESfhpX8-^I07*qoM6N<$f+z2t AhyVZp literal 0 HcmV?d00001 diff --git a/gfx/overworld/078.2bpp b/gfx/overworld/078.2bpp deleted file mode 100644 index bd2dcea8197ed9e5cd43b33cea0961a55bd67b9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmXRej>*?Cmynkcw=++u|F!?zIje6bZzO(Lyr_A@_AmbLp8xOv2iIKR5nrKhW3DYD zWBdR6|5J9aWq-*%v3YaF!lJl1C*DL~LS8^#!9Jn>CQ!fGFP$$EKRAA{{9*ey`)}L- zrvFa$NB-;Bo7pSd%g7}Dcl_`4Px-&uznniu{#aPBvvcqZ$Sd2Y*Y^Ky_+L}bz_4RS z%#(~66+djg82wB9Z>K3Q&(Fcn!Op_Q&cn^lp7?*^|H=P-|5yD}`D5|pzySt^ViX@R zFrfP2*M5i(?(Zqjl9y*-i2n=sLEW7-1qC4e$UXq+NA|(Z{SY6x)a%&G$+NT1{tNMe y(m#_w5kEeBU|>M?0Rs>q`=F*A>;q1IPI(yveR=uB{~#YI|5yEg>))9_1_l5${<0GQ diff --git a/gfx/overworld/078.png b/gfx/overworld/078.png new file mode 100644 index 0000000000000000000000000000000000000000..3b6c621b8eb23eddd987e976a8306eb1a8f68486 GIT binary patch literal 327 zcmV-N0l5B&P)miY6&nZ8G>OtJN>m1wL@Hr_M{CJ<4SK^T=`ZBz=Tj7G!s z0(BH|G@2zF&y~)>iSu5$ENJi`QC)=+VyFuUt5cLYQSBK;hj9is4>X1H;C@0Mt}+SS zO!pKgiXQeYJ)+W|cTYZjbi#=$|9iWaUMrLKrD=mf-0z32w@2wyx*tW1ZshrBE#ow( Z-7h|%q|e0iG(i9W002ovPDHLkV1mK`gogkC literal 0 HcmV?d00001 diff --git a/gfx/overworld/079.2bpp b/gfx/overworld/079.2bpp deleted file mode 100644 index 91659bdc68fb743438f0167bea2fa5477320e16a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmV;x06+gYICM{0#go{8ape|AhaD|5bl#e;*$Q2LJ%Q%9`!S|M>s*@AvQ1|2sEs z|2zB__*49#|KR`N|M34gH(YCcOS#YRkKmuczrg<=|B3#K{1yHq{{jDT|M9Q<{QM03 u1pWf?52;^Kzaih@|5JZge?)&^e?LDQ6AusO9|Zp#|33fS|G)o7$AEw-S8a~~ diff --git a/gfx/overworld/079.png b/gfx/overworld/079.png new file mode 100644 index 0000000000000000000000000000000000000000..7996be17ea518091b31abb60e37b9474cb6186d4 GIT binary patch literal 262 zcmV+h0r~!kP)aYJ&5DGo}eSvKL7^tHbKi%Ok+Dd|x{g|6{lYrKDPkmXp zpvK-*CcI8qUO9WtK@<~rmmEV4s&_WSF`ZSZ+zLj_N+T%3C{YCAw=7@*l>ETsXWQeNx2)6qA8g!75Yj3^!2kdN M07*qoM6N<$f~Bi*761SM literal 0 HcmV?d00001 diff --git a/gfx/overworld/080.2bpp b/gfx/overworld/080.2bpp deleted file mode 100644 index c03f2a4d6..000000000 --- a/gfx/overworld/080.2bpp +++ /dev/null @@ -1 +0,0 @@ -78??4???xS08X@v3m;cw=G-dj;FQfe;XxFG z3ZDUU=l}YKuKyB@TO~{V5-na{5j(U%jK##uC@ayRIU|7Sg3|ny2~)cpyZ-C6%`E3g dkrQvLWXNR=DBp4X>ur#8JYD@<);T3K0RRq^KN$c3 literal 0 HcmV?d00001 diff --git a/gfx/overworld/082.2bpp b/gfx/overworld/082.2bpp deleted file mode 100644 index f6395da925dcc61bff5b8732febe13ead4ab0395..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmd<*=j3Bymy@*DvePW__o@HzLEwYJgNhk{LTaYyeKPu2RPS7SxaPTqx`n;~GYg-#HtTKgWJBd|)_WVUZrMU|-?B_wvl=&HpRw8GxVx2tc%h z!-ox$;u7K(>IV7+{ssOO?skfQc>Xo*JJkL&`M>Oc#{cVr7#P^uAwJj-^uZT@1_p== zDrWoz`au7aPyMI*!?npa=@$H8_Z$85|95!bahqo{AHePh=|}bfOh3#A`xQVwIA8D? v=mTT^2IjvkARm0@I}h~1nGcKy7#L7}0CG374=U@CePF5fVFR)cqLu*wph%L- diff --git a/gfx/overworld/082.png b/gfx/overworld/082.png new file mode 100644 index 0000000000000000000000000000000000000000..d124616b0e3432ff829349c3b35b09f9e53b09d5 GIT binary patch literal 355 zcmV-p0i6DcP)xujv_e5R9L?)h` za0RI%YIqjPA*5~3d@q`mc-Ud2wkDATjEx%}i#>)a9wkQWU*;aIVj67skp-I!TXm7x zyMkdY@|tZSi_ZIy{ANe~jvkiUojm$fH?H&O6GLBs*C^L9cET#gt!N+bM91^JKfXVs zheVyZXpg9lOD9~;qu+!wz}=+zk^BB9Iy*b)egd6*c1SFi_i84esU_|Q?&QNi+u<&TBBy@I@eyZ}EBGc!m|=E)zH T9~?h8J{TN00OF4V%0d7DR6`HD diff --git a/gfx/overworld/083.png b/gfx/overworld/083.png new file mode 100644 index 0000000000000000000000000000000000000000..b12bf897cf0f90ea22fc2fee2e464d7613edd349 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=1SA-$xwhT~Qg)s$jv*Ddl7H~C@CZC&wx5u| z`{Vov^_*3K^|qNl5$%Q~loCIF+xBzXV; literal 0 HcmV?d00001 diff --git a/gfx/overworld/084.2bpp b/gfx/overworld/084.2bpp deleted file mode 100644 index 40ee737a7ceae1bb0cc8d92f909f3f844eda8d44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZQz00BF@_{6}xxWv#bFc--Gd)Re12*xMGCj{ojCpgsC*MsD0n?qOEHrF;Y{{R0U KqIQ&|Bm@A(T@-Bq diff --git a/gfx/overworld/084.png b/gfx/overworld/084.png new file mode 100644 index 0000000000000000000000000000000000000000..63846bfadc854233ee9faf6194281d0eaf5a0d40 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=1SA-$xwhT~QVyOjjv*Ddl7H~C@Nhh0{>+}% zmaM&Fnt=?rw{N1wHX)ZKjUAzp4jV%=9l|7Lu&VU6wY3?@Brq_U1iN(}bYfu0|CX`Y S(_29hWTvO9pUXO@geCwh-65|4 literal 0 HcmV?d00001 diff --git a/gfx/overworld/085.2bpp b/gfx/overworld/085.2bpp deleted file mode 100644 index 3d7694f43c742cb546c1ddc5ca503e5fd0d49293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZQzu(!8YFwnPGFwzBK28JI$esD;<_`xwF1BC4r4E5|4lx?h3rA7GpfwCMCD}Hc5 NWPki%7zGrD002x%6u|%h diff --git a/gfx/overworld/085.png b/gfx/overworld/085.png new file mode 100644 index 0000000000000000000000000000000000000000..da171b3b2a1d8826ac091495f5994d81001fd9bf GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=1SA-$xwhT~Qf8hmjv*Ddl7H~C@W@L@ypgn9 z8^x;PbU0zniOd;mHkfFoIreXNz3lh9=J)N-{Qv*IzFx=1!U812z+epI N|NCcRBO?Rh0|53z954U? diff --git a/gfx/overworld/086.png b/gfx/overworld/086.png new file mode 100644 index 0000000000000000000000000000000000000000..dba7dc130fbdc01e99868ba4b68d1ae3b84ca34d GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJH%}MGkcwN$KloXA5*{%#Gut0N z$Pkv!Cbo@}iN|S?qArh9kav`X#FA+S1{*f9u^2QQWMpGYYwQ0b|3}j9#{Y-u4iXGX Y44w1kpRqp=v;&#!>FVdQ&MBb@07mK}od5s; literal 0 HcmV?d00001 diff --git a/gfx/overworld/087.2bpp b/gfx/overworld/087.2bpp deleted file mode 100644 index 7d28ef270..000000000 --- a/gfx/overworld/087.2bpp +++ /dev/null @@ -1 +0,0 @@ -  ?"?'=Ox0DGny Ov`` \ No newline at end of file diff --git a/gfx/overworld/087.png b/gfx/overworld/087.png new file mode 100644 index 0000000000000000000000000000000000000000..fad0eedd8c4befdfdaf04a389edae80e9775500a GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|v!5KkA!kcwN$KmIrVw?ABet>HgU zy_54>NxQbTU&b{&C9FbnUH^F8w}!D8cj&&Fbx2{?3hkDM3)0$*56@>)t8TN8Rd8xN nJnx}Bv%p_*K}Ml={{QR@T>BIxyfU9%0omi}>gTe~DWM4f@0TxN literal 0 HcmV?d00001 diff --git a/gfx/overworld/088.2bpp b/gfx/overworld/088.2bpp deleted file mode 100644 index da35730d0..000000000 --- a/gfx/overworld/088.2bpp +++ /dev/null @@ -1 +0,0 @@ -7\޵tp|zq~Go??>px \ No newline at end of file diff --git a/gfx/overworld/088.png b/gfx/overworld/088.png new file mode 100644 index 0000000000000000000000000000000000000000..5a614d7bb1700fba45aa4d1b1e2c6002c97726e8 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|v!NKY5XkcwN$Kk6I*+aIoPYx&P3 zF5~h<(yzeugYk-zG!A19)>cC!162<$1B;z)Rt7R0!l@|&og9T}6GS)@QUXd6G7>Ca q9Z)+_Fv0P{%!ka(%s^wFGk<01S}n5DxM=QvkY%2(elF{r5}E*RVJ({g literal 0 HcmV?d00001 diff --git a/gfx/overworld/089.2bpp b/gfx/overworld/089.2bpp deleted file mode 100644 index f3386f2a5..000000000 --- a/gfx/overworld/089.2bpp +++ /dev/null @@ -1 +0,0 @@ -? @ժѮR^C+ҭu??+W~ \ No newline at end of file diff --git a/gfx/overworld/089.png b/gfx/overworld/089.png new file mode 100644 index 0000000000000000000000000000000000000000..9b408e0214c8e62ab8b188e2a73a6c73656fbcb5 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|v!Fi#i9kcwN$KMo&AIR7E@s#kqm z@ajuVl1tLgm81oDd-En-m?Qb>&;l_r%>xRSqDQ(!coPzMc?%N+xOqevHpR$DNU*X> pO7QKlFff)$NJvQgap1rKeunlUp&z@nbqhf@dAjknq^?LPFxl4~Yj4 GKzsl-uMM04 diff --git a/gfx/overworld/091.png b/gfx/overworld/091.png new file mode 100644 index 0000000000000000000000000000000000000000..15ff22d0a654dd1aa330c38a8ec13dfea56fe062 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJQ%@JikcwN$KloXAUL0YsQz* \ No newline at end of file diff --git a/gfx/overworld/092.png b/gfx/overworld/092.png new file mode 100644 index 0000000000000000000000000000000000000000..b276339070379fd52d6dab0811a42cfb9c13f818 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|v!Xipc%kcwN30SxQ^GyLIDuxI$N z=`=sXX-0>~499eICNq4>%+9(zj*!#d`Nh}$jA-^e7rpT>_9mNhK7a* OKw$8};KPFlAU*(nJQW-O diff --git a/gfx/overworld/093.png b/gfx/overworld/093.png new file mode 100644 index 0000000000000000000000000000000000000000..cc12f9f3416d3e39b447873a59744ee886c60a83 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ2TvErkcwN$KloXA{!2EzXvp9& zK0K36ExFD3v{SF7T}#_1<3HlOjHl#E*o5leG#+70lQ<~Jpc28H5VJwkfq~(tmgc2D SGg+)bW_r5%xvXw=!=F1MUnG7gJa9O`$jA-^e7rpT?CcCc(9rMz O2n;?Le0cBx#0LQTT@tJS diff --git a/gfx/overworld/094.png b/gfx/overworld/094.png new file mode 100644 index 0000000000000000000000000000000000000000..458cda431b69a85c96bf3f1f5258a88bf1c545f9 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJdrud~kcwN$KloXA{@Z_G=DgPM zpGRKA;)kT2ck7(=AIefm=Rf?7*_Cci05ztOzopr0B@uuKmY&$ literal 0 HcmV?d00001 diff --git a/gfx/overworld/095.2bpp b/gfx/overworld/095.2bpp deleted file mode 100644 index a4d55c72dc873f0ed5e3ca0f0c33011f45b0fd15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmY+r&1`l7; zNe#kA*rSv!?oEPK;FK56zlJvf3YRP&y3&XCXLhr|dDsY%E#(RYYpQbHyg}{eq-vQgkXd}QVy}y>8_XB&KoVfr1 diff --git a/gfx/overworld/095.png b/gfx/overworld/095.png new file mode 100644 index 0000000000000000000000000000000000000000..d4339470e8d16511d0a8cbf1a531b126ae770ce7 GIT binary patch literal 308 zcmV-40n7f0P)S6b0ZDlWejv;>5KSg^-t+#Gj3uRH-6;1AU4vOE#|D*MKm-MYQ#Onyd$|=eDb& zh|b~+b7%PA45SMMa(XZD(^m`sa%It99MtGX^BTTz7JF?ogJ~Osu5clI8d(hU(bG13 zP+EvFRF+G|#w#4X$2Yr0`{z4)g`-yn7C|;CkyX_M@8kF!K3UMayr!2d=mFooBlRAp zq|VekNhr4&y(ZAed33imBO|Hp(7/88c\t?<a:.-;88Ȅ ?3S|D88_>"   q<. "Oy?<OO?>'|x@  t  -C1?1X谰,3O|[w?%?)?) pp0>#?3SuM88? \ No newline at end of file diff --git a/gfx/overworld/096.png b/gfx/overworld/096.png new file mode 100644 index 0000000000000000000000000000000000000000..161ce5722d19efb305928f418b83b36897200edb GIT binary patch literal 414 zcmV;P0b%}$P)b9LF9W631k|QSMGB6sR|@Do&&3Xn-#he50ll&&pygX-zgI}Sr!J|>#5*%7dwF^TEg2Tqplw4LJd0citX$nkHeEGPEE)#Z!wusK z$+!{deRcSa!kjm(<`A;6cL#an9YUF528+P+v9!Dw1`6@Ful~w>;~wv7_HVwew+?xB z6xusfKC~y0^^jf`HoLV`SUOG%QA=|m^}vAC_y%&!=Tu-^6<>463sT4=zrt6DXO9X? z^G)G%WGQU=ZGnxIPKL{M%2gU1?EAgzTLh~Xj~({C)hFA&KOVThGiJyx_y7O^07*qo IM6N<$f*8275dZ)H literal 0 HcmV?d00001 diff --git a/gfx/overworld/097.2bpp b/gfx/overworld/097.2bpp deleted file mode 100644 index 7da1f4b4a..000000000 --- a/gfx/overworld/097.2bpp +++ /dev/null @@ -1,2 +0,0 @@ -/0P@oV -jp?3{LK?<8/ 2<??___??/<[X0?< ? ? ? ?,xx<<|? xx \ No newline at end of file diff --git a/gfx/overworld/097.png b/gfx/overworld/097.png new file mode 100644 index 0000000000000000000000000000000000000000..69e46b84ce2bb86eb62d90b6e07d3f8086f43ef1 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ1SA;BTlQ)JspXz7jv*DdVtWnw4jJ&c?!U4$ z<>Zytl|kZDyjcnv#WpE#Ea17qeLzsDb>R;YS#Q6|Wql%Z3<4A*{l9JhZyq#(lQZVy zo{JsLmu7VK&FHYIP--u~A8#P!$)c_G}yvJ%rY!W{e3>TI_`pV^1?sgyQQ6Zb|$+NKA0T-?a`?Z)^5q4B0f#9 Xldy{7{x`w49^`aSS3j3^P6}}56=w^| ,ny_y_R^ OWWuJz08 \ No newline at end of file diff --git a/gfx/overworld/098.png b/gfx/overworld/098.png new file mode 100644 index 0000000000000000000000000000000000000000..c3aef5c6ca9985f826ce515aeaa19b4f50770f18 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|v!U{4pvkcwN$Kjf2t&3~93kZp4~ z^!$N>w$(CB4|(FPSe{D$%j&pdT=RkFNxH?uCo9e@c(Cxq!38=mxRhf24CV+32DS;D mI^+&ya@u8``7r&zvn_*&hs2-6N5NM?)_A)5xvX#9{DX{AB<&EvpCXzJW%3DVcozKDcALfM}CjkC*zt&0WZ>jTsd&%{0GNIW{qP9 r4xBGo_47hfn{c~V||^~~j>> \ No newline at end of file diff --git a/gfx/overworld/100.png b/gfx/overworld/100.png new file mode 100644 index 0000000000000000000000000000000000000000..4a5f1f186f971c6626d97318ffde1e4c8903b6ad GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|v!2u~NskcwN$KmIrVw?F(}_>@Bv zW5+)egPX=RNeM5~EmRL|n(>gOy~*fsCu__pp7~qCz8Kd$2zZcg@nGSJGX)9_Q)fO* sW>{^1nEj#h86Ndn{F=rx5B?wEVYtjA6Rn)|=Of52Pgg&ebxsLQ0JL;A4*&oF literal 0 HcmV?d00001 diff --git a/gfx/overworld/101.2bpp b/gfx/overworld/101.2bpp deleted file mode 100644 index 579b552f1..000000000 --- a/gfx/overworld/101.2bpp +++ /dev/null @@ -1 +0,0 @@ -????_~ToR~*J?2?'=&Lxdxx????__o_;7?/8/8xpp??7?+7..  800 \ No newline at end of file diff --git a/gfx/overworld/101.png b/gfx/overworld/101.png new file mode 100644 index 0000000000000000000000000000000000000000..61a8b79c624e500d3c284aa8bc79e215d6b72b55 GIT binary patch literal 214 zcmV;{04e{8P)6NEcTpPmvy?H*oP7okX&Svhaq2r#@{rT7nkSfl$QjO{C|8t2)y|5;>U*xKV|^Q5BB!j=K3}=^87sF@`Cbwe1HC2 zdGp1_;>QPr7e6|F6cpUQkey?1FDEQ7%+JTd&dmHl;6uTW6COW)ocK_n@Zi7!Ml>KV cpODbdzyJqKOzf=eti9cDU*Eg7V@E;)0ID`Kp8x;= diff --git a/gfx/overworld/chris_fish.png b/gfx/overworld/chris_fish.png new file mode 100644 index 0000000000000000000000000000000000000000..ea073015121f3e0650417e9ff542cd2433391be9 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^5+KY3BpCYFRJ8)BR!waSIf%4A6mAw% zoN(&ct)vY_?B>0tEU^<3(w_<~3M~+I5{Nm+a+`bq;U&K;_>Vqc+bOiW@uglq_v}?Y z`mP)kf;gVNjhW|a73}5vSL(tlX>;)_<$+UQX8g05QMJc^rGZ#xwDf%8D(4)5caNq^ oJe<8jazpO2IV;!C+?(q5FK%79UES7g?jVPGy85}Sb4q9e03dNmX#fBK literal 0 HcmV?d00001 diff --git a/gfx/overworld/kris_fish.2bpp b/gfx/overworld/kris_fish.2bpp deleted file mode 100644 index 9d47dc140f3e6df6d846887f237b321297204aa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmbRLslGy9UR<7^Q(h8C^8fVzC->vWiyt2*{FnhGKeYW%u9ugQk>}?Tmlu@h<4gR1 z?B5Ryiyt2hUi|3zQBZLIVt%H*y_~STFh3s)J2NxOpO!yAet7)&apFUP!h-_`7}0>d cd_qD)0|Oi|F|o6h!`B)nAh&tC`njxgN@xNA_G(LO literal 0 HcmV?d00001 diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.2bpp b/gfx/overworld/trainer_battle_pokeball_tiles.2bpp deleted file mode 100644 index 09e51fd67..000000000 --- a/gfx/overworld/trainer_battle_pokeball_tiles.2bpp +++ /dev/null @@ -1 +0,0 @@ -Áý \ No newline at end of file diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.png b/gfx/overworld/trainer_battle_pokeball_tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..a4655d26e6d36fe26d7d7f8d6ad883dbc803653f GIT binary patch literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3f~SjPNX4z>goK0*{|_(t-|YCC lwK Date: Thu, 8 Jun 2017 22:21:12 -0400 Subject: [PATCH 05/46] pngs in gfx/{debug,emotes,evo,font,intro} --- gfx/debug/color_test.2bpp | Bin 368 -> 0 bytes gfx/debug/color_test.png | Bin 0 -> 215 bytes gfx/emotes/bolt.2bpp | Bin 64 -> 0 bytes gfx/emotes/bolt.png | Bin 0 -> 126 bytes gfx/emotes/fish.2bpp | Bin 64 -> 0 bytes gfx/emotes/fish.png | Bin 0 -> 123 bytes gfx/emotes/happy.2bpp | Bin 64 -> 0 bytes gfx/emotes/happy.png | Bin 0 -> 125 bytes gfx/emotes/heart.2bpp | Bin 64 -> 0 bytes gfx/emotes/heart.png | Bin 0 -> 133 bytes gfx/emotes/question.2bpp | Bin 64 -> 0 bytes gfx/emotes/question.png | Bin 0 -> 126 bytes gfx/emotes/sad.2bpp | Bin 64 -> 0 bytes gfx/emotes/sad.png | Bin 0 -> 127 bytes gfx/emotes/shock.2bpp | Bin 64 -> 0 bytes gfx/emotes/shock.png | Bin 0 -> 110 bytes gfx/emotes/sleep.2bpp | Bin 64 -> 0 bytes gfx/emotes/sleep.png | Bin 0 -> 123 bytes gfx/evo/bubble.2bpp | Bin 16 -> 0 bytes gfx/evo/bubble.png | Bin 0 -> 88 bytes gfx/evo/bubble_large.2bpp | Bin 64 -> 0 bytes gfx/evo/bubble_large.png | Bin 0 -> 130 bytes gfx/font/english.1bpp | Bin 1024 -> 0 bytes gfx/font/english.png | Bin 0 -> 770 bytes gfx/font/french_german.1bpp | Bin 1024 -> 0 bytes gfx/font/french_german.png | Bin 0 -> 853 bytes gfx/font/spanish_italian.1bpp | Bin 1024 -> 0 bytes gfx/font/spanish_italian.png | Bin 0 -> 865 bytes gfx/intro/001.tilemap | Bin 0 -> 1024 bytes .../{001.tilemap.lz => 001.tilemap.lz.c2341875} | Bin gfx/intro/002.tilemap | Bin 0 -> 1024 bytes .../{002.tilemap.lz => 002.tilemap.lz.54d5b74b} | Bin gfx/intro/003.tilemap | Bin 0 -> 1024 bytes .../{003.tilemap.lz => 003.tilemap.lz.9f90366a} | Bin gfx/intro/004.tilemap | Bin 0 -> 1024 bytes .../{004.tilemap.lz => 004.tilemap.lz.4c7562ee} | Bin gfx/intro/005.tilemap | Bin 0 -> 1024 bytes .../{005.tilemap.lz => 005.tilemap.lz.bed1ff6d} | Bin gfx/intro/006.tilemap | Bin 0 -> 1024 bytes .../{006.tilemap.lz => 006.tilemap.lz.c8756972} | Bin gfx/intro/007.tilemap | Bin 0 -> 1024 bytes .../{007.tilemap.lz => 007.tilemap.lz.a9cbcbca} | Bin gfx/intro/008.tilemap | Bin 0 -> 1024 bytes .../{008.tilemap.lz => 008.tilemap.lz.f12ed6d9} | Bin gfx/intro/009.tilemap | Bin 0 -> 1024 bytes .../{009.tilemap.lz => 009.tilemap.lz.911a1ace} | Bin gfx/intro/010.tilemap | Bin 0 -> 1024 bytes .../{010.tilemap.lz => 010.tilemap.lz.2717d106} | Bin gfx/intro/011.tilemap | Bin 0 -> 1024 bytes .../{011.tilemap.lz => 011.tilemap.lz.bb066632} | Bin gfx/intro/012.tilemap | Bin 0 -> 1024 bytes .../{012.tilemap.lz => 012.tilemap.lz.bc182264} | Bin gfx/intro/013.tilemap | Bin 0 -> 1024 bytes .../{013.tilemap.lz => 013.tilemap.lz.18e3115f} | Bin gfx/intro/014.tilemap | Bin 0 -> 1024 bytes .../{014.tilemap.lz => 014.tilemap.lz.7b59259d} | Bin gfx/intro/015.tilemap | Bin 0 -> 1024 bytes .../{015.tilemap.lz => 015.tilemap.lz.1bfc5a89} | Bin gfx/intro/017.tilemap | Bin 0 -> 1024 bytes .../{017.tilemap.lz => 017.tilemap.lz.e4772015} | Bin ...round.2bpp.lz => background.2bpp.lz.b58b3984} | Bin gfx/intro/background.png | Bin 0 -> 563 bytes ...s.2bpp.lz => crystal_unowns.2bpp.lz.e7f8ad51} | Bin gfx/intro/crystal_unowns.png | Bin 0 -> 269 bytes gfx/intro/gender_screen.png | Bin 0 -> 71 bytes gfx/intro/grass1.png | Bin 0 -> 144 bytes gfx/intro/grass2.png | Bin 0 -> 134 bytes gfx/intro/grass3.png | Bin 0 -> 134 bytes gfx/intro/grass4.png | Bin 0 -> 75 bytes .../{logo.2bpp.lz => logo.2bpp.lz.e03ee257} | Bin gfx/intro/logo.png | Bin 0 -> 944 bytes ...per.2bpp.lz => pichu_wooper.2bpp.lz.4bccf7f4} | Bin gfx/intro/pichu_wooper.png | Bin 0 -> 709 bytes .../{pulse.2bpp.lz => pulse.2bpp.lz.9fb06bb6} | Bin gfx/intro/pulse.png | Bin 0 -> 201 bytes ...ack.2bpp.lz => suicune_back.2bpp.lz.c6f529b0} | Bin gfx/intro/suicune_back.png | Bin 0 -> 881 bytes ...se.2bpp.lz => suicune_close.2bpp.lz.7e362923} | Bin gfx/intro/suicune_close.png | Bin 0 -> 978 bytes ...ump.2bpp.lz => suicune_jump.2bpp.lz.1b09fb64} | Bin gfx/intro/suicune_jump.png | Bin 0 -> 1112 bytes ..._run.2bpp.lz => suicune_run.2bpp.lz.ef999ad2} | Bin gfx/intro/suicune_run.png | Bin 0 -> 792 bytes ..._back.2bpp.lz => unown_back.2bpp.lz.740c4d28} | Bin gfx/intro/unown_back.png | Bin 0 -> 355 bytes .../{unowns.2bpp.lz => unowns.2bpp.lz.3a1f185e} | Bin gfx/intro/unowns.png | Bin 0 -> 904 bytes 87 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gfx/debug/color_test.2bpp create mode 100644 gfx/debug/color_test.png delete mode 100644 gfx/emotes/bolt.2bpp create mode 100644 gfx/emotes/bolt.png delete mode 100644 gfx/emotes/fish.2bpp create mode 100644 gfx/emotes/fish.png delete mode 100644 gfx/emotes/happy.2bpp create mode 100644 gfx/emotes/happy.png delete mode 100644 gfx/emotes/heart.2bpp create mode 100644 gfx/emotes/heart.png delete mode 100644 gfx/emotes/question.2bpp create mode 100644 gfx/emotes/question.png delete mode 100644 gfx/emotes/sad.2bpp create mode 100644 gfx/emotes/sad.png delete mode 100644 gfx/emotes/shock.2bpp create mode 100644 gfx/emotes/shock.png delete mode 100644 gfx/emotes/sleep.2bpp create mode 100644 gfx/emotes/sleep.png delete mode 100644 gfx/evo/bubble.2bpp create mode 100644 gfx/evo/bubble.png delete mode 100644 gfx/evo/bubble_large.2bpp create mode 100644 gfx/evo/bubble_large.png delete mode 100644 gfx/font/english.1bpp create mode 100644 gfx/font/english.png delete mode 100644 gfx/font/french_german.1bpp create mode 100644 gfx/font/french_german.png delete mode 100644 gfx/font/spanish_italian.1bpp create mode 100644 gfx/font/spanish_italian.png create mode 100644 gfx/intro/001.tilemap rename gfx/intro/{001.tilemap.lz => 001.tilemap.lz.c2341875} (100%) create mode 100644 gfx/intro/002.tilemap rename gfx/intro/{002.tilemap.lz => 002.tilemap.lz.54d5b74b} (100%) create mode 100644 gfx/intro/003.tilemap rename gfx/intro/{003.tilemap.lz => 003.tilemap.lz.9f90366a} (100%) create mode 100644 gfx/intro/004.tilemap rename gfx/intro/{004.tilemap.lz => 004.tilemap.lz.4c7562ee} (100%) create mode 100644 gfx/intro/005.tilemap rename gfx/intro/{005.tilemap.lz => 005.tilemap.lz.bed1ff6d} (100%) create mode 100644 gfx/intro/006.tilemap rename gfx/intro/{006.tilemap.lz => 006.tilemap.lz.c8756972} (100%) create mode 100644 gfx/intro/007.tilemap rename gfx/intro/{007.tilemap.lz => 007.tilemap.lz.a9cbcbca} (100%) create mode 100644 gfx/intro/008.tilemap rename gfx/intro/{008.tilemap.lz => 008.tilemap.lz.f12ed6d9} (100%) create mode 100644 gfx/intro/009.tilemap rename gfx/intro/{009.tilemap.lz => 009.tilemap.lz.911a1ace} (100%) create mode 100644 gfx/intro/010.tilemap rename gfx/intro/{010.tilemap.lz => 010.tilemap.lz.2717d106} (100%) create mode 100644 gfx/intro/011.tilemap rename gfx/intro/{011.tilemap.lz => 011.tilemap.lz.bb066632} (100%) create mode 100644 gfx/intro/012.tilemap rename gfx/intro/{012.tilemap.lz => 012.tilemap.lz.bc182264} (100%) create mode 100644 gfx/intro/013.tilemap rename gfx/intro/{013.tilemap.lz => 013.tilemap.lz.18e3115f} (100%) create mode 100644 gfx/intro/014.tilemap rename gfx/intro/{014.tilemap.lz => 014.tilemap.lz.7b59259d} (100%) create mode 100644 gfx/intro/015.tilemap rename gfx/intro/{015.tilemap.lz => 015.tilemap.lz.1bfc5a89} (100%) create mode 100644 gfx/intro/017.tilemap rename gfx/intro/{017.tilemap.lz => 017.tilemap.lz.e4772015} (100%) rename gfx/intro/{background.2bpp.lz => background.2bpp.lz.b58b3984} (100%) create mode 100644 gfx/intro/background.png rename gfx/intro/{crystal_unowns.2bpp.lz => crystal_unowns.2bpp.lz.e7f8ad51} (100%) create mode 100644 gfx/intro/crystal_unowns.png create mode 100644 gfx/intro/gender_screen.png create mode 100644 gfx/intro/grass1.png create mode 100644 gfx/intro/grass2.png create mode 100644 gfx/intro/grass3.png create mode 100644 gfx/intro/grass4.png rename gfx/intro/{logo.2bpp.lz => logo.2bpp.lz.e03ee257} (100%) create mode 100644 gfx/intro/logo.png rename gfx/intro/{pichu_wooper.2bpp.lz => pichu_wooper.2bpp.lz.4bccf7f4} (100%) create mode 100644 gfx/intro/pichu_wooper.png rename gfx/intro/{pulse.2bpp.lz => pulse.2bpp.lz.9fb06bb6} (100%) create mode 100644 gfx/intro/pulse.png rename gfx/intro/{suicune_back.2bpp.lz => suicune_back.2bpp.lz.c6f529b0} (100%) create mode 100644 gfx/intro/suicune_back.png rename gfx/intro/{suicune_close.2bpp.lz => suicune_close.2bpp.lz.7e362923} (100%) create mode 100644 gfx/intro/suicune_close.png rename gfx/intro/{suicune_jump.2bpp.lz => suicune_jump.2bpp.lz.1b09fb64} (100%) create mode 100644 gfx/intro/suicune_jump.png rename gfx/intro/{suicune_run.2bpp.lz => suicune_run.2bpp.lz.ef999ad2} (100%) create mode 100644 gfx/intro/suicune_run.png rename gfx/intro/{unown_back.2bpp.lz => unown_back.2bpp.lz.740c4d28} (100%) create mode 100644 gfx/intro/unown_back.png rename gfx/intro/{unowns.2bpp.lz => unowns.2bpp.lz.3a1f185e} (100%) create mode 100644 gfx/intro/unowns.png diff --git a/gfx/debug/color_test.2bpp b/gfx/debug/color_test.2bpp deleted file mode 100644 index 113aa12563f0c032fd08d39740365ed4e6f3a896..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmZXOK?;K~5Jm0Lhgo@)q2T8V1lXi;UgIa4{CBl*H;uOe)+&)s*yCW^;Ff*BhmVyeouFL z22VEoxU_DkY~ji{z4;Y)pDuooU*Q_dcu*r|Njm@82f& diff --git a/gfx/emotes/bolt.png b/gfx/emotes/bolt.png new file mode 100644 index 0000000000000000000000000000000000000000..0eef6ad3fd25eabf37757ee7c6f8f390bc93f574 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJS5FtmkcwN$KelIGt!tC#;rYeW zAGY>Y+KZ^8TRRqJH;PTjh+tKbkZ3rfrKYfvN$(=d6b5a!?BCnFvh5H5umAPG@yNgb Y4EDatQzxu@)Cw}#)78&qol`;+02(kX00000 literal 0 HcmV?d00001 diff --git a/gfx/emotes/fish.2bpp b/gfx/emotes/fish.2bpp deleted file mode 100644 index 310ec175201053e6fc2c5f7921dfd53f1b6b1a40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmWN_!3_Wq5Cp&@UYaY+KZ^IS%OnCB9o5NR literal 0 HcmV?d00001 diff --git a/gfx/emotes/happy.2bpp b/gfx/emotes/happy.2bpp deleted file mode 100644 index babc52ec60ac2a45e33862bd5f174d7aae45d7ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmb1Vu$Qk_`0w!F=YJ3oI{aYx^Wz`Of2RLN|Gj{a2`J<8-??7FUS6Jo5eR`IO8*c2 OWBK#r$AJS44GaJhksxjW diff --git a/gfx/emotes/happy.png b/gfx/emotes/happy.png new file mode 100644 index 0000000000000000000000000000000000000000..dd65f4d1a1bf0538e37c4a035755d1659ae7fa79 GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ7f%<*kcwNXrws)U81Og;o^1C*gVw~tmv9Fw~reTr%7V!lA> XY1dUVtwKFwLFRh8`njxgN@xNAS79hN literal 0 HcmV?d00001 diff --git a/gfx/emotes/heart.2bpp b/gfx/emotes/heart.2bpp deleted file mode 100644 index 15cdc88b7172d9e00c3368497cff3b265a9ffdda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmb1Vu$Qk_`0w*S?teTG`u||~^Wz`O|Dyl5{=fSF>;I?!?*EY+KZ%wh$9ycZgt>vDp{Kl#iFvM;mE2`ha^VvDGb_d*}u1UW!oSAU;pcWY+KZ%wh$9ykE?mf>Dq=B3At`os7-J`&s=~zsTR0X;ta*E1Yu#U-|Nme9XBYbY apP3=!gM9QJy(^PJCVRU2xvXY+KZ@#TRE&ZW{Db!uaQ{u_P*A-zdZl{zx>ZG^!qf?Jh?g1I(>FVdQ I&MBb@0K=pvO#lD@ literal 0 HcmV?d00001 diff --git a/gfx/emotes/sleep.2bpp b/gfx/emotes/sleep.2bpp deleted file mode 100644 index 1c9e26ec7269906758bf408ea1647d57e1318817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmb1Vu$Qk__#gM*<-Z4zbojyW=f^*m|4cx*3Wz`bclhu1-=SW?US6Jo5eWY){dfBR Q=^x9VA3qKpXlP&n06A_U(EtDd diff --git a/gfx/emotes/sleep.png b/gfx/emotes/sleep.png new file mode 100644 index 0000000000000000000000000000000000000000..41c958f74f14e1b327fdc70d5e7077e13922e4de GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJCr=m0kcwN$KelIGt!tC#;rYeW zAGY>Y+KYs!tsM(jbGu|{YC7&*E#YuPNnzm?)~8LP&0GIQAKg0t;eY$T{~eP4*E1L> VD_d?2%Hsx^>gnp|vd$@?2>{W2D#!o; literal 0 HcmV?d00001 diff --git a/gfx/evo/bubble.2bpp b/gfx/evo/bubble.2bpp deleted file mode 100644 index 741ee9026389ecaee2acbbb9faf8d1541fda4276..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 XcmZRuk#Uk~u4%4lFX(5eW3T}LCu{`q diff --git a/gfx/evo/bubble.png b/gfx/evo/bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..28fba397df3fb4fe5e6969ac8c53f367ee1b0713 GIT binary patch literal 88 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$$PpuhE&{2{vma~Am7sYZcv+! k!mLvhL{Al%&Uu(^!%(u0)9c_KnX@1*p00i_>zopr0P-*z`Tzg` literal 0 HcmV?d00001 diff --git a/gfx/evo/bubble_large.2bpp b/gfx/evo/bubble_large.2bpp deleted file mode 100644 index a69044414a49f910ba5dfa4c509d04d43c43fbfc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmZQzX69iwU{+vv;CHBRsBd66aKPXL&kvR#Y(U8VgB>Jh?_lpBufSl>z|X+^f&T;l P1Gxis41a*|1H%CTct#b? diff --git a/gfx/evo/bubble_large.png b/gfx/evo/bubble_large.png new file mode 100644 index 0000000000000000000000000000000000000000..34f6300413d992eec6546497e6930af1fce3f461 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJPfr)ekcwNjXB7Dw3H;GD24@XafpM)wdJR%jx zv5HWsFbq`%Xnp@^9jd*NcMtQ?&jDnU+)Pmvg)K`GARF57(cOuJ86m>A??L zp*ozI*E;A;}U*_?gKi;ogg|Ll$!MM-O2C7(UWhIck?fZ`z wcRJHrb3)rcwKtx_M%h-+z1hn@U3>1$&!Fvp?<37QS#L+ocfDot4{Dy+C;$Ke diff --git a/gfx/font/english.png b/gfx/font/english.png new file mode 100644 index 0000000000000000000000000000000000000000..7119c06913d39f507dc7f6ab81cf1b71496c0487 GIT binary patch literal 770 zcmV+d1O5DoP)_^sBPQaKPaI;|G3xLB9&#zr_ z^|p{MR7LZ-@oVA7=NRt3NQgR8+YCl{<0a#dTg z0fr;+hM^d-c90qbm>uq$614aRfD74x)^cqSkS-F?5Gu)GwG3BIZ@_5*F&Nof0u25w zo?@7d+*eGB3>Ns5EEZx(7M~SZTZe#29B>&nbNZOuWt-J~NKf0wSr{ zp$P#>SQkRfJ5QyB8?F!yyKG*j;1--FRniOvhX(-SCxCuo$DS>~#jIUs<-pWwfiVyO z>(4rL;dOrdV*ima-&MQLsA`pbnJU-|Tzh>2nBP)A0+=w&s29Kps<;8XFMV|pkrSvC zRNEAP2@(>4o}5-jyv7jE3!>`_3)jcEq=_9+^&f;HF;*dTw@W})mXpK>K=udEthfeb zJ)Y+W0Q@r_pu`Wm`2!1aQ3!dC_u|23p*SOlz6UY0Kj<-zdDO4k-URCvyNQ}Tma*jh z4S)uX83J_GD?tATU_83)B8Jli>vM!&u=rJnr8WNO-6QjHVl0>&+rmQgZzrI3$~_?5 z(p#YYRJ7TE1w8>$Hvqj`Oxb^LhK$NaxI@x(!J+~W8RT68|Iq3F0>zj%RTW_L4*&oF07*qoM6N<$f}sph AqyPW_ literal 0 HcmV?d00001 diff --git a/gfx/font/french_german.1bpp b/gfx/font/french_german.1bpp deleted file mode 100644 index 84d542986983a98da6988f2c0eb1a9069b94830a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmaJ(%a30wOUMH2$+nw@dG^!0X8qPu ztbkNZECzzZYxUIO8vhlQ(Vo@RyS##Rtj!kiN`)cgX4AHoS`~^=wPfL8)K7d7q&>|< z5CmdIx$u2o{*mgH$M`hy-yaBA+1WM`^k|%g>fBIPiZqFwS!bbNMp#kBH^cbj;@wJv+@AQj#Vf z>JZ%788B27^WkuQBHJ_@=+b92U^&E-NkLRjWKdEdhVux2s5`nId?1EADEd|Q`~?3c zS(^BgyU6z+^2Oj@!m;1s*q0DIt~VU(V9fnMz@1x!qh2`hkj~XBfSD&o9t8g}5tV%z z@p=AlyE_+^sS3J(Z?CB9f~NBc>*o9OhfaTY=lgpYfyct|zpH9%46rFCTe?oKg2y`x znjRkg3Id7!HRiN{U!tv(f@gv&xV^kxuV;IE^|udo^Jst0v62@Ix4U-!hLu0QN}eg1 zB)ks6D5B{6{K?Ck3;Nq{A-lelg7VX2b$psrzAALF%8B}3$50gUizZeoPL7gbg$MV` zS8#pT^ Q-_9iJ1YbLhwVZ1D1BCtddjJ3c diff --git a/gfx/font/french_german.png b/gfx/font/french_german.png new file mode 100644 index 0000000000000000000000000000000000000000..4e4545662e9ce01fc0a1ff5737e01449dfcb191a GIT binary patch literal 853 zcmV-b1FHOqP)195kY8EwwUA#I`g$P0BIH%bor$(RXW3;dZLN+;W{hc>QFKVrQcE48-lbPH z4R!UQMT)DMc@72MJ|h%Y$SH27o`A$hwgepLwbq6*;l3zAi#GsV$O5#MYlDDvk${F!Ne-*!bmjB{Yzv6N$lelQ@Ne-E z!)W9_V^CzUz)-T7h$UJ4uE1P61We+B+mPK)C$~@!VEUfY55U0ZsNo~y*cK2;#SRS! zP{O(pV%~WxExhoAXxL@*G6b*SG^vtiC^$R-h@SxZg&q5}02iZn8I=uF+X7=C0Mls6}EQgGUac-S`c0?`8Qq$k_T8H`~yF$pcX(eGO52Oll2 z?`wXD$?{~58-|}A^Qo@-;F%T1oOpWMLY~L# zUW)GCjv@UgYcyK8dz;0d_2KS~_=){4)?2}S zR5xvQ-T<|pr@2|4cWhA!7U2hg&j$c-^=|-s07aQ(1TY`&ZGLmXKR}%r3H#9Dyxl#^ z%G3%|*WRJ7qzn__bLRt!|36(PqxRH?XF^|r@`D2aE;ZT)NL>JgCZ?>vFGEIUAJ{ zsCNqgqJi}Q^qln6p8yDU3UBn~gd(&s5CZ7ocfqa0s!HR7e+61VaG{y0L$RXvG>+;S f8Kl3JzMroDLS*&54lFpR00000NkvXXu0mjfMUjYm literal 0 HcmV?d00001 diff --git a/gfx/font/spanish_italian.1bpp b/gfx/font/spanish_italian.1bpp deleted file mode 100644 index 8f316db4e263a19b5dc1192c68b69283ec4b0532..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmX|9v1;5v5PcDcS%L_Q2|)xC7L!8hgewumA;e;?Fu_F%lS)Mj7byrT=c(f#MtU=-glL*(iFI@K<9cnuEHnq(UA8{XUR|`CuNJ8$ z(o+Hn5Qxt}L&eu7DAea}d3*NXQ4|iqd>+qcJ zz%Xc~wFV@7CP07%MUv--C*{fE;2h)swKSh+pEl$xs2||V<@uB^0Nx#!o+8V$fPF}> zY)H;3+Q$=kf55iwCF|lh1vni2*=z+=vq)7?a=eceW8cYkL?y>OQcyN$A=QXpML+-8 z4~BDzC%xlImzekW{l-%tQaCPzi$ww?r>6%WZoc5Eu*00L7me2++x+Jn8u444a22-sxq9_vj_u+X zk9X+5*x!FHAd|{fiR5~)GVS*4cC!heK5hPfZ`zkHcD=9i5AIL&`K|&X%Ce}s`{Uo> z-}&?rY$kc^=Rt27^{$U3%HxGz9G57UE3;abfO95gMVY>DQ?1kNb*7g5alU>OKHHEl z81}iIs8l}IuLRPguKSp>uQZAxc4)e1=GL*we&7+jrjYx-ep& Mj5h=4v)VEE50Z5XA^-pY diff --git a/gfx/font/spanish_italian.png b/gfx/font/spanish_italian.png new file mode 100644 index 0000000000000000000000000000000000000000..5663800f142b79c97199e1177ef0afe78334904a GIT binary patch literal 865 zcmV-n1D^beP)3V6kXKpo+K^Wlybk15gj|JuRngx0VV7;0?j9|ZR7|DIilS4BmRjl*^)9`t zX{f7DEmB<7%yTO6^cA7FLWa1RdIAz3ITCQ;t+nQ~Qp}2Q0mkHln*{@309<}~&UVS& z+d{ff70vg?*}}>981!~J5CZ{4HVcizf)49u0YLn56>{ymcc{zYZg9-S1#5*|)mChP z;R^i2P>fhRNDTtaF856dxp)D~acGmc{ckyM<} zL;^}!7edTCe@Y7v+>tb#vU!<;M{t=`Ni!52o&Y320rU$y_HF?#X6-U72bPWn#y|k9 zzvrO~@AGBGeomCrUEbFXSf4pm$-5&D)hhY2RB#r!_d1n1Fx#i;kIWwdEErZ)keO3( zt^kZ+7B_&;h5fxEZF!YUZ!SP7P}>v_J7y^80`8Oup3GC>G~B+uhLwY4RT!Jd%38Pq z)V*g#yjjTB;X9ip{U>XnPYgPE-`V)PKakG!RHL$3#05uv574AflarPh3cs2s5q!>F zFjMyVPXG{}evLM+`c)fhJuUc&*x(Ez(rl5;B-+sj;L*$pn6U`_w15z011MFo2JKYRwLLY(l0|AtPg_Z!c zn7RQt6)|Q1eOSq}+g&l6CtOhUD0&{)g`x%EVt2?z{vHkN(*n*}$wF2`fD?tkj|-yT zF;EBuw1t2fAg#>I#m(Xd_)YQif{Q74W~TmJFn8~Sxd|8iurA>jV3!}e93e`8$wWh^ zPL=gEI8bt~yTfo1aUgp`D1e}ZM(MfenSTPH^dbD=T?R5j3o}@K9iIyx9d=b3pZqG& r0t;meW@=Am&^UAv8Kl3ozMroDCB4h=%BonS00000NkvXXu0mjfrU-;h literal 0 HcmV?d00001 diff --git a/gfx/intro/001.tilemap b/gfx/intro/001.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..8b1b66033a91d6c72b462f56e954d682365283cf GIT binary patch literal 1024 jcmZQzzy$x10H!Ph1CsRrQF+V|7)jxS?AKBD&7*PNK literal 0 HcmV?d00001 diff --git a/gfx/intro/004.tilemap.lz b/gfx/intro/004.tilemap.lz.4c7562ee similarity index 100% rename from gfx/intro/004.tilemap.lz rename to gfx/intro/004.tilemap.lz.4c7562ee diff --git a/gfx/intro/005.tilemap b/gfx/intro/005.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..3f7d23b64ea63ded299009b3c3352526109d56fa GIT binary patch literal 1024 ycmZQzzy$x10H!Ph1CsRrQF+V|Knov6AV5(>WqA~{K^!#mX)2Fw*C>1Fg#Z9bq?MBZ literal 0 HcmV?d00001 diff --git a/gfx/intro/005.tilemap.lz b/gfx/intro/005.tilemap.lz.bed1ff6d similarity index 100% rename from gfx/intro/005.tilemap.lz rename to gfx/intro/005.tilemap.lz.bed1ff6d diff --git a/gfx/intro/006.tilemap b/gfx/intro/006.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..4af27a1587723d9d77772f3f6436ee4cf9e0fe40 GIT binary patch literal 1024 zcmZQzzy$x10H!Ph1CsQAlH~dL8F+yjaO#(n2OEb|UQZvNJTrrxJ%cSi^TE3D*iRdI q7FITPsL2ot&3_`IV&eGZRaDi~@yVmefjDU9(^MYWu2J^T3jqL@ikJ!j literal 0 HcmV?d00001 diff --git a/gfx/intro/006.tilemap.lz b/gfx/intro/006.tilemap.lz.c8756972 similarity index 100% rename from gfx/intro/006.tilemap.lz rename to gfx/intro/006.tilemap.lz.c8756972 diff --git a/gfx/intro/007.tilemap b/gfx/intro/007.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..2e3fdb41a4073922d199e35a61f5a114db65ab53 GIT binary patch literal 1024 zcmeH@;SPWx2!s(U-~WjXbEn*Lw(3_~_eb#KfFW{Lc48Vr$sNw%i%H}yuiZxdF{ix5 zRn@aOUrjUr1Kx+HBm+P3n$Z58x9A?<5n#Rm|~w#Zkxi^S%D~dl%RN>1mdI literal 0 HcmV?d00001 diff --git a/gfx/intro/007.tilemap.lz b/gfx/intro/007.tilemap.lz.a9cbcbca similarity index 100% rename from gfx/intro/007.tilemap.lz rename to gfx/intro/007.tilemap.lz.a9cbcbca diff --git a/gfx/intro/008.tilemap b/gfx/intro/008.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..903f59ae5adb5f90ae98f9fd882c378fa82b84b3 GIT binary patch literal 1024 zcmZQzzy$x10Fta10|N&q11|#ulJtL=yqC9+F9U;wBm+p6PWkc*Er>!C_c1UeK=m_NSz(n2 z3KqkZfN50y35iL`DAK6m!%$FI1lI274^xGzA0`?X4`X4MhsmP)4_WOfd+3D#0Ja6I A?*IS* literal 0 HcmV?d00001 diff --git a/gfx/intro/008.tilemap.lz b/gfx/intro/008.tilemap.lz.f12ed6d9 similarity index 100% rename from gfx/intro/008.tilemap.lz rename to gfx/intro/008.tilemap.lz.f12ed6d9 diff --git a/gfx/intro/009.tilemap b/gfx/intro/009.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..554e919a8f3b716c9be1d8f142d2956beb752b0a GIT binary patch literal 1024 ccmZQz7%G4f3UIl1xXa`6_o(=22#_BF0KA|8K>z>% literal 0 HcmV?d00001 diff --git a/gfx/intro/009.tilemap.lz b/gfx/intro/009.tilemap.lz.911a1ace similarity index 100% rename from gfx/intro/009.tilemap.lz rename to gfx/intro/009.tilemap.lz.911a1ace diff --git a/gfx/intro/010.tilemap b/gfx/intro/010.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..4ddef19c7f2726d8662adb632e09135de1e2ef4b GIT binary patch literal 1024 zcmZQz7&3s7iJ66!jUAVJ1q6kJMMTBKamgzvDk-a|s;T3WH!w6ZHZe6b$0hIJ=;Z9; v>gJA1J|HkCI3zSI9G84TVp4KSYFauj`GUft;*!#`a$NGG;-euz{SW{EPB;$X literal 0 HcmV?d00001 diff --git a/gfx/intro/010.tilemap.lz b/gfx/intro/010.tilemap.lz.2717d106 similarity index 100% rename from gfx/intro/010.tilemap.lz rename to gfx/intro/010.tilemap.lz.2717d106 diff --git a/gfx/intro/011.tilemap b/gfx/intro/011.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..59f365a34008c87e217d8689f92bce22a053bcf8 GIT binary patch literal 1024 zcmeIuQ3}8y34_WoCP>8gxs{2L6xeELeGiu{u+Qh0k)E!0C*!OWclsRx6ejQvnE n>pJguf0cR~Ap29p=pueU+@Y1so+p;>&%hGqU!K*It$*MKub;ns literal 0 HcmV?d00001 diff --git a/gfx/intro/011.tilemap.lz b/gfx/intro/011.tilemap.lz.bb066632 similarity index 100% rename from gfx/intro/011.tilemap.lz rename to gfx/intro/011.tilemap.lz.bb066632 diff --git a/gfx/intro/012.tilemap b/gfx/intro/012.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..3577fc467f2f2083ceabd6b8668d46c5978cafe7 GIT binary patch literal 1024 zcmZo{q%CN`0h*dyTHD$?I^XDi&Br3YVBw<0 zOO`HMzGCI7)oU>2*RET?VdJLFTefc7zGLSubot$T_U_w%;NYRdM~)sle&XaQbotX~ z&YnAe;o_ysSFT>We&gmXbotwN?%uoq;NhdkPo6$|{^I2;botkB-oAVP;p3;zU%r0( z{^RE_boqvc-+%u8`_I70#LU9V#?FB$-_XFx#m&RZ$1fl#BrJkWUQ|q6LQ+avMpjN< Qfwr;R*!X`G4CxR60CiIEZU6uP literal 0 HcmV?d00001 diff --git a/gfx/intro/012.tilemap.lz b/gfx/intro/012.tilemap.lz.bc182264 similarity index 100% rename from gfx/intro/012.tilemap.lz rename to gfx/intro/012.tilemap.lz.bc182264 diff --git a/gfx/intro/013.tilemap b/gfx/intro/013.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..28e27ad62d656e77d0e95f4d2f67409f6dfa5907 GIT binary patch literal 1024 zcmeH@Q4WAG2tz9>-2cXcbBjzICjJ@w1$`6}fG1j1qq)MFqZtuF#-m*IEI%EB*1a-r s^MgDQoj7KdyYQCp%i8_x{*JrbzG0PjO1G-4%6ODDujcRg?|=9M8xQ^gwEzGB literal 0 HcmV?d00001 diff --git a/gfx/intro/013.tilemap.lz b/gfx/intro/013.tilemap.lz.18e3115f similarity index 100% rename from gfx/intro/013.tilemap.lz rename to gfx/intro/013.tilemap.lz.18e3115f diff --git a/gfx/intro/014.tilemap b/gfx/intro/014.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..52829cc741b3861b033a0a8a3d76b6e3e7cc4d94 GIT binary patch literal 1024 zcmZQzAO@T|eda7ab+>Ncxy!(C?mRX%Tefavc=h_tTLy-E_p!+zIeHA6FkI}))oTn4 zj7-cdtZeKI9i4D-7~{#)XAA;@Lc$`VV&V)lX2OI~Xaz+jWffI5b%qryQN)3q?K^fd zFc=sb8Jn1znKLkSb@%k5C^>%OBm;wkqm#3XtD8Fm!>rkJ=Ay`7zj2d+As{d)I3zSI zoPlB0>NRUo>^fMKjbd;Rl1dxJxk_89C;V1}*5lLr^y!2^!eZJ$7=4Dw-#d6m z)g(}33^klV4>{r_RAL%wI6XO#Qev1=Qzf+msuCi_SVe+uQc!+R#VX8bNWJ+TJMZ}j zW6i#HFd}iLxa|hO9wjPD;}rD=y9uEigDk-mXwU)ADe34H;**Zb*64GJTsy&xa^Bojm- z%F38Up7XWH&RCJpjVY`8k`!Dgg#KboUR12m-YNntK`S2VDTdo z{CUE9C(I0IhE2F~htt9mz@aw6BX%N0h{YgT1r!|hO-2|PU=K-V*jNYw%qbh;iYrah zw7moHv!^UZT}M+x&W7d9KMD TcDV9300000NkvXXu0mjfdc|v> literal 0 HcmV?d00001 diff --git a/gfx/intro/gender_screen.png b/gfx/intro/gender_screen.png new file mode 100644 index 0000000000000000000000000000000000000000..7261781325d46f223be54456856093e53fb476fd GIT binary patch literal 71 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<@p-y9hE&{2j@a78D9yxBKZ9%G Sp4^)PAQhgjelF{r5}E)N^bx)Q literal 0 HcmV?d00001 diff --git a/gfx/intro/grass1.png b/gfx/intro/grass1.png new file mode 100644 index 0000000000000000000000000000000000000000..59c5f5f62ad55ed9e63a23b017204d274e2e8070 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|v!a8DPV#EpLTFV%l0V;mmZ0oqj=-0%?w400EG#PY5{5!90fQe hBqSvzC1fNPFfhb%i(i&iuvrPRz|+;wWt~$(699)aE#?3K literal 0 HcmV?d00001 diff --git a/gfx/intro/grass3.png b/gfx/intro/grass3.png new file mode 100644 index 0000000000000000000000000000000000000000..2bfd2b6733bde165bd1ac53d289a4ac7b6b64c31 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJUr!gukcwN$KloXA5*~d{S1A1R z8de literal 0 HcmV?d00001 diff --git a/gfx/intro/grass4.png b/gfx/intro/grass4.png new file mode 100644 index 0000000000000000000000000000000000000000..115d61f3866c1515700a30fe5d0bfd2c08bdcb49 GIT binary patch literal 75 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<33<9WhE&{2{_%bO!|Qb=U*6j@ Xtm)tjykTXj2~y?h>gTe~DWM4f%7hl0 literal 0 HcmV?d00001 diff --git a/gfx/intro/logo.2bpp.lz b/gfx/intro/logo.2bpp.lz.e03ee257 similarity index 100% rename from gfx/intro/logo.2bpp.lz rename to gfx/intro/logo.2bpp.lz.e03ee257 diff --git a/gfx/intro/logo.png b/gfx/intro/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0ed4094cfda981d71df37e7cd78242146157970f GIT binary patch literal 944 zcmV;h15f;kP)>0YFsqY||qJ0Qr25JR5A-@?$HcYr)a#KdT%4zL-?LP@aie2L@O zDKNK7`sMrC{@>a6KY!Ky#9y_4rJG}50_YC`3(y_{8X&B3$^!#HjWfMPa1ST|5oYpY z%D@1Z&>`@B3%G$0mb#P(41E^xOVkLQWEL=R=GSrniOv95XW)T}H0=Nj7)CXZ0Y8SlY#9FE|fI>iaNM#DH;tBtYHsh&BOQ4`{jW zUXuX0S^AE`a^jFI0TWPI8Q>NH3xZDL9(aQT4YVW5E&&?)5mm-O9|42#anxI2CZJJn zs-d1>1Lzfy+5xJu6ej~iG=p&fNKL!52X1Quh7xci5NH+j3f9saD6t*@uK_wYzyPY3 zDKHd(8UgbP6fWTsod*P{-iuUF>m2Y{3!h2lqG((?_ka~&Z~SLBT&j9?m<9MD=3C6{ z=yW!Cn!D(9SMxWR?r?9~ll7A`0Gz0w@cACgK)69&2KWu{-^E9cZEyj80es*WK>u)s zg}nfH;LX8JP-5Ps+J^UBI4)rJOA0fP^T`2dotE6dK=8>M*w)43*$tAF`{E-Ge01Nx z{;PKI4E!%(n`7XlH+^ykOu_w%zzEmjlokQ%ZifIghZl~&n0C*Nn zA({#c#D!seG<^;j2=HZb*%g7FdKik(Z3ggl;k3GZ*e~f7Wgv^jXvm2-VhNC3-M#zx z5?~ia8_L~@^^SesrFrN=`D3`S5s?7B3-{t2WD4{QphaDrHz~jlBSKFXIY802Pm5Qj z0E8v*99 zpR9mxOMu2wEJ{Tqm2-I^1_l6m2&huyVjxt9Y6?KGvP@0_5bPtfPzaNNaqEC_qUbA| zT*e}RH0Y!i#G8dt3~Yg!?M8WdU}FD}g(YUTrmi584lT};yNxWz9?wH2lYan$*6$>5 SxmBq+yR(0RIsc7b}7|{T>=30i@Z0W1;BDhiIFI>0qS=V2edz$SUys# zK$T{3pjF<1%7I#T28;mUr?u`uq6nI5s4SsE9tUO^1&9QFFQG}iMVDII3`6{Fko68v z4ScWv*6KFiBS7axCXXk*0xOkqJ);^u_ugijdz|aN&HyyB<}#!Ai%R2`rN=eR+K$-8 zbL~LmK*#c#4*(vYRR5uX8H0^4C03y00l?RjR;ePxzy&+d3mXvS+p`1X4e(yW^#WiI zU|4`Q10V2UxP!g4~q5w*dHFhY6-i5nT_60;PsH_dKk?D?`e)#g8 zMSrW-h&gTe~DWM4f>7Gx2 literal 0 HcmV?d00001 diff --git a/gfx/intro/suicune_back.2bpp.lz b/gfx/intro/suicune_back.2bpp.lz.c6f529b0 similarity index 100% rename from gfx/intro/suicune_back.2bpp.lz rename to gfx/intro/suicune_back.2bpp.lz.c6f529b0 diff --git a/gfx/intro/suicune_back.png b/gfx/intro/suicune_back.png new file mode 100644 index 0000000000000000000000000000000000000000..0e791e2a7490c5d807e72b3ce7fb747a630f20c2 GIT binary patch literal 881 zcmV-%1CIQOP)ljA6ae6hoFEldgoxh2#==0Sc10D}3OvAo*K6Q_g)z_WRLA@W=Yz$$|%>gw$j<~?x?z_0NK zgX~3auagyEK#WO<09_vjiMsBSj#)weG!4M?Z3;mj=)+D?K%Rt56$twPVXw_Y@4A8l z_*fs72jO9Z2XlZx5cIzSg8a9IQ7FW?7~}s#-{uiNb33_g%C*_?#XfrwF(*g zd>7Zy?LniRRshpy(NX~3ed6Gyvb;LPRd2WI48xR-ZDg(ixI&cK92jx{1pj*fH zz};sRFv@BOwz&rM>9CZ-8Rb2>-Nw@f&eP${ ze*-(V5A1RlSzGCdCNW@o(lX$C+Ou}b5sL<#j{81>5JB`o1z5}h(csVCxW5kJ#|YT3 zD7A`oBw15nb~IJsU>R8YMjdB7D%we};^*0yK7nxg0PyT48pJucQXoD1dJ@wN{6H{D zVv&K72D8tDDGinn+6V?3kQ{t7;CPU@!K1sc5U9N#;dsh`ZrW5H4MiiUFT7-OW&_*- zX29i8xIt~f_2f+NG=7M$af+FiONXgCu=lG7bXTiZjWsa+pu!3l_7#|vff*n(Re1{| z;4sz=qsBUdqypBb2z0|pwT0Ny#gsc$vm9QCVi;qN61c?gE}$bIpMki{*akBUaX~F0 z6DL;fQcPM5K^q<6TEje9A@+R{4QQ<+>-KF>2H2JxTpgVys$i9uZz7T12E~;$1$HBl zVvAKSvntr}ZUI}j0QuOPf1wtjda=g00r}sc#cl!d{P*%N&?PK#y+yjV00000NkvXX Hu0mjfXK9c1 literal 0 HcmV?d00001 diff --git a/gfx/intro/suicune_close.2bpp.lz b/gfx/intro/suicune_close.2bpp.lz.7e362923 similarity index 100% rename from gfx/intro/suicune_close.2bpp.lz rename to gfx/intro/suicune_close.2bpp.lz.7e362923 diff --git a/gfx/intro/suicune_close.png b/gfx/intro/suicune_close.png new file mode 100644 index 0000000000000000000000000000000000000000..ef365de96daa6c01d7076598fb2c90dea63a7fe4 GIT binary patch literal 978 zcmV;@11)(kmis7_rX7HKm5KrO7rfsHTc-@HQUUspi3vcf^Cjn?bBX}w z2>5x*KqFJ^VaS?*l_pcmTC+i?N#*GfG?b|elt7f`gE3+MK^oPwTs^b)d3=(yO0<)r zT~T7s&3K=(N==;*@FMjRuu8&a?X$XN1wK}BX`}NG49Jy$rjQcQ9!+3AG4R573dG$q zX{`j%+YmR9bj|=}!aerQS3=w%u??F=>|}=wEAEy6c}=$sqsDThz_$&xKY-$g#GDQR zD3?rtRh6FuTmVv&oCD~?I{~QvWgY{Z!d2OOKcq3h`NNf?|B2Ri0(7%Bp(1CHOJVg% z4D9LpS9RGH0L6+wQM&|J;*6brg=9{rm&A^zXEPYTFBrfB0qfzG^i}BFsz$&oy%D{o z)W0?IK;mowim4Hpq{lo0coKEmtfxSF2|y2ge+ziL09d@m1<2^guTfuj(cHi((3BLM3c;d5?I!G}M27OM&H#!j08b=D zJi+-dR0+U+lqN;N*C$j7Drh@xh5Rz(ngN#Jinp-@x=bq-;4qbtt-eIcz}c_rX)QAb<{sFeX%qvL zViUeVqDEO3uuUPe?br|4b0dmSU}ReD&fE_9M}X80v+(s50l%f{;oE5&1FvERHi_@%07*qoM6N<$g2e5{ AG5`Po literal 0 HcmV?d00001 diff --git a/gfx/intro/suicune_jump.2bpp.lz b/gfx/intro/suicune_jump.2bpp.lz.1b09fb64 similarity index 100% rename from gfx/intro/suicune_jump.2bpp.lz rename to gfx/intro/suicune_jump.2bpp.lz.1b09fb64 diff --git a/gfx/intro/suicune_jump.png b/gfx/intro/suicune_jump.png new file mode 100644 index 0000000000000000000000000000000000000000..67cd7502a320faa25148babd6c3604e4a8503db1 GIT binary patch literal 1112 zcmV-e1gHCnP)c$|L^PyDxp z;+-qM7wULRDA=BYfBCCVOW5%*g=NGe>YE|LuM*^7wG{G{mZ*RywgPh=4pN%NYXSHV z(Jxfh3P9>cmXbpM&$YlQ(Vt>U)t6S-?Lfhy*}`Xm&D|u!NFfxlN3@5&hX_l=Xy!(a z38=dn)=^<4I2OJIB7_)u;2Yr<-soV+0%CO|QfJy|A3_T1b04|y-SO`P@&l5~V$W$T$`=lEVu*|T`R4myru^Be3 z$_#(-2s1b|BR0%6*SRDkfC(s!-IOeIK>s^f>#D%X5fOcvxwNre?^| zrvfa87=9upIZGCLvPuQ80GYvZf?mOmWTC+$WJy7g5}&UbSOx%d4xF5YXLc`A^U_O3 z;Yw;xRvu%}w%hrI=792q9kbO|02MrIm{x1ehN`Qe*Qju#j#qjl0;-^`uB*D+()8Du zPl*b+k-S~rTo0v4UVX3a)c51=m{t!cH;i33Zfg2ngxF2K@3~sv)x4+|lnVpuzS|wq z-(zmndv21%*ww88x8)5j?=dG_59&xVI+O=^kKd;AX2!ytigyh+&rt@9SXd-Uhg*As z_$AQ=t+~_8n1^!w`GlA=gMA~cxs~;0N)~1ar_3S#Y=x3P6E?y^L3SG(v>MSBHml&b@LIp->L=KW=Jq>S@kmtQYL`iRbfBv{?>D2ltwE0sw?03&0{8ExemuD&FNB$3EIhsQG@5^Fg)x2b zFe*Tm0jIw>Rg7UYnW)UXqoAY8sv#8{?u>A1q<-PFVy4>wG e`~PqM%jX~DlE!@OH(jLw0000;mu=4e70^F`b8cn;H*!G0EP4bz%jU057mVyciNJkkvI6;g4?(b7 z#J=1C)(k}-jBt(s?goH|(D!~DKH$&@`x}cv0DaR8wTuuH5Gd7l!OMLmDKqD~f=dLN zcvK6pkfD9I4eEoD^0p$jfZC6F?>5^-s)0Q%bv^tZ!W z2gpT3w<-?zZ&9jms8>6!F0Kop#`ari)P!4DfI7t0z&K;T60tawP%zeWxIP` z4886BgQ<3TO`M^Cs@R7Y$$>6D4QW8sj%jU z3he0GG*F})T$i;TWnBXfnl$FcX*V`5qV)D%!F+&yE43s^^T|6UtvAZ(m5-lEynAo{ z8o$puEhTax9UaCZ^cSxJp_p^6<|i*(~DWBL3DMuYV7T4i+J) zB88<9el=D!#sW*F%EE!BC{(Vf4k;)X{U81x4X1vA#JELC4%|8!5G)y3uP58V-Vqv% z$0Ld&{RnngsiJ(t2z)r|7+2I3XenYeYl{YBen%}(cq*2;;#(}d_IHYRZQv_LM=Al? zQSDurq8obW_V!z#(rapp9=7q1_U_1?VvoIGu`!ui%tfcaXizLV?M=Qa~D_<#bT_aD;kXG0kuG;AzS7d-)!LtVTX9vhJJ&e z!sv29cFguJL+2ps4Hm?34lL)vYnEu8tfxa)zW_mWFF7v>$CLm7002ovPDHLkV1h{_ Bltlml literal 0 HcmV?d00001 diff --git a/gfx/intro/unowns.2bpp.lz b/gfx/intro/unowns.2bpp.lz.3a1f185e similarity index 100% rename from gfx/intro/unowns.2bpp.lz rename to gfx/intro/unowns.2bpp.lz.3a1f185e diff --git a/gfx/intro/unowns.png b/gfx/intro/unowns.png new file mode 100644 index 0000000000000000000000000000000000000000..d4c7998b4d3cc55eb094e482b44eed880baefcb2 GIT binary patch literal 904 zcmV;319$w1P)15>AhtSwbxwrqzRvY5NbRi zw)kvC&B56c7bIGxC(D^;#$3~eYL7-7(Q$C?l~PNNZW_qA<&T_Z!_cg>?BYufY9TDb>UnqlR6Pd82hR zzIAy;KtVvvW43ViONGGSU4z*QTU@GIsIo7D0H7D>SuiqFySxJ^32NKBslA(-s#3rS znukCcAE-?2=P58Dd(u$Ds#!HjvH9Gl$oS73DC_)rfDG66IJ z6Q8W^pS+b}r3Wndba%xJvDl&l6%6=-iTdxp-FV>0qA3JG@X1oD^7@7iUbr>|4khq* zt~l%ZmN=IH1;>IDIcI0>ZwqP1GE4~oHaKf3P!{u$(NC?X+{{$~4h!FH9w?mi3g$IP zG*Wt?@Lla&Z&1JvvsvZcw3DR_;lfDbYdQ=ZT$Nb0Fr~Sf?|JA@0&vi;Y<17Lnfkd| zHQbAOAS?ZG@&U6x)8XVehQp-DB=t&&zs0mKK!+?GYe9C6Dg=%k+i6B+SgDO>)(6e( za_ZNdY7!3#A9*Y8#Ku4fgQ*3H3WdOtsuLBkj}&QA|D9EZ}jrG(@KiAd3XB48}uO1|!Qw0%(}_J4Kb~W&~c<{AULgEV(W^AXmM%{kVR5>sgU+ zdSF%k2YCA&FjtG=2>bpFkSCYfAeI=J?S}wp{sgcRfS(;eCqT;}NrD|e0Srvp*`8;> e$(`=bZTJWBDd=6Vs0$_l0000 Date: Thu, 8 Jun 2017 22:26:33 -0400 Subject: [PATCH 06/46] pngs in gfx/frames --- gfx/frames/1.1bpp | Bin 48 -> 0 bytes gfx/frames/1.png | Bin 0 -> 123 bytes gfx/frames/2.1bpp | Bin 48 -> 0 bytes gfx/frames/2.png | Bin 0 -> 126 bytes gfx/frames/3.1bpp | Bin 48 -> 0 bytes gfx/frames/3.png | Bin 0 -> 114 bytes gfx/frames/4.1bpp | Bin 48 -> 0 bytes gfx/frames/4.png | Bin 0 -> 128 bytes gfx/frames/5.1bpp | Bin 48 -> 0 bytes gfx/frames/5.png | Bin 0 -> 108 bytes gfx/frames/6.1bpp | Bin 48 -> 0 bytes gfx/frames/6.png | Bin 0 -> 117 bytes gfx/frames/7.1bpp | Bin 48 -> 0 bytes gfx/frames/7.png | Bin 0 -> 118 bytes gfx/frames/8.1bpp | Bin 48 -> 0 bytes gfx/frames/8.png | Bin 0 -> 109 bytes gfx/frames/9.1bpp | Bin 48 -> 0 bytes gfx/frames/9.png | Bin 0 -> 111 bytes gfx/frames/map_entry_sign.2bpp | Bin 224 -> 0 bytes gfx/frames/map_entry_sign.png | Bin 0 -> 190 bytes gfx/frames/space.2bpp | Bin 16 -> 0 bytes gfx/frames/space.png | Bin 0 -> 71 bytes 22 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gfx/frames/1.1bpp create mode 100644 gfx/frames/1.png delete mode 100644 gfx/frames/2.1bpp create mode 100644 gfx/frames/2.png delete mode 100644 gfx/frames/3.1bpp create mode 100644 gfx/frames/3.png delete mode 100644 gfx/frames/4.1bpp create mode 100644 gfx/frames/4.png delete mode 100644 gfx/frames/5.1bpp create mode 100644 gfx/frames/5.png delete mode 100644 gfx/frames/6.1bpp create mode 100644 gfx/frames/6.png delete mode 100644 gfx/frames/7.1bpp create mode 100644 gfx/frames/7.png delete mode 100644 gfx/frames/8.1bpp create mode 100644 gfx/frames/8.png delete mode 100644 gfx/frames/9.1bpp create mode 100644 gfx/frames/9.png delete mode 100644 gfx/frames/map_entry_sign.2bpp create mode 100644 gfx/frames/map_entry_sign.png delete mode 100644 gfx/frames/space.2bpp create mode 100644 gfx/frames/space.png diff --git a/gfx/frames/1.1bpp b/gfx/frames/1.1bpp deleted file mode 100644 index 63005ab72177bb6eee0e9409a3f649998c80ce14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 tcmZQzVBi-}*VkcSVEE7Q|38pocpz}%MTQ0fs2j-hGXS|KBtAS~000SP3=9AO diff --git a/gfx/frames/1.png b/gfx/frames/1.png new file mode 100644 index 0000000000000000000000000000000000000000..fee7de870e4c1b56392e8bb67f7a6c651438d092 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SDJM@C$B>F!v1bo*G8k|$A825< zn6#QZcEyDC7iN76e)YIRqw8ubd&yLx&B9kNouBeCVNpwalp%}#CFbH#eP*lt?-$ux Wd+dIzOT3W;nd<54=d#Wzp$Pzsvnfsh literal 0 HcmV?d00001 diff --git a/gfx/frames/2.1bpp b/gfx/frames/2.1bpp deleted file mode 100644 index 4dfe9a9491b55f108ffcc16512a37c2b71f90a9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 qcmZQzut|4vO1EKPU^r}Ja~Me3Jack-W}~8_A^`+I3L+1r!QucJb_}Bc diff --git a/gfx/frames/2.png b/gfx/frames/2.png new file mode 100644 index 0000000000000000000000000000000000000000..0ed5ebbedfd48ba2b2bbb9832962798abbde64df GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SDOXPy$B>F!re`j4G8l3&2P|Yx zS+cI~0mC|>58n^m^7vaJAhhL`v7^bqMlnyGF0EBYY>OiQy`N_z5}IPeVH diff --git a/gfx/frames/3.png b/gfx/frames/3.png new file mode 100644 index 0000000000000000000000000000000000000000..c3489ca0d91d9819fda819c18442fdc53200cc66 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SDN9cm$B>F!$v^m6csL&MGYizP zZM18SOlXqV`8`vFVdQ&MBb@09BwNGXMYp literal 0 HcmV?d00001 diff --git a/gfx/frames/4.1bpp b/gfx/frames/4.1bpp deleted file mode 100644 index 01449a04ca0adca8be14e3e63646f107dd16e04f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 xcmZQzV31eP*VkcSVEAvG_8&+w{NQ=>Mn}cO28?xdbo3SMF!sl6LH4><5J^BXm| z{d!p6utupsy5LJ*kjv3V9mUIn@^Xu^W+%OW5aAnD{-7~oYR1#DlgvxQ>s3z0aW|j) bGs|5+e3#X8-Wf|cKt_AI`njxgN@xNAJ;W<* literal 0 HcmV?d00001 diff --git a/gfx/frames/5.1bpp b/gfx/frames/5.1bpp deleted file mode 100644 index 83651da00d64a53c80f573df683f3ae6cff2a2d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 mcmZQzU|`^vmy`ff3^xA{gD8d%KO|6qJU;^iNZ`i@1_l7GR|pIM diff --git a/gfx/frames/5.png b/gfx/frames/5.png new file mode 100644 index 0000000000000000000000000000000000000000..f44542aafbb18f461b6df471c36648fade73e1b7 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SDPvC;$B>F!$v^m6cwVp^X0L0r z=W+OOyzM{pVfpF}N93zZnizdF!$v^m6csL$0+fVpW z)6mH1)UdPu&B0CeZzgu||8Z#gY16|{{QpL>ko*t(56rzucKnJ5VkWpU_;)xiRC=Fa P2Qtso)z4*}Q$iB}jZG#& literal 0 HcmV?d00001 diff --git a/gfx/frames/7.1bpp b/gfx/frames/7.1bpp deleted file mode 100644 index 21793f20a35d60deea03812c5a92efa7f55d587e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 rcmZQzU|^89v$p|K4F7=;1U~%uQK10`7B=>F@(dap78O5!d|&_o{Q3;9 diff --git a/gfx/frames/7.png b/gfx/frames/7.png new file mode 100644 index 0000000000000000000000000000000000000000..54bdbbecc2e6fbb5bdfa3b03b0b8d20151ed96f5 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SDO*n$$B>F!$v^m6cruR2vnl*I zz>`wTu=&S9q4{qwaF!$v^m6cwVqD3;bae z{^RgYzIwwE`RbA;MxPtZo%{-q_|2OBH`|`jsGhLUql|$erroJHM>DbxWR9n+pUXO@ GgeCyKr5{@W literal 0 HcmV?d00001 diff --git a/gfx/frames/9.1bpp b/gfx/frames/9.1bpp deleted file mode 100644 index 9be4865b35f60d9e09bf24d0643507fefb7aca44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 scmZQzVBnXxx3^(nVEF%^;XjaK`0(S;9~&fKZ!gc!0ObGq^Wy^p08K~_)&Kwi diff --git a/gfx/frames/9.png b/gfx/frames/9.png new file mode 100644 index 0000000000000000000000000000000000000000..a23257365671694087d745ade2143c9e21e83f1e GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SDKk$O$B>F!$v^m6csy8`1^zG! z$~Q1MFdccse!A{~yOP9#7Tb;o?Sk?f1RXRv7)`ForPv%%V(7LtakV)78&q Iol`;+0B{W)xc~qF literal 0 HcmV?d00001 diff --git a/gfx/frames/map_entry_sign.2bpp b/gfx/frames/map_entry_sign.2bpp deleted file mode 100644 index a0143875ae113198d7d52a40a0fedb358ff23fef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmZQzKn4H*Klp$C!~6#m-%SU?`49g8XZXJ=6iC1zkO60d#QwAY|IGiBy|er!5dLI8 z|KZ`k^B*7(V$%EvAP5nMncM%N;r{`kO+WxOcU36ZFgPE?TLqMcnER2xv7Q-d(|@2{ X?e(AeArNBoPj(Q5i2r1VnFpf*&Z&ii diff --git a/gfx/frames/map_entry_sign.png b/gfx/frames/map_entry_sign.png new file mode 100644 index 0000000000000000000000000000000000000000..9210137209cba91c81f5fca9de90e2bf83507af3 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoR1SA+{U$=J$QmvjYjv*DdO3!T+JfgtEazMF& zk?&2FM7Tr3#q-}87 Date: Thu, 8 Jun 2017 22:28:19 -0400 Subject: [PATCH 07/46] pngs in gfx/icon --- gfx/icon/bat.2bpp | Bin 128 -> 0 bytes gfx/icon/bat.png | Bin 0 -> 169 bytes gfx/icon/bigmon.2bpp | Bin 128 -> 0 bytes gfx/icon/bigmon.png | Bin 0 -> 185 bytes gfx/icon/bird.2bpp | Bin 128 -> 0 bytes gfx/icon/bird.png | Bin 0 -> 176 bytes gfx/icon/blob.2bpp | Bin 128 -> 0 bytes gfx/icon/blob.png | Bin 0 -> 174 bytes gfx/icon/bug.2bpp | Bin 128 -> 0 bytes gfx/icon/bug.png | Bin 0 -> 185 bytes gfx/icon/bulbasaur.2bpp | Bin 128 -> 0 bytes gfx/icon/bulbasaur.png | Bin 0 -> 166 bytes gfx/icon/caterpillar.2bpp | Bin 128 -> 0 bytes gfx/icon/caterpillar.png | Bin 0 -> 159 bytes gfx/icon/charmander.2bpp | Bin 128 -> 0 bytes gfx/icon/charmander.png | Bin 0 -> 166 bytes gfx/icon/clefairy.2bpp | Bin 128 -> 0 bytes gfx/icon/clefairy.png | Bin 0 -> 165 bytes gfx/icon/diglett.2bpp | Bin 128 -> 0 bytes gfx/icon/diglett.png | Bin 0 -> 129 bytes gfx/icon/egg.2bpp | Bin 128 -> 0 bytes gfx/icon/egg.png | Bin 0 -> 155 bytes gfx/icon/equine.2bpp | Bin 128 -> 0 bytes gfx/icon/equine.png | Bin 0 -> 159 bytes gfx/icon/fighter.2bpp | Bin 128 -> 0 bytes gfx/icon/fighter.png | Bin 0 -> 179 bytes gfx/icon/fish.2bpp | Bin 128 -> 0 bytes gfx/icon/fish.png | Bin 0 -> 173 bytes gfx/icon/fox.2bpp | Bin 128 -> 0 bytes gfx/icon/fox.png | Bin 0 -> 188 bytes gfx/icon/geodude.2bpp | Bin 128 -> 0 bytes gfx/icon/geodude.png | Bin 0 -> 173 bytes gfx/icon/ghost.2bpp | Bin 128 -> 0 bytes gfx/icon/ghost.png | Bin 0 -> 143 bytes gfx/icon/gyarados.2bpp | Bin 128 -> 0 bytes gfx/icon/gyarados.png | Bin 0 -> 208 bytes gfx/icon/ho_oh.2bpp | Bin 128 -> 0 bytes gfx/icon/ho_oh.png | Bin 0 -> 204 bytes gfx/icon/humanshape.2bpp | Bin 128 -> 0 bytes gfx/icon/humanshape.png | Bin 0 -> 161 bytes gfx/icon/item.2bpp | 1 - gfx/icon/item.png | Bin 0 -> 82 bytes gfx/icon/jellyfish.2bpp | Bin 128 -> 0 bytes gfx/icon/jellyfish.png | Bin 0 -> 172 bytes gfx/icon/jigglypuff.2bpp | Bin 128 -> 0 bytes gfx/icon/jigglypuff.png | Bin 0 -> 165 bytes gfx/icon/lapras.2bpp | Bin 128 -> 0 bytes gfx/icon/lapras.png | Bin 0 -> 165 bytes gfx/icon/lugia.2bpp | Bin 128 -> 0 bytes gfx/icon/lugia.png | Bin 0 -> 185 bytes gfx/icon/mail.2bpp | 1 - gfx/icon/mail.png | Bin 0 -> 85 bytes gfx/icon/mail2.2bpp | Bin 128 -> 0 bytes gfx/icon/mail2.png | Bin 0 -> 135 bytes gfx/icon/monster.2bpp | Bin 128 -> 0 bytes gfx/icon/monster.png | Bin 0 -> 179 bytes gfx/icon/moth.2bpp | Bin 128 -> 0 bytes gfx/icon/moth.png | Bin 0 -> 185 bytes gfx/icon/oddish.2bpp | Bin 128 -> 0 bytes gfx/icon/oddish.png | Bin 0 -> 157 bytes gfx/icon/pikachu.2bpp | Bin 128 -> 0 bytes gfx/icon/pikachu.png | Bin 0 -> 172 bytes gfx/icon/poliwag.2bpp | Bin 128 -> 0 bytes gfx/icon/poliwag.png | Bin 0 -> 158 bytes gfx/icon/serpent.2bpp | Bin 128 -> 0 bytes gfx/icon/serpent.png | Bin 0 -> 145 bytes gfx/icon/shell.2bpp | Bin 128 -> 0 bytes gfx/icon/shell.png | Bin 0 -> 170 bytes gfx/icon/slowpoke.2bpp | 2 -- gfx/icon/slowpoke.png | Bin 0 -> 183 bytes gfx/icon/snorlax.2bpp | Bin 128 -> 0 bytes gfx/icon/snorlax.png | Bin 0 -> 165 bytes gfx/icon/squirtle.2bpp | Bin 128 -> 0 bytes gfx/icon/squirtle.png | Bin 0 -> 170 bytes gfx/icon/staryu.2bpp | Bin 128 -> 0 bytes gfx/icon/staryu.png | Bin 0 -> 166 bytes gfx/icon/sudowoodo.2bpp | Bin 128 -> 0 bytes gfx/icon/sudowoodo.png | Bin 0 -> 195 bytes gfx/icon/unown.2bpp | Bin 128 -> 0 bytes gfx/icon/unown.png | Bin 0 -> 112 bytes gfx/icon/voltorb.2bpp | Bin 128 -> 0 bytes gfx/icon/voltorb.png | Bin 0 -> 127 bytes 82 files changed, 4 deletions(-) delete mode 100644 gfx/icon/bat.2bpp create mode 100644 gfx/icon/bat.png delete mode 100644 gfx/icon/bigmon.2bpp create mode 100644 gfx/icon/bigmon.png delete mode 100644 gfx/icon/bird.2bpp create mode 100644 gfx/icon/bird.png delete mode 100644 gfx/icon/blob.2bpp create mode 100644 gfx/icon/blob.png delete mode 100644 gfx/icon/bug.2bpp create mode 100644 gfx/icon/bug.png delete mode 100644 gfx/icon/bulbasaur.2bpp create mode 100644 gfx/icon/bulbasaur.png delete mode 100644 gfx/icon/caterpillar.2bpp create mode 100644 gfx/icon/caterpillar.png delete mode 100644 gfx/icon/charmander.2bpp create mode 100644 gfx/icon/charmander.png delete mode 100644 gfx/icon/clefairy.2bpp create mode 100644 gfx/icon/clefairy.png delete mode 100644 gfx/icon/diglett.2bpp create mode 100644 gfx/icon/diglett.png delete mode 100644 gfx/icon/egg.2bpp create mode 100644 gfx/icon/egg.png delete mode 100644 gfx/icon/equine.2bpp create mode 100644 gfx/icon/equine.png delete mode 100644 gfx/icon/fighter.2bpp create mode 100644 gfx/icon/fighter.png delete mode 100644 gfx/icon/fish.2bpp create mode 100644 gfx/icon/fish.png delete mode 100644 gfx/icon/fox.2bpp create mode 100644 gfx/icon/fox.png delete mode 100644 gfx/icon/geodude.2bpp create mode 100644 gfx/icon/geodude.png delete mode 100644 gfx/icon/ghost.2bpp create mode 100644 gfx/icon/ghost.png delete mode 100644 gfx/icon/gyarados.2bpp create mode 100644 gfx/icon/gyarados.png delete mode 100644 gfx/icon/ho_oh.2bpp create mode 100644 gfx/icon/ho_oh.png delete mode 100644 gfx/icon/humanshape.2bpp create mode 100644 gfx/icon/humanshape.png delete mode 100644 gfx/icon/item.2bpp create mode 100644 gfx/icon/item.png delete mode 100644 gfx/icon/jellyfish.2bpp create mode 100644 gfx/icon/jellyfish.png delete mode 100644 gfx/icon/jigglypuff.2bpp create mode 100644 gfx/icon/jigglypuff.png delete mode 100644 gfx/icon/lapras.2bpp create mode 100644 gfx/icon/lapras.png delete mode 100644 gfx/icon/lugia.2bpp create mode 100644 gfx/icon/lugia.png delete mode 100644 gfx/icon/mail.2bpp create mode 100644 gfx/icon/mail.png delete mode 100644 gfx/icon/mail2.2bpp create mode 100644 gfx/icon/mail2.png delete mode 100644 gfx/icon/monster.2bpp create mode 100644 gfx/icon/monster.png delete mode 100644 gfx/icon/moth.2bpp create mode 100644 gfx/icon/moth.png delete mode 100644 gfx/icon/oddish.2bpp create mode 100644 gfx/icon/oddish.png delete mode 100644 gfx/icon/pikachu.2bpp create mode 100644 gfx/icon/pikachu.png delete mode 100644 gfx/icon/poliwag.2bpp create mode 100644 gfx/icon/poliwag.png delete mode 100644 gfx/icon/serpent.2bpp create mode 100644 gfx/icon/serpent.png delete mode 100644 gfx/icon/shell.2bpp create mode 100644 gfx/icon/shell.png delete mode 100644 gfx/icon/slowpoke.2bpp create mode 100644 gfx/icon/slowpoke.png delete mode 100644 gfx/icon/snorlax.2bpp create mode 100644 gfx/icon/snorlax.png delete mode 100644 gfx/icon/squirtle.2bpp create mode 100644 gfx/icon/squirtle.png delete mode 100644 gfx/icon/staryu.2bpp create mode 100644 gfx/icon/staryu.png delete mode 100644 gfx/icon/sudowoodo.2bpp create mode 100644 gfx/icon/sudowoodo.png delete mode 100644 gfx/icon/unown.2bpp create mode 100644 gfx/icon/unown.png delete mode 100644 gfx/icon/voltorb.2bpp create mode 100644 gfx/icon/voltorb.png diff --git a/gfx/icon/bat.2bpp b/gfx/icon/bat.2bpp deleted file mode 100644 index 0e5cd7d4300f20fc47869770902496fdf5a52d0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU|`_kv9PG9h^_7afBi3z%V1z2BO@obYv0HJulFzCZ)2~f&ddxF2Z5)5ZT_S@ zIdA~XK_VC#+1bTK?d@Sg4Gj+-yjbz)Pfh*5|G$5K`0(ICLV|$-1B2ba`v3Ru^YgQ_ Lv$65;FfafBzPc$X diff --git a/gfx/icon/bat.png b/gfx/icon/bat.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea2ea832dc04eb5714f7784ad6e9cc4788cbfc9 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QU#tajv*Ddde0hi9dZz9d1$}p zC6m7Zze1eCyaZ-5F)>Y>4_-QNil(w>imUNES1tdsN|Md>hJpCJ)qzF6HM{;Dk&Kg( zo36ZlVdbN@89MKO_uTn*Q~rv~6qQ%sXBBqzm-$@aak$SKsO;J5Iji7g-EGl(-9cxL ShW)$1f literal 0 HcmV?d00001 diff --git a/gfx/icon/bigmon.2bpp b/gfx/icon/bigmon.2bpp deleted file mode 100644 index 6883bd80ff6ce308af71c4fa0e765b4a42b0634b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmXRej>*?Cmynkcw=++u|F!?zIje6bZzO(Lyr_A@_AmbLp8xOv2iIKR5nrKhW3DYD zWBdR6|5J9aWq-*%v3YaF!h!(^ilJuIl>gff;=|0adsqKT{Q!-DKZ^hW diff --git a/gfx/icon/bigmon.png b/gfx/icon/bigmon.png new file mode 100644 index 0000000000000000000000000000000000000000..4a77f1eceb0b1f496986c1d64ba940ecae450662 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QVpIijv*Ddk}WeZPA3NH>FR5&1Y;Lw2+2ObWBn2f4}9)z4*}Q$iB}4*^R? literal 0 HcmV?d00001 diff --git a/gfx/icon/bird.2bpp b/gfx/icon/bird.2bpp deleted file mode 100644 index fb1793da5fc8b97ac8a563f3a74b457e03383775..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU|`_mIerdt32_N-9%d$1c83o@ zL4g+%FC;D)9B^3h0Hj-AGd*qPyF2?&{(me7(*0%1v$Uz@)_*7ecmMJKWW9&E1xPnL YI|~Z~!~ehWSDT_ z0)tTdtj3lbA_@nk7*t$b8eAr5`-Ej5t#7lB)PAdYq<*EU!$$wV4v#tvHU-W%H92Q2 zV|S%yhGRs|DM2>TYYd!hVS*DG+NL_Li{y!slH!)|%Um0A=7VCks{N)w_8E;wex4Ut Z%&^=%u;32EZyu0SJYD@<);T3K0RVg9I|cv% literal 0 HcmV?d00001 diff --git a/gfx/icon/blob.2bpp b/gfx/icon/blob.2bpp deleted file mode 100644 index a855f008ee79906e3790520a4968e861d8e631e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU|?WoW@q8#f74Go~&NT}5a`KFf3=BM9 zo3k=9*qX0h*&xcZXmwbtfea6CLfVhRulO&e@f$KQ XgntPao^#8*9^?>DS3j3^P6a*2Wc0z{k4(MK@9rR)&%t%N804oYHIRF3v diff --git a/gfx/icon/bug.png b/gfx/icon/bug.png new file mode 100644 index 0000000000000000000000000000000000000000..97504f7219aaa2ea8f7947a77d1f1b6f0a969fee GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QVpIijv*Ddl7H~C@CZEWx1C^d z<wr<-lM1uGaOGhq_Z|3yO_Ys*4uo};Zes1w!@wM|4#A9 z|GV+oIKlYU{%c$d7-P5-o;B|H@2~ss{DebH$t^=8IK* kHU4w)!iMx8^*=t;Gt4mZ*ZLZl>JD;~r>mdKI;Vst07acn5&!@I literal 0 HcmV?d00001 diff --git a/gfx/icon/bulbasaur.2bpp b/gfx/icon/bulbasaur.2bpp deleted file mode 100644 index 56dd284c15c9b630c0b209b208a4d2fc6221b311..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU}R)w=I50cvRAR!39e^gXlOX#@S)&`#vhSCCa3-d)UWx!?)$R;0rfuh#>NZ` zT>nh}m%dN^&-Ksf-LBfxSKPG={K>8Q_U-N$vl780z JrvF{x`Ta9=>?NBxrp~ zO5n_ghs^f&%ttg>7|p&o7+#&%wQ1^kmnZC&t)~t*L+F_p=?6$dP_+Gl- P1ag39teDx@Ie3w)$Il3`T043kcFL@nSnvzgTjLY z2g<(r|Lp(C_wU081_m}Zc}X>UhkDO?hkCzykp6}S2cQWM=vS{`FE5YKukgU(KwDe= OPye5N|2Tep_y7PVA1V?6 diff --git a/gfx/icon/caterpillar.png b/gfx/icon/caterpillar.png new file mode 100644 index 0000000000000000000000000000000000000000..85558104b4b469ef865abe96497333ea39d032b8 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QfZzpjv*DdYr6@S5?0zopr0JRG~jsO4v literal 0 HcmV?d00001 diff --git a/gfx/icon/charmander.2bpp b/gfx/icon/charmander.2bpp deleted file mode 100644 index 4e2182636baf6de72195425a012f2d38c871d4ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU}xvx=inES7m*i`H?U`5XlQUa;Ba8UgC$S2-dX+gsCTc|w~!aGH}J1;ueY%9 z`q%aEQr#oFFE%GCI(`%sFrerckVoiW@IdL2>T?Tw|9bxldjpvM((h;gpRE66_sQ-| H4M;x#sJt+@ diff --git a/gfx/icon/charmander.png b/gfx/icon/charmander.png new file mode 100644 index 0000000000000000000000000000000000000000..3d85f13164ee96033d5adb58ebdf023a8c6d3d51 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&Qn{Wkjv*Ddl7H~C@cie$!OR(0 zukrDCsD#g)^dG`fI%hs8nmEjOxMGF&gaQH4v>z+33Z40oe)Uj78~a%hK4WB1S8-paIOqR; PkOMqj{an^LB{Ts59=17x literal 0 HcmV?d00001 diff --git a/gfx/icon/clefairy.2bpp b/gfx/icon/clefairy.2bpp deleted file mode 100644 index 6a5aed325070d624116ec7e58f5d33f191f947dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU|?WouCJ-hvon?#v{wOg84euyXSc7c=FE?dKPvVL<(~H!)Fp!+HJTD|Bd`L(@)m;zdBkTUh_PsMc!CnERTRYKr=wPIevij0{~}| BFs1+i diff --git a/gfx/icon/clefairy.png b/gfx/icon/clefairy.png new file mode 100644 index 0000000000000000000000000000000000000000..0017d9ddb9919be88db7e4c389769774d86286be GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QaPS3jv*Ddl7H~C@CZC&{$Jn5 z9K$_Bl5eALM%s@J7rN&^JkO6kgS; zZ?lioek=K}yMuw(qGpE1;saG%jZDG~WTLlb868P!39NT=o_L0tq5Hi5fu*-CJwWz* My85}Sb4q9e08=A7?EnA( literal 0 HcmV?d00001 diff --git a/gfx/icon/diglett.2bpp b/gfx/icon/diglett.2bpp deleted file mode 100644 index 6a997c1cb495eb9defa79be7dcf8ace9bd331f94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU|?Wo=HVBR7m-)6SGNap85$ZA9teDx@PXq8#}9RT1t7GxuXnKr%Yno=e%So^ f_iWD|kXjIc=obR&S47eu0Mvitha#H(6KMJYX|^UQ diff --git a/gfx/icon/diglett.png b/gfx/icon/diglett.png new file mode 100644 index 0000000000000000000000000000000000000000..307181f71ace911d256ac61b6d21ef758d068a89 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QXZZzjv*Ddl7H~C@CZC=ww;hr z`tSS)brTkk9bJFYe@IAWo&Ru=(XZuD2R{?zAD-pAX3UbbGm!XTtT40b@*W5A8I_7_ c44M{HGOP>ruPjLq`vfxE)78&qol`;+0JbJ8_5c6? literal 0 HcmV?d00001 diff --git a/gfx/icon/egg.2bpp b/gfx/icon/egg.2bpp deleted file mode 100644 index 03a623777279fb21410054e000afd927b21d839e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQz00Dk}c>#L`dxd%jFc(N1IItk$g24rYdWU)kkc_+l4?i%aZs<)M=uk4*Z{vs~dwP&LQL%&Q>+hOA5USXRutD(O+P!QGIxlR@%l;#Awi|ASZm zlKhwL*m2TfuYi(-%Ma$GVNDzhPX6a-V<`Reuw8FVdQ&MBb@ E04%9E)Bpeg literal 0 HcmV?d00001 diff --git a/gfx/icon/equine.2bpp b/gfx/icon/equine.2bpp deleted file mode 100644 index 8853b5bdd7d243ea4ad11d327272625b77be12e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU}lz)w^x@D*09&J)U#$_IB>w?$Dbz_Cq({~%qh8}VXtDZZmVQ3C@&-@C&a@e z@<-**lRYkfI(~RmRCpK|FaY)Q@Jj$qurUUi0Mc*pK>}!k%^8phde#sVgrWLN?m$d9 H0o4xx9PTS= diff --git a/gfx/icon/equine.png b/gfx/icon/equine.png new file mode 100644 index 0000000000000000000000000000000000000000..b3da7181b58e1fafff5655db886bcdf5eb434b4e GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QfZzpjv*Ddl7H~C@cg&`@IU>> zVX1`kA67Q5od59rC5`H~{zZ!ac;rou8(J2%+fR8d#i3#&(&(~awf*7w0)f?S_6OY? zk30(g#`FKDJwtEP?CD3US3|`-dtNo z=Hh>?e`o$k{P^+X%bzz_EG!s+fQ^ll-@x9d{@m|xzd`(jgc(0%{uuo$zMp@80^Ef7 U`uuPU3(o&A6Mp^s_DV(u0EOB=LjV8( diff --git a/gfx/icon/fighter.png b/gfx/icon/fighter.png new file mode 100644 index 0000000000000000000000000000000000000000..9deab976ffbefd45aab89d2e6a96a262a8965f53 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QdOQVjv*DdO3&=(J!Bxk@bK}& zrc(?4NH%!RQJPrLs{BT-+x14nLK&`Yg)4L=mw1%KR33Hz>*l+1l8c!KM-$KD4PDzF z3*_$KQ?~!B&*2*r=3bg|O`1z0&EoUEcXA?gdAq+mukKJ}Utg(J?kMZex9F+8mE+;p e`}R%ry(s^x-h?k~Lf<2hYdl^3T-G@yGywotp+=nm literal 0 HcmV?d00001 diff --git a/gfx/icon/fish.2bpp b/gfx/icon/fish.2bpp deleted file mode 100644 index e99315b5234a63d5ea8ace18d5a51df228b14ba9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU}9otWoMC=SFl&G_bX%ogNB9!4hIgXJ(K(8SDGJ~SeF>5XfGkp&d$KV_o?sG zyifCfP5buXK|=#bF(V^06RLi&Zii#X^j^t*@+-{?Osq%Nf9})0s%vEzK0x#X0ApAy ASO5S3 diff --git a/gfx/icon/fish.png b/gfx/icon/fish.png new file mode 100644 index 0000000000000000000000000000000000000000..35dbb1d2f6ab5ccd7781d4f172b701b4895d1ae1 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QJyZ2Ar-fhfAF*L{I_rJ5LS3J zx4x_`z1tuQmsdt&# zc#Dr=t78w7aJ|D3^$9mt*0of&J3iBFJ`>Gjny;#TVb27y)CHBg4mSm+{m*#D$S^-S V^my$B2Op3-JYD@<);T3K0RXFBKqLSF literal 0 HcmV?d00001 diff --git a/gfx/icon/fox.2bpp b/gfx/icon/fox.2bpp deleted file mode 100644 index bbe04c03db336969510506ad137ab86b4cc070b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU|>*Ch_3c8u~D|ysP_SK83Y6}Do*V9An+~h=lOaEdu4kIb$bbMIbnW&28N&f zf5qRGwfsq$^JB(?2O!lT{qgn5b@dMQPXC{Q_zn&W9xO=sQ1DIcr~dzj`UrbNJ%oP! PyXpIm$vnxK0?`iulIoIDdf0l=bGG&kmm@TK*f$@XY!npW(nfA!5rT1Lok%N`h=_LmeKqgh^l6 lBN_x$bNH9zv#*P1vNLQe3racj>o_0CS)Q(bF6*2UngC8FNXY;I literal 0 HcmV?d00001 diff --git a/gfx/icon/geodude.2bpp b/gfx/icon/geodude.2bpp deleted file mode 100644 index ff8bdfdebccf66fb05f2f7c05504e49ba8b3f535..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzC@46+yZ=vc&79BkAIyKlz`)0M`R+&iQ+AyH8UGvpuS>R57LXT~=iz5&W&i@W ze=dJGew_GW@ZrD#5FZ4rtbp?o)%#G zpff?>X_UaB0+pcy+`AJk2*%zNn1u-f); z{k4YwJpb)KFmq1O%s9f%ELYbyIgWd>WM7poPnyLFsYhoNxXk@C7Ov(#60qkPBZHBU Vdqn^KkQ9(RJYD@<);T3K0RW;;JNWZvT;H0M1d{Uk;_;*B zPuIVqI;T1(8ym1{W@dhVd3iZ`pefd10U*)R;&*D_C;O*4(T4iPdFgT1R*Z}wIsK2z Sem$uywkt{f}~GA&>| zyj`>(xlwZ^?Ibo@8UFdd*@0(8W~Ru5img%%N434@zkI(a2IN#vS3j3^ HP6lU}Mef>N!7q4Z>FVn%6&GyJylncxwDdFY{mdKI;Vst E02k;}*#H0l literal 0 HcmV?d00001 diff --git a/gfx/icon/humanshape.2bpp b/gfx/icon/humanshape.2bpp deleted file mode 100644 index 4dbbac0c854f427a67db5c3f41ce979cdd92b3db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzu(r0hk(ZDck{7VEtoLDHxO3-^%@2tm9zQrLX8f_K_BXH>l;`A^5tkR{;bCC7 w_et(k&z}h&EMELLVPL=j1PJ|dlJ+*p`fKL=GphEl@Heza*3a{&;|D@N0GpmH=>Px# diff --git a/gfx/icon/humanshape.png b/gfx/icon/humanshape.png new file mode 100644 index 0000000000000000000000000000000000000000..f5d0b9290c59c43dbbc9be9aa6231f1172046fbf GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QW>5ujv*Ddl7H~C@W}I2{E)OO z(0!2pWAWBQ^B$gGq^GbkYpU&G_Om?IZNUni!Av^cl6Ea^I%z+Il}?@i5byHD{_y;3 z3JZ3z#(d-X|I_|YI)ilU{XO=xBojK13VinKY-8G~xagb3S!RZ7x83GE{&Mm;$Zk(p KKbLh*2~7an`aV1W literal 0 HcmV?d00001 diff --git a/gfx/icon/item.2bpp b/gfx/icon/item.2bpp deleted file mode 100644 index 5d47aba7a..000000000 --- a/gfx/icon/item.2bpp +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gfx/icon/item.png b/gfx/icon/item.png new file mode 100644 index 0000000000000000000000000000000000000000..a47d5500935789d297f07561fb0013db6965e08d GIT binary patch literal 82 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}ekYHf= z!t=u-JZM?7R>9@Eopb-|3mi~Obi!d Ue7`7O(+4}l)78&qol`;+0F6RFH~;_u literal 0 HcmV?d00001 diff --git a/gfx/icon/jigglypuff.2bpp b/gfx/icon/jigglypuff.2bpp deleted file mode 100644 index bc00c535d41aea846fcb060bfd74bc4d5ad49492..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzC@!w|sZX(2s`srAtB+$~ICt)!QQfgWF8?WjSnw(js45B+(Jamcuq!EP@2WTD+_ogUX5C~wdvu7RiS5jw$R>FEg#HYqS3&|3>nFn<7UNukBW+Y{SFqYeoMGI3G-s=c)K{a2W%GSA~~PDbqK3 Oko}&nelF{r5}E+)e?21r literal 0 HcmV?d00001 diff --git a/gfx/icon/lapras.2bpp b/gfx/icon/lapras.2bpp deleted file mode 100644 index 47684bae366ed52f0f547b39a22f5a50fd92de67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmb1R0~RA3na+;n51N3DqT>9UPYb=RaibW(p`frB&BvAG}q}xQ0o1VU)InU#pcagOH+* z!^R5cdex++(xbQzGb24M@q`-4YV*DV7 OFnGH9xvXJ`mp_~ zOy(XZ3-f2wP6(+vr*KV|dwigGhi1$ypJeN`4_r5~)PMcqVE;q-THF!V^Kr@#_~Y-E z$!Mw<8*Y&7oI;+`I(KlKAvsgr?ROmfjD^O|IvD~I=$}P5>o5`yj&pyhO jy7y>auo>%B&HVTLMoNAhd2i2c0=dc4)z4*}Q$iB}9NFVdQ&MBb@07?`nAOHXW literal 0 HcmV?d00001 diff --git a/gfx/icon/monster.2bpp b/gfx/icon/monster.2bpp deleted file mode 100644 index ce8863cd4431467cf946f4d9e82b774dfa873c62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQ%tgox~Gtd{2SGQBJmz8U1_*ZwYi06yOk0&)Oe|A*pTZh+7{$E}pFQIQ^t}P?; z<<2X+lmFkz{gC)#^X7_$1p@;kk_iv~GcX{V!2W;kzy9ChHOBVl77+bA>p$LqWq0P! I8ySdx0B5l|IsgCw diff --git a/gfx/icon/monster.png b/gfx/icon/monster.png new file mode 100644 index 0000000000000000000000000000000000000000..f97c67b645696568dfc6c9e750e1379fdc652e96 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QdOQVjv*Ddl7IX^{?Gm}<1)6i zwqPgSZb`e=wr|FN3VFAr|9Elb#rY40CRgS^-nw!+v}ZyT!yx``!_$Y{k-=7!+(cr-R;zC-RqodT`ep?a{C_D zJlXfC?$EwPGBO}O1A~Nwt*X6pdTe@Zy}P|Kh`(papCiw9J=^u~(Vru>>T=??>UPTV c!g4}9JPZtbo>aWp^Q7j;j}sLh1_lfa0NtlGApigX diff --git a/gfx/icon/moth.png b/gfx/icon/moth.png new file mode 100644 index 0000000000000000000000000000000000000000..f44440f5c802d08f78458999395c532e81182c50 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QVpIijv*Ddl7H~C@FYAsApiR? zPZXPt6wfMIFF^sP)s2~~hgY)3bW8ee<%?;JicQ7!^=$T>e?pDb)6J=6vBKtspH0Sv4wSQ_Pu`J1ggTe~DWM4f*m*}u literal 0 HcmV?d00001 diff --git a/gfx/icon/oddish.2bpp b/gfx/icon/oddish.2bpp deleted file mode 100644 index c9c7665eda08c3e3240975f3207302f9919d77b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQz00BcouWGk?C3{JE5U-)Z?U?3!!~aVEeEzVr^YhEg$;mAEDd8 H0HhxP-~B8l diff --git a/gfx/icon/oddish.png b/gfx/icon/oddish.png new file mode 100644 index 0000000000000000000000000000000000000000..c069bd4447f4e5547de4017122df71fc0b412814 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QYoG;jv*DdTF-3cY%maLeJC%h z;LBFPs&1ikiBsy)0mj1lOYAL_xo%Y+ZGLQPw?@{#Be3MA<*_H0%Ssm?n-L%{Gc8kC zV2iX2*Sos4U&1H0P7e}vpZoku!&XK^z496SpWNR*eLPnr-hG+&ypV+82ZJ|89kA?VFA+*02hrh Ag#Z8m diff --git a/gfx/icon/pikachu.png b/gfx/icon/pikachu.png new file mode 100644 index 0000000000000000000000000000000000000000..7b7d23dbdad2eaa1a4d85a514b68b5075a55edbd GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QpKJwjv*Ddl7H~C@F?)8{9D5? ziQPnEhJ?rzNx!vG7teq2^gcQ7;pI)PXL**Vt&2EQkaIPte!&s1YK82R^%Exj=b0}h z_CNhc@_BwU)|m(sCC>hYP4$GzvkITZn$LV@pPAl&)`lVW WY^YHD#J@=(XL!2$xvX{85$ZMBzy??Gw0u@e^&MB^%?cq_6G9u78W46f3yBY w{hRg2s* z&vo{{q@897LuVLoT^lnGPq!rBny3Y53RXBWdt{U{aIz}AKD>(cFHgP1j5m^YH{=^6 z8;-9ytgzU`!7a0)=MsbD(#9l_X4}K{b#)8OejoO5V`OmL<$pwGr+^m7Voz5;mvv4F FO#nqLGq(T$ literal 0 HcmV?d00001 diff --git a/gfx/icon/serpent.2bpp b/gfx/icon/serpent.2bpp deleted file mode 100644 index 4be1a62aa798b0f350203a4342fe6f97d61cc079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU}R)sW@qQ%ml2i|<>O>vXlQUa@Zf>K2a6LGD+(sCuygTq^9sv|Nb_^BvoJF& xJP7!3VZ#XvjT;{X9w;0*zyJiuCV=?JCh&2BOc0lZn!sK#0c6698Bh}*00881BxC>p diff --git a/gfx/icon/serpent.png b/gfx/icon/serpent.png new file mode 100644 index 0000000000000000000000000000000000000000..de575f088b89e386d0d6edc62bc12b06cff6ab15 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QW2gmjv*Ddl7H~C@cjROgSoT+ zpTi>t;|T)1KhJ+i&zxd=c>Xz+>bC#0Bpo&`KIq_dfz`uf1w-oMX-uiX%8i?%v>TF^ ti!pcd|8Zc-kvrM;@8pFo#|=bQ@G{8dg-a}YXH^HX%hT1*Wt~$(697G3Glc*E literal 0 HcmV?d00001 diff --git a/gfx/icon/shell.2bpp b/gfx/icon/shell.2bpp deleted file mode 100644 index 9e9dd787cc995b64bf8499f72bfd1e49ec654335..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU|?Wllb5ttuu-mdDfa+!843!1bo_Do$MlQs7hirret^A#y@HG|KMylA1H&Da zdrG_9YFfVV%&2(q0Hm6MfuCPqz+R!!t=uC&0L1_B;fKc^6_EaWY7pHv#`1Ff{2=`> M-E(Sw`~c|(062FjrvLx| diff --git a/gfx/icon/shell.png b/gfx/icon/shell.png new file mode 100644 index 0000000000000000000000000000000000000000..4daf2763424651d4352a1a0780266dace5988283 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QiYx_jv*Ddl7H~C@CZEm(DjL1? ?' -><< ? ? pp \ No newline at end of file diff --git a/gfx/icon/slowpoke.png b/gfx/icon/slowpoke.png new file mode 100644 index 0000000000000000000000000000000000000000..221f3f7a52b8334b8369b82483c39a765859e018 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&Qgxm#jv*DdYR}km9dZzGc(^=a zZ|f6|dC7YYvXwXlMLiQ~ntD}EX~~IsPA;?Oq?NyJ{Hnh9Y_?pDiszy1{U2?K0|}ed{ZP?o4Zz?nzZKC^oZLWSMSp%{^$KCXY=IGlN&b}fB>%F*xp8707?IuKQ=!&>J$Di0P3%S>u3AVimV?1T~0L# diff --git a/gfx/icon/snorlax.png b/gfx/icon/snorlax.png new file mode 100644 index 0000000000000000000000000000000000000000..f2c1b0b74f317345b5958d66c217ec82fa0ad854 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QaPS3jv*DdO3!TMY<7@w`{%G(2E Nzo)C8%Q~loCIE`&Jf8pn literal 0 HcmV?d00001 diff --git a/gfx/icon/squirtle.2bpp b/gfx/icon/squirtle.2bpp deleted file mode 100644 index b6558faa51ac32ba6a064b4faaf4ee5037b76868..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU}omw7m!!6SFu;H7nWyWIB>w=1IG`QKPrD%{+#$>Veen5qLJ+^9A>n}l&ml2jzv{$pUuwY;) zx$|Sj3yTvKEq_vKWMmk?0LcU&kN}biM*fw0)^gI~vdVVq_8|SA=9S#3xbb4gk(wue GK>7iHqbWfE diff --git a/gfx/icon/staryu.png b/gfx/icon/staryu.png new file mode 100644 index 0000000000000000000000000000000000000000..52361c780c666f01938156adbad64713d56d6fb1 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&Qn{Wkjv*Ddl7H~C@cjROgSpfH zpTi^N4hy9}^B*<`aN8f&WA^4ix)Pe|9HGrz=LJ$E#n#lFI&@T+Lo-gDu(O)5&F^^e!QYFLbOa8M?d&)mX?f+%uMWT{5<>|{5 b!p_3X#LC9Y1<^lePD8^1hX)BC3?TXebWJiE diff --git a/gfx/icon/sudowoodo.png b/gfx/icon/sudowoodo.png new file mode 100644 index 0000000000000000000000000000000000000000..d115356bb5f020a0c6697db6306682b00685d32c GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QeB=djv*Ddl7IaF&u@SDzrEW* z9{C=tz8Ws$Xi4^OZ=N} u!jtx+{uEord(G+@mB(i_w%lSW`ONV4kKg@%fy@UW*Lk}7xvXS!YCcJxi*ns&0hsozH76~kz&lnkO0@8zTPbj?$GRo7{ K&t;ucLK6TM2O!-5 literal 0 HcmV?d00001 diff --git a/gfx/icon/voltorb.2bpp b/gfx/icon/voltorb.2bpp deleted file mode 100644 index b75cafe3d802a8e2e71893265aa66be47e93a5b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQzU|?Wo=HVBV6O_}j*E0rk84esU_|Q?&QDO3@W?NA}m5W|*~T{y59c`_ Date: Fri, 9 Jun 2017 22:01:10 +0100 Subject: [PATCH 08/46] =?UTF-8?q?Replace=20=E2=80=98jp=20[hl]=E2=80=99=20w?= =?UTF-8?q?ith=20=E2=80=98jp=20hl=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The former is arguably misleading (as you don’t access the memory location in hl to retrieve the jump location), and is consequently deprecated in newer versions of rgbds. This fix silences these deprecation warnings. --- audio/engine.asm | 4 ++-- battle/ai/items.asm | 2 +- battle/ai/redundant.asm | 2 +- battle/anim_commands.asm | 2 +- battle/bg_effects.asm | 10 +++++----- battle/core.asm | 2 +- battle/effect_commands.asm | 2 +- battle/objects/functions.asm | 4 ++-- engine/billspc.asm | 14 +++++++------- engine/card_flip.asm | 6 +++--- engine/credits.asm | 2 +- engine/crystal_intro.asm | 6 +++--- engine/debug.asm | 6 +++--- engine/events.asm | 2 +- engine/intro_menu.asm | 4 ++-- engine/map_objects.asm | 2 +- engine/mon_icons.asm | 2 +- engine/namingscreen.asm | 6 +++--- engine/options_menu.asm | 2 +- engine/pack.asm | 14 +++++++------- engine/pokedex.asm | 10 +++++----- engine/pokegear.asm | 10 +++++----- engine/printer/serial.asm | 4 ++-- engine/radio.asm | 2 +- engine/slot_machine.asm | 12 ++++++------ engine/sprite_anims.asm | 6 +++--- engine/startmenu.asm | 6 +++--- engine/timeofdaypals.asm | 2 +- engine/trade/animation.asm | 6 +++--- engine/unown_puzzle.asm | 2 +- event/field_moves.asm | 2 +- event/magnet_train.asm | 2 +- event/mom.asm | 2 +- gfx/mail.asm | 2 +- home.asm | 2 +- home/farcall.asm | 2 +- home/menu.asm | 4 ++-- home/text.asm | 2 +- items/item_effects.asm | 2 +- macros.asm | 2 +- main.asm | 2 +- misc/battle_tower_5c.asm | 8 ++++---- misc/fixed_words.asm | 2 +- misc/gfx_41.asm | 2 +- misc/mobile_42.asm | 2 +- misc/mobile_45.asm | 8 ++++---- misc/mobile_45_sprite_engine.asm | 2 +- misc/mobile_46.asm | 2 +- misc/mobile_5c.asm | 2 +- misc/mobile_5f.asm | 4 ++-- predef/cgb.asm | 4 ++-- predef/crystal.asm | 2 +- predef/sgb.asm | 2 +- rst.asm | 2 +- tilesets/animations.asm | 2 +- trainers/read_party.asm | 2 +- 56 files changed, 112 insertions(+), 112 deletions(-) diff --git a/audio/engine.asm b/audio/engine.asm index 2cc921bd0..57418246b 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -229,7 +229,7 @@ UpdateChannels: ; e8125 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .ChannelFnPtrs: dw .Channel1 @@ -1389,7 +1389,7 @@ ParseMusicCommand: ; e870f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e8720 diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 4405ae756..f8c97578a 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -211,7 +211,7 @@ AI_TryItem: ; 38105 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .callback pop de pop hl diff --git a/battle/ai/redundant.asm b/battle/ai/redundant.asm index da71d0ece..e3dda8c4b 100755 --- a/battle/ai/redundant.asm +++ b/battle/ai/redundant.asm @@ -11,7 +11,7 @@ AI_Redundant: ; 2c41a ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Moves: ; 2c42c dbw EFFECT_DREAM_EATER, .DreamEater diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 957b2a066..958dcfe40 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -347,7 +347,7 @@ RunBattleAnimCommand: ; cc25f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; cc2a4 diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index b7f415770..22807f77d 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -75,7 +75,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BattleBGEffects: ; c805a (32:405a) dw BattleBGEffect_End @@ -161,7 +161,7 @@ BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BattleBGEffects_IncrementJumptable: ; c80e5 (32:40e5) ld hl, BG_EFFECT_STRUCT_JT_INDEX @@ -2059,7 +2059,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00) .cgb ld de, .Jumptable call BatttleBGEffects_GetNamedJumptablePointer - jp [hl] + jp hl .Jumptable: dw .cgb_zero @@ -2421,7 +2421,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) ld de, .Jumptable_DMG call BatttleBGEffects_GetNamedJumptablePointer pop de - jp [hl] + jp hl .Jumptable_DMG: dw .zero_dmg @@ -2484,7 +2484,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) ld de, .Jumptable_CGB call BatttleBGEffects_GetNamedJumptablePointer pop de - jp [hl] + jp hl .Jumptable_CGB: ; c8ddd (32:4ddd) dw .zero_cgb diff --git a/battle/core.asm b/battle/core.asm index dec315ab8..be6e24eca 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -4331,7 +4331,7 @@ SpikesDamage: ; 3dc23 jp WaitBGMap .hl - jp [hl] + jp hl ; 3dc5b PursuitSwitch: ; 3dc5b diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index a74dea632..54af56a10 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -113,7 +113,7 @@ DoMove: ; 3402c jr .ReadMoveEffectCommand .DoMoveEffectCommand: - jp [hl] + jp hl ; 34084 diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 4ed9b67b7..debfcf04d 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -9,7 +9,7 @@ DoBattleAnimFrame: ; ccfbe ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; ccfce .Jumptable: @@ -4085,7 +4085,7 @@ BattleAnim_AnonJumptable: ; ce71e (33:671e) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c) ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX diff --git a/engine/billspc.asm b/engine/billspc.asm index b9b51f850..4d8bf1c48 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -39,7 +39,7 @@ _DepositPKMN: ; e2391 (38:6391) ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl .Jumptable: ; e23df (38:63df) @@ -147,7 +147,7 @@ _DepositPKMN: ; e2391 (38:6391) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BillsPCDepositJumptable: ; e24a1 (38:64a1) @@ -306,7 +306,7 @@ _WithdrawPKMN: ; e2583 (38:6583) ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl .Jumptable: ; e25d2 (38:65d2) @@ -415,7 +415,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .dw ; e2699 (38:6699) #mark dw .withdraw ; Withdraw @@ -556,7 +556,7 @@ _MovePKMNWithoutMail: ; e2759 ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl ; e27ac .Jumptable: ; e27ac @@ -678,7 +678,7 @@ _MovePKMNWithoutMail: ; e2759 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e2881 .Jumptable2: ; e2881 @@ -2014,7 +2014,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld l, a ld de, .dw_return push de - jp [hl] + jp hl ; e322a .dw_return ; e322a diff --git a/engine/card_flip.asm b/engine/card_flip.asm index 0479e8248..cdf2be010 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -76,7 +76,7 @@ _CardFlip: ; e00ee (38:40ee) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e01a0 (38:41a0) .Jumptable: ; e01a0 @@ -652,7 +652,7 @@ CardFlip_BlankDiscardedCardSlot: ; e0534 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e0553 .Jumptable: ; e0553 @@ -829,7 +829,7 @@ CardFlip_CheckWinCondition: ; e0637 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e0643 .Jumptable: ; e0643 diff --git a/engine/credits.asm b/engine/credits.asm index fad8a615e..b2a1c1e93 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -263,7 +263,7 @@ Credits_Jumptable: ; 109926 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 109937 diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 29bb0934f..e324ed476 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -125,7 +125,7 @@ PlaceGameFreakPresents: ; e4670 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e467f .dw ; e467f @@ -222,7 +222,7 @@ GameFreakLogoJumper: ; e46ed (39:46ed) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl GameFreakLogoScenes: ; e46fd (39:46fd) dw GameFreakLogoScene1 @@ -438,7 +438,7 @@ IntroSceneJumper: ; e490f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e491e IntroScenes: ; e491e (39:491e) diff --git a/engine/debug.asm b/engine/debug.asm index 78fc52489..9c2bb35c2 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -305,7 +305,7 @@ Function81a74: ; 81a74 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .asm_81a9a call Function81eca @@ -611,7 +611,7 @@ Function81cc2: ; 81cc2 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .asm_81cdf ld a, $4 @@ -1353,7 +1353,7 @@ Function822f0: ; 822f0 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 82301 .dw ; 82301 diff --git a/engine/events.asm b/engine/events.asm index e7598b595..2eb92d1a1 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -609,7 +609,7 @@ TryObjectEvent: ; 969b5 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .nope_bugged ; pop bc diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 3e4257ab7..8e3c90204 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1064,7 +1064,7 @@ StartTitleScreen: ; 6219 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 626a .dw @@ -1117,7 +1117,7 @@ TitleScreenScene: ; 62a3 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 62af .scenes diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 3f63030ec..d5fa84642 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1955,7 +1955,7 @@ JumpMovementPointer: ; 505e ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 5065 ContinueReadingMovement: ; 5065 diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 7e8136235..d66ea6fac 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -33,7 +33,7 @@ LoadMenuMonIcon: ; 8e83f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8e854 diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index d80b4717b..4a7ca301a 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -70,7 +70,7 @@ NamingScreen: ; 116c1 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1172e @@ -405,7 +405,7 @@ NamingScreenJoypadLoop: ; 11915 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 11977 @@ -1166,7 +1166,7 @@ INCBIN "gfx/icon/mail2.2bpp" ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 12017 (4:6017) dw .init_blinking_cursor diff --git a/engine/options_menu.asm b/engine/options_menu.asm index 68c1883ee..ec41288ff 100755 --- a/engine/options_menu.asm +++ b/engine/options_menu.asm @@ -90,7 +90,7 @@ GetOptionPointer: ; e42d6 ld a, [hli] ld h, [hl] ld l, a - jp [hl] ; jump to the code of the current highlighted item + jp hl ; jump to the code of the current highlighted item ; e42e5 .Pointers: diff --git a/engine/pack.asm b/engine/pack.asm index 19b7fccbf..8a63d22e5 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -23,7 +23,7 @@ Pack: ; 10000 ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10030 @@ -144,7 +144,7 @@ Pack: ; 10000 ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10124 (4:4124) .MenuDataHeader1: ; 0x10124 @@ -306,7 +306,7 @@ Pack: ; 10000 ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10249 (4:4249) MenuDataHeader_UsableKeyItem: ; 0x10249 @@ -689,7 +689,7 @@ BattlePack: ; 10493 ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 104c3 @@ -846,7 +846,7 @@ TMHMSubmenu: ; 105dc (4:45dc) ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10601 (4:4601) .UsableMenuDataHeader: ; 0x10601 @@ -997,7 +997,7 @@ DepositSellPack: ; 106be ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 106d1 @@ -1144,7 +1144,7 @@ TutorialPack: ; 107bb ld a, [wJumptableIndex] ld hl, .dw call Pack_GetJumptablePointer - jp [hl] + jp hl ; 107e1 diff --git a/engine/pokedex.asm b/engine/pokedex.asm index e61a24964..569bdbb0b 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -182,7 +182,7 @@ Pokedex_RunJumptable: ; 4010b ld a, [wJumptableIndex] ld hl, .Jumptable call Pokedex_LoadPointer - jp [hl] + jp hl .Jumptable: ; 40115 (10:4115) @@ -366,7 +366,7 @@ Pokedex_UpdateDexEntryScreen: ; 40258 (10:4258) ld a, [wDexArrowCursorPosIndex] ld hl, DexEntryScreen_MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .return_to_prev_screen ld a, [LastVolume] @@ -545,7 +545,7 @@ Pokedex_UpdateOptionScreen: ; 403be (10:43be) ld a, [wDexArrowCursorPosIndex] ld hl, .MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .return_to_main_screen call Pokedex_BlackOutBG @@ -647,7 +647,7 @@ Pokedex_UpdateSearchScreen: ; 40471 (10:4471) ld a, [wDexArrowCursorPosIndex] ld hl, .MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .cancel call Pokedex_BlackOutBG @@ -1621,7 +1621,7 @@ Pokedex_OrderMonsByMode: ; 40bdc ld a, [wCurrentDexMode] ld hl, .Jumptable call Pokedex_LoadPointer - jp [hl] + jp hl .Jumptable: ; 40bf0 (10:4bf0) diff --git a/engine/pokegear.asm b/engine/pokegear.asm index d180ee875..c6ea8ed4f 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -235,7 +235,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8) ld l, a ld de, .return_from_jumptable push de - jp [hl] + jp hl .return_from_jumptable call Pokegear_FinishTilemap @@ -431,7 +431,7 @@ PokegearJumptable: ; 90f04 (24:4f04) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 90f13 (24:4f13) dw PokegearClock_Init @@ -1217,7 +1217,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Cancel: ; 913f1 ld hl, PokegearText_WhomToCall @@ -1484,7 +1484,7 @@ UpdateRadioStation: ; 9166f (24:566f) ld l, a ld de, .returnafterstation push de - jp [hl] + jp hl .returnafterstation ld a, [wPokegearRadioChannelBank] @@ -2043,7 +2043,7 @@ PlayRadio: ; 91a53 ld l, a ld de, .jump_return push de - jp [hl] + jp hl .jump_return push de diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm index da1c334ed..37ed2990b 100755 --- a/engine/printer/serial.asm +++ b/engine/printer/serial.asm @@ -26,7 +26,7 @@ PrinterJumptableIteration: ; 84022 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 84031 @@ -468,7 +468,7 @@ _PrinterReceive:: ; 842db ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 842ea diff --git a/engine/radio.asm b/engine/radio.asm index ce3bc7942..99408af48 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -25,7 +25,7 @@ PlayRadioShow: ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl RadioJumptable: dw OaksPkmnTalk1 ; $00 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index ea842ea9c..93be28d9a 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -796,7 +796,7 @@ Function92bd4: ; 92bd4 (24:6bd4) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 92be4 (24:6be4) @@ -1311,7 +1311,7 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94 ld l, a ld de, .return push de - jp [hl] + jp hl .return ld a, [wFirstTwoReelsMatching] @@ -1422,7 +1422,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d ld l, a ld de, .return push de - jp [hl] + jp hl .return ld a, [wSlotMatched] @@ -1855,7 +1855,7 @@ SlotPayoutText: ; 93158 (24:7158) ld l, a ld de, .return push de - jp [hl] + jp hl .return ld hl, .Text_PrintPayout @@ -1958,7 +1958,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 9322d (24:722d) @@ -2059,7 +2059,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 932bc (24:72bc) diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 0e25cafdf..a8755b832 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -9,7 +9,7 @@ DoAnimFrame: ; 8d24b ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8d25b .Jumptable: ; 8d25b (23:525b) @@ -134,7 +134,7 @@ DoAnimFrame: ; 8d24b .four ; 8d302 (23:5302) call .AnonymousJumptable - jp [hl] + jp hl ; 8d306 (23:5306) ; Anonymous dw (see .AnonymousJumptable) @@ -418,7 +418,7 @@ DoAnimFrame: ; 8d24b .sixteen ; 8d483 (23:5483) call .AnonymousJumptable - jp [hl] + jp hl ; 8d487 (23:5487) ; Anonymous dw (see .AnonymousJumptable) diff --git a/engine/startmenu.asm b/engine/startmenu.asm index fa61d99cb..a935b8a07 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -55,7 +55,7 @@ StartMenu:: ; 125cd ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .MenuReturns: dw .Reopen @@ -227,7 +227,7 @@ StartMenu:: ; 125cd ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 127ef .MenuString: ; 127ef @@ -701,7 +701,7 @@ PokemonActionSubmenu: ; 12a88 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .nothing ld a, 0 diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index e9b19c6f7..263a83fc1 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -250,7 +250,7 @@ GetTimePalette: ; 8c117 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8c126 .TimePalettes: diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm index d90f45a82..fa351ba3d 100755 --- a/engine/trade/animation.asm +++ b/engine/trade/animation.asm @@ -232,7 +232,7 @@ DoTradeAnimation: ; 29082 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 290af .JumpTable: ; 290af @@ -549,7 +549,7 @@ TradeAnim_TubeAnimJumptable: ; 29281 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 2928f .Jumptable: ; 2928f @@ -1173,7 +1173,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 29686 .Jumptable: ; 29686 (a:5686) diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 8d46a02a6..a1fed2520 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -183,7 +183,7 @@ UnownPuzzleJumptable: ; e12ca ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e12d9 .Jumptable: ; e12d9 diff --git a/event/field_moves.asm b/event/field_moves.asm index c1b3bc236..82660da2f 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -169,7 +169,7 @@ OWCutJumptable: ; 8ca0c ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8ca1b diff --git a/event/magnet_train.asm b/event/magnet_train.asm index ccc41a59d..75bd12cd7 100755 --- a/event/magnet_train.asm +++ b/event/magnet_train.asm @@ -299,7 +299,7 @@ MagnetTrain_Jumptable: ; 8cdf7 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8ce06 .Jumptable: ; 8ce06 diff --git a/event/mom.asm b/event/mom.asm index 4002f69d2..80513e5fb 100644 --- a/event/mom.asm +++ b/event/mom.asm @@ -28,7 +28,7 @@ Special_BankOfMom: ; 16218 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 16242 .dw ; 16242 diff --git a/gfx/mail.asm b/gfx/mail.asm index fa0736ca6..575fe9ef5 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -107,7 +107,7 @@ ReadAnyMail: ; b9237 ld de, .done pop bc push de - jp [hl] + jp hl .done ret ; b92f8 diff --git a/home.asm b/home.asm index 89b1b3d42..cf9a456db 100644 --- a/home.asm +++ b/home.asm @@ -152,7 +152,7 @@ INCLUDE "home/sram.asm" ; Register aliases _hl_:: ; 2fec - jp [hl] + jp hl ; 2fed _de_:: ; 2fed diff --git a/home/farcall.asm b/home/farcall.asm index 944087465..27649f30e 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -50,5 +50,5 @@ ReturnFarCall:: ; 2d6e ; 2d82 FarJump_hl:: ; 2d82 - jp [hl] + jp hl ; 2d83 diff --git a/home/menu.asm b/home/menu.asm index 563ee9f99..53e4457e3 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -337,7 +337,7 @@ RunMenuItemPrintingFunction:: ; 1eda ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1eff InitMenuCursorAndButtonPermissions:: ; 1eff @@ -470,7 +470,7 @@ MenuJumptable:: ; 1fa7 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1fb1 GetMenuDataPointerTableEntry:: ; 1fb1 diff --git a/home/text.asm b/home/text.asm index a5ddf43c9..f7730319a 100644 --- a/home/text.asm +++ b/home/text.asm @@ -943,7 +943,7 @@ Text_START_ASM:: ; 14c9 bit 7, h jr nz, .not_rom - jp [hl] + jp hl .not_rom ld a, "@" diff --git a/items/item_effects.asm b/items/item_effects.asm index 7061909f6..c13568a5d 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -263,7 +263,7 @@ ParkBall: ; e8a2 ld l, a ld de, .skip_or_return_from_ball_fn push de - jp [hl] + jp hl .skip_or_return_from_ball_fn ld a, [CurItem] diff --git a/macros.asm b/macros.asm index c4fd73b3e..13aff261d 100644 --- a/macros.asm +++ b/macros.asm @@ -281,7 +281,7 @@ jumptable: MACRO ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl endm maskbits: macro diff --git a/main.asm b/main.asm index 385f865d7..693bec2f4 100644 --- a/main.asm +++ b/main.asm @@ -3214,7 +3214,7 @@ CatchTutorial:: ; 4e554 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .dw ; 4e564 (13:6564) dw .DudeTutorial diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index 09c827146..4d996167f 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -222,7 +222,7 @@ _BattleTowerBattle: ; 17022c ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 170249 .dw ; 170249 @@ -692,7 +692,7 @@ Function1704e1: ; 1704e1 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 17051f .dw ; 17051f @@ -947,7 +947,7 @@ BattleTowerAction: ; 170687 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 170696 @@ -1443,7 +1443,7 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .invalid ld a, $5 diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index 14ef91e9d..b471ff013 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -2516,7 +2516,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: dw .zero diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index e3a1a0375..952742ec1 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -240,7 +240,7 @@ CallInSafeGFXMode: ; 104177 ; 10419c ._hl_ ; 10419c - jp [hl] + jp hl ; 10419d diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 60f9e6d66..d08bc8882 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -377,7 +377,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 10828a .Jumptable: ; 10828a diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 10242b77e..41f106211 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -146,7 +146,7 @@ Function114243:: ; 114243 ld h, [hl] ld l, a pop de - jp [hl] + jp hl ; 11425c @@ -5397,7 +5397,7 @@ Function11659d: ; 11659d ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1165af @@ -6931,7 +6931,7 @@ Function117719: ; 117719 (45:7719) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl Jumptable_117728: ; 117728 (45:7728) dw Function117738 @@ -7419,7 +7419,7 @@ Function117ae9: ; 0x117ae9 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 0x117af8 dw Function117b06 diff --git a/misc/mobile_45_sprite_engine.asm b/misc/mobile_45_sprite_engine.asm index d0183b2ca..57c45e43c 100755 --- a/misc/mobile_45_sprite_engine.asm +++ b/misc/mobile_45_sprite_engine.asm @@ -380,7 +380,7 @@ Function1161b8: ; 1161b8 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1161c7 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 644989872..7d0003b13 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -5874,7 +5874,7 @@ Function11ad6e: ; 11ad6e ld a, [wJumptableIndex] ld hl, Jumptable_11ad78 call Function11b239 - jp [hl] + jp hl ; 11ad78 Jumptable_11ad78: ; 11ad78 diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index 5f72f32c7..ef9db89a8 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -373,7 +373,7 @@ Function171a36: ; 171a36 (5c:5a36) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl Jumptable_171a45: ; 171a45 (5c:5a45) dw Function171a95 diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 2ce71049f..47b85dcd8 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -1146,7 +1146,7 @@ Function17d711: ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl asm_17d721 call Function17e5af @@ -3746,7 +3746,7 @@ Function17f047: ; 17f047 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .finished scf diff --git a/predef/cgb.asm b/predef/cgb.asm index b0c3fdb46..5ac243963 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -25,7 +25,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59 ld l, a ld de, .ReturnFromJumpTable push de - jp [hl] + jp hl ; 8d79 .ReturnFromJumpTable: ; 8d79 @@ -491,7 +491,7 @@ _CGB07: ; 9122 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 912d Jumptable_912d: ; 912d diff --git a/predef/crystal.asm b/predef/crystal.asm index 8f542e5dd..9aa0fbdf2 100755 --- a/predef/crystal.asm +++ b/predef/crystal.asm @@ -17,7 +17,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile) ld l, a ld de, .done push de - jp [hl] + jp hl .done ret ; 49330 (12:5330) diff --git a/predef/sgb.asm b/predef/sgb.asm index 65a09756d..1d8184cc2 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -20,7 +20,7 @@ Predef_LoadSGBLayout: ; 864c ld l, a ld de, .Finish push de - jp [hl] + jp hl ; 866f .Jumptable: ; 866f diff --git a/rst.asm b/rst.asm index c54dc83e2..24c00a03a 100644 --- a/rst.asm +++ b/rst.asm @@ -28,7 +28,7 @@ SECTION "rst28",ROM0[JumpTable] ld h, [hl] ld l, a pop de - jp [hl] + jp hl ; SECTION "rst30",ROM0[$30] ; rst30 is midst rst28 diff --git a/tilesets/animations.asm b/tilesets/animations.asm index a3b0c4f06..51f95129c 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -32,7 +32,7 @@ _AnimateTileset:: ; fc000 ld h, [hl] ld l, a - jp [hl] + jp hl ; fc01b Tileset00Anim: ; 0xfc01b diff --git a/trainers/read_party.asm b/trainers/read_party.asm index c74d4c6dc..9b7727a84 100755 --- a/trainers/read_party.asm +++ b/trainers/read_party.asm @@ -68,7 +68,7 @@ ReadTrainerParty: ; 39771 ld l, a ld bc, .done push bc - jp [hl] + jp hl .done jp ComputeTrainerReward From b8bf062c8fdd4f4aff0017b7d9de27fdc0909e3f Mon Sep 17 00:00:00 2001 From: SkyrisBactera Date: Tue, 13 Jun 2017 14:50:28 -0600 Subject: [PATCH 09/46] Missing a dependency Without libpng-dev, sudo make install causes: In file included from src/gfx/gb.c:20:0: include/gfx/main.h:20:17: fatal error: png.h: No such file or directory #include ^ compilation terminated. Makefile:90: recipe for target 'src/gfx/gb.o' failed make: *** [src/gfx/gb.o] Error 1 --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 0d48f6daf..c68896bb6 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -7,7 +7,7 @@ If you run into trouble, ask on irc ([**freenode#pret**](https://kiwiirc.com/cli # Linux ```bash -sudo apt-get install make gcc bison git +sudo apt-get install make gcc bison git libpng-dev git clone https://github.com/rednex/rgbds cd rgbds From cd3d125861d25ab60393e29e991f55f26a3874f4 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 18 Jun 2017 00:09:25 -0400 Subject: [PATCH 10/46] Add `gfx` tool for graphics postprocessing --- tools/Makefile | 3 +- tools/common.h | 37 +++++++++++++++ tools/gfx.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 tools/common.h create mode 100644 tools/gfx.c diff --git a/tools/Makefile b/tools/Makefile index 4a04027fc..9e40bcd27 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -6,7 +6,8 @@ all: \ scan_includes \ palette \ pokemon_animation \ - pokemon_animation_graphics + pokemon_animation_graphics \ + gfx @: %: %.c diff --git a/tools/common.h b/tools/common.h new file mode 100644 index 000000000..bc877ccb9 --- /dev/null +++ b/tools/common.h @@ -0,0 +1,37 @@ +#ifndef GUARD_COMMON_H +#define GUARD_COMMON_H + +int __getopt_long_i__; +#define getopt_long(c, v, s, l) getopt_long(c, v, s, l, &__getopt_long_i__) + +FILE *fopen_verbose(char *filename, char *mode) { + FILE *f = fopen(filename, mode); + if (!f) { + fprintf(stderr, "Could not open file: \"%s\"\n", filename); + } + return f; +} + +uint8_t *read_u8(char *filename, int *size) { + FILE *f = fopen_verbose(filename, "rb"); + if (!f) { + exit(1); + } + fseek(f, 0, SEEK_END); + *size = ftell(f); + rewind(f); + uint8_t *data = malloc(*size); + fread(data, 1, *size, f); + fclose(f); + return data; +} + +void write_u8(char *filename, uint8_t *data, int size) { + FILE *f = fopen_verbose(filename, "wb"); + if (f) { + fwrite(data, 1, size, f); + fclose(f); + } +} + +#endif // GUARD_COMMON_H diff --git a/tools/gfx.c b/tools/gfx.c new file mode 100644 index 000000000..85ce44625 --- /dev/null +++ b/tools/gfx.c @@ -0,0 +1,120 @@ +#include +#include +#include +#include +#include + +#include "common.h" + +static void usage(void) { + fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [-d depth] [-h] [-o outfile] infile \n"); +} + +struct Options { + int trim_whitespace; + int remove_whitespace; + int help; + char *outfile; + int depth; +}; + +struct Options Options = { + .depth = 2, +}; + +void get_args(int argc, char *argv[]) { + struct option long_options[] = { + {"remove-whitespace", no_argument, &Options.remove_whitespace, 1}, + {"trim-whitespace", no_argument, &Options.trim_whitespace, 1}, + {"depth", required_argument, 0, 'd'}, + {"help", no_argument, 0, 'h'}, + {0} + }; + for (int opt = 0; opt != -1;) { + switch(opt = getopt_long(argc, argv, "ho:d:", long_options)) { + case 'h': + Options.help = true; + break; + case 'o': + Options.outfile = optarg; + break; + case 'd': + Options.depth = strtoul(optarg, NULL, 0); + break; + case 0: + case -1: + break; + default: + printf("ay %d", opt); + usage(); + exit(1); + break; + } + } +} + +bool is_whitespace(uint8_t *tile, int tile_size) { + uint8_t WHITESPACE = 0; + for (int i = 0; i < tile_size; i++) { + if (tile[i] != WHITESPACE) { + return false; + } + } + return true; +} + +void trim_whitespace(char *infile, char *outfile) { + int size; + uint8_t *data = read_u8(infile, &size); + int tile_size = Options.depth * 8; + for (int i = size - tile_size; i > 0; i -= tile_size) { + if (is_whitespace(&data[i], tile_size)) { + size = i; + } else { + break; + } + } + write_u8(outfile, data, size); +} + +void remove_whitespace(char *infile, char *outfile) { + int size; + uint8_t *data = read_u8(infile, &size); + int tile_size = Options.depth * 8; + int i = 0; + for (int j = 0; i < size && j < size; i += tile_size, j += tile_size) { + while (is_whitespace(&data[j], tile_size)) { + j += tile_size; + } + if (j > i) { + memcpy(&data[i], &data[j], tile_size); + } + } + size = i; + write_u8(outfile, data, size); +} + +int main(int argc, char *argv[]) { + get_args(argc, argv); + argc -= optind; + argv += optind; + if (Options.help) { + usage(); + return 0; + } + if (argc < 1) { + usage(); + exit(1); + } + char *infile = argv[0]; + if (Options.remove_whitespace) { + if (Options.outfile) { + remove_whitespace(infile, Options.outfile); + } + } else if (Options.trim_whitespace) { + if (Options.outfile) { + trim_whitespace(infile, Options.outfile); + } + } + return 0; +} From 384788f3700a5c429dfa86c6ec673a648b4b1c42 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 18 Jun 2017 00:13:03 -0400 Subject: [PATCH 11/46] pngs in gfx/mail --- Makefile | 3 +++ gfx/mail.asm | 60 +++++++++++++------------------------------ gfx/mail/0b9926.1bpp | Bin 8 -> 0 bytes gfx/mail/0b9926.png | Bin 0 -> 74 bytes gfx/mail/0b992e.1bpp | 1 - gfx/mail/0b992e.png | Bin 0 -> 84 bytes gfx/mail/0b9936.1bpp | 1 - gfx/mail/0b9936.png | Bin 0 -> 86 bytes gfx/mail/0b993e.1bpp | Bin 8 -> 0 bytes gfx/mail/0b993e.png | Bin 0 -> 76 bytes gfx/mail/0b9946.1bpp | 1 - gfx/mail/0b9946.png | Bin 0 -> 86 bytes gfx/mail/0b994e.1bpp | Bin 16 -> 0 bytes gfx/mail/0b994e.png | Bin 0 -> 91 bytes gfx/mail/0b995e.1bpp | Bin 8 -> 0 bytes gfx/mail/0b995e.png | Bin 0 -> 74 bytes gfx/mail/0b9966.1bpp | Bin 8 -> 0 bytes gfx/mail/0b9966.png | Bin 0 -> 80 bytes gfx/mail/0b996e.1bpp | Bin 8 -> 0 bytes gfx/mail/0b996e.png | Bin 0 -> 84 bytes gfx/mail/0b9976.1bpp | Bin 8 -> 0 bytes gfx/mail/0b9976.png | Bin 0 -> 88 bytes gfx/mail/0b997e.1bpp | Bin 16 -> 0 bytes gfx/mail/0b997e.png | Bin 0 -> 84 bytes gfx/mail/0b998e.1bpp | 1 - gfx/mail/0b998e.png | Bin 0 -> 77 bytes gfx/mail/0b9996.1bpp | Bin 48 -> 0 bytes gfx/mail/0b9996.png | Bin 0 -> 121 bytes gfx/mail/0b99c6.1bpp | Bin 48 -> 0 bytes gfx/mail/0b99c6.png | Bin 0 -> 131 bytes gfx/mail/0b99f6.1bpp | Bin 48 -> 0 bytes gfx/mail/0b99f6.png | Bin 0 -> 136 bytes gfx/mail/0b9a26.1bpp | Bin 48 -> 0 bytes gfx/mail/0b9a26.png | Bin 0 -> 117 bytes gfx/mail/0b9a56.1bpp | Bin 48 -> 0 bytes gfx/mail/0b9a56.png | Bin 0 -> 128 bytes gfx/mail/0b9a86.1bpp | Bin 48 -> 0 bytes gfx/mail/0b9a86.png | Bin 0 -> 120 bytes gfx/mail/0b9ab6.1bpp | Bin 144 -> 0 bytes gfx/mail/0b9ab6.png | Bin 0 -> 230 bytes gfx/mail/0b9b46.1bpp | Bin 136 -> 0 bytes gfx/mail/0b9b46.png | Bin 0 -> 393 bytes gfx/mail/0b9bce.1bpp | Bin 32 -> 0 bytes gfx/mail/0b9bce.png | Bin 0 -> 116 bytes gfx/mail/0b9bee.1bpp | 1 - gfx/mail/0b9bee.png | Bin 0 -> 92 bytes gfx/mail/0b9bfe.1bpp | Bin 32 -> 0 bytes gfx/mail/0b9bfe.png | Bin 0 -> 119 bytes gfx/mail/0b9c1e.1bpp | Bin 32 -> 0 bytes gfx/mail/0b9c1e.png | Bin 0 -> 118 bytes gfx/mail/0b9c3e.1bpp | Bin 32 -> 0 bytes gfx/mail/0b9c3e.png | Bin 0 -> 110 bytes gfx/mail/0b9c5e.1bpp | Bin 32 -> 0 bytes gfx/mail/0b9c5e.png | Bin 0 -> 112 bytes gfx/mail/0b9c7e.1bpp | Bin 24 -> 0 bytes gfx/mail/0b9c7e.png | Bin 0 -> 221 bytes gfx/mail/0b9c96.1bpp | Bin 8 -> 0 bytes gfx/mail/0b9c9e.1bpp | Bin 32 -> 0 bytes gfx/mail/0b9c9e.png | Bin 0 -> 103 bytes gfx/mail/0b9cbe.1bpp | Bin 32 -> 0 bytes gfx/mail/0b9cbe.png | Bin 0 -> 112 bytes gfx/mail/0b9cde.1bpp | Bin 32 -> 0 bytes gfx/mail/0b9cde.png | Bin 0 -> 106 bytes gfx/mail/0b9cfe.1bpp | Bin 24 -> 0 bytes gfx/mail/0b9cfe.png | Bin 0 -> 220 bytes gfx/mail/0b9d16.1bpp | Bin 16 -> 0 bytes gfx/mail/0b9d16.png | Bin 0 -> 220 bytes gfx/mail/0b9d26.1bpp | Bin 24 -> 0 bytes gfx/mail/0b9d3e.1bpp | Bin 8 -> 0 bytes gfx/mail/0b9d46.1bpp | Bin 48 -> 0 bytes gfx/mail/0b9d46.png | Bin 0 -> 287 bytes gfx/mail/0b9d76.1bpp | Bin 16 -> 0 bytes gfx/mail/0b9d86.1bpp | Bin 48 -> 0 bytes gfx/mail/0b9d86.png | Bin 0 -> 310 bytes gfx/mail/0b9db6.1bpp | Bin 16 -> 0 bytes gfx/mail/0b9dc6.1bpp | 1 - gfx/mail/0b9dc6.png | Bin 0 -> 292 bytes gfx/mail/0b9dce.1bpp | Bin 40 -> 0 bytes gfx/mail/0b9df6.1bpp | Bin 16 -> 0 bytes gfx/mail/0b9e06.1bpp | Bin 32 -> 0 bytes gfx/mail/0b9e06.png | Bin 0 -> 107 bytes gfx/mail/0b9e26.1bpp | 1 - gfx/mail/0b9e26.png | Bin 0 -> 121 bytes gfx/mail/0b9e4e.1bpp | Bin 40 -> 0 bytes gfx/mail/0b9e4e.png | Bin 0 -> 93 bytes 85 files changed, 21 insertions(+), 49 deletions(-) delete mode 100644 gfx/mail/0b9926.1bpp create mode 100644 gfx/mail/0b9926.png delete mode 100644 gfx/mail/0b992e.1bpp create mode 100644 gfx/mail/0b992e.png delete mode 100644 gfx/mail/0b9936.1bpp create mode 100644 gfx/mail/0b9936.png delete mode 100644 gfx/mail/0b993e.1bpp create mode 100644 gfx/mail/0b993e.png delete mode 100644 gfx/mail/0b9946.1bpp create mode 100644 gfx/mail/0b9946.png delete mode 100644 gfx/mail/0b994e.1bpp create mode 100644 gfx/mail/0b994e.png delete mode 100644 gfx/mail/0b995e.1bpp create mode 100644 gfx/mail/0b995e.png delete mode 100644 gfx/mail/0b9966.1bpp create mode 100644 gfx/mail/0b9966.png delete mode 100644 gfx/mail/0b996e.1bpp create mode 100644 gfx/mail/0b996e.png delete mode 100644 gfx/mail/0b9976.1bpp create mode 100644 gfx/mail/0b9976.png delete mode 100644 gfx/mail/0b997e.1bpp create mode 100644 gfx/mail/0b997e.png delete mode 100644 gfx/mail/0b998e.1bpp create mode 100644 gfx/mail/0b998e.png delete mode 100644 gfx/mail/0b9996.1bpp create mode 100644 gfx/mail/0b9996.png delete mode 100644 gfx/mail/0b99c6.1bpp create mode 100644 gfx/mail/0b99c6.png delete mode 100644 gfx/mail/0b99f6.1bpp create mode 100644 gfx/mail/0b99f6.png delete mode 100644 gfx/mail/0b9a26.1bpp create mode 100644 gfx/mail/0b9a26.png delete mode 100644 gfx/mail/0b9a56.1bpp create mode 100644 gfx/mail/0b9a56.png delete mode 100644 gfx/mail/0b9a86.1bpp create mode 100644 gfx/mail/0b9a86.png delete mode 100644 gfx/mail/0b9ab6.1bpp create mode 100644 gfx/mail/0b9ab6.png delete mode 100644 gfx/mail/0b9b46.1bpp create mode 100755 gfx/mail/0b9b46.png delete mode 100644 gfx/mail/0b9bce.1bpp create mode 100644 gfx/mail/0b9bce.png delete mode 100644 gfx/mail/0b9bee.1bpp create mode 100644 gfx/mail/0b9bee.png delete mode 100644 gfx/mail/0b9bfe.1bpp create mode 100644 gfx/mail/0b9bfe.png delete mode 100644 gfx/mail/0b9c1e.1bpp create mode 100644 gfx/mail/0b9c1e.png delete mode 100644 gfx/mail/0b9c3e.1bpp create mode 100644 gfx/mail/0b9c3e.png delete mode 100644 gfx/mail/0b9c5e.1bpp create mode 100644 gfx/mail/0b9c5e.png delete mode 100644 gfx/mail/0b9c7e.1bpp create mode 100755 gfx/mail/0b9c7e.png delete mode 100644 gfx/mail/0b9c96.1bpp delete mode 100644 gfx/mail/0b9c9e.1bpp create mode 100644 gfx/mail/0b9c9e.png delete mode 100644 gfx/mail/0b9cbe.1bpp create mode 100644 gfx/mail/0b9cbe.png delete mode 100644 gfx/mail/0b9cde.1bpp create mode 100644 gfx/mail/0b9cde.png delete mode 100644 gfx/mail/0b9cfe.1bpp create mode 100755 gfx/mail/0b9cfe.png delete mode 100644 gfx/mail/0b9d16.1bpp create mode 100755 gfx/mail/0b9d16.png delete mode 100644 gfx/mail/0b9d26.1bpp delete mode 100644 gfx/mail/0b9d3e.1bpp delete mode 100644 gfx/mail/0b9d46.1bpp create mode 100755 gfx/mail/0b9d46.png delete mode 100644 gfx/mail/0b9d76.1bpp delete mode 100644 gfx/mail/0b9d86.1bpp create mode 100755 gfx/mail/0b9d86.png delete mode 100644 gfx/mail/0b9db6.1bpp delete mode 100644 gfx/mail/0b9dc6.1bpp create mode 100755 gfx/mail/0b9dc6.png delete mode 100644 gfx/mail/0b9dce.1bpp delete mode 100644 gfx/mail/0b9df6.1bpp delete mode 100644 gfx/mail/0b9e06.1bpp create mode 100644 gfx/mail/0b9e06.png delete mode 100644 gfx/mail/0b9e26.1bpp create mode 100644 gfx/mail/0b9e26.png delete mode 100644 gfx/mail/0b9e4e.1bpp create mode 100644 gfx/mail/0b9e4e.png diff --git a/Makefile b/Makefile index 27df84035..c5ec33540 100644 --- a/Makefile +++ b/Makefile @@ -124,6 +124,9 @@ gfx/shrink%.2bpp: gfx/shrink%.png gfx/trainers/%.2bpp: gfx/trainers/%.png rgbgfx -h -o $@ $< +gfx/mail/%.1bpp: gfx/mail/%.png + rgbgfx -d1 -o $@ $< + tools/gfx -d1 --remove-whitespace -o $@ $@ %.bin: ; %.blk: ; diff --git a/gfx/mail.asm b/gfx/mail.asm index fa0736ca6..02cfb06cd 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -226,7 +226,7 @@ LoadEonMailGFX: ; b93d2 ld de, EonMailBorder1GFX ld c, 1 * 8 call LoadMailGFX_Color2 - ld de, EonMailBorder3GFX + ld de, SurfMailBorderGFX + 6 * 8 ld c, 1 * 8 call LoadMailGFX_Color2 ld de, MailEeveeGFX @@ -329,15 +329,15 @@ LoadMorphMailGFX: ; b94d6 ld hl, VTiles2 tile $31 ld bc, 5 * 8 call MailGFX_GenerateMonochromeTilesColor2 + ld de, MorphMailBorderCornerGFX + 3 * 8 + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld de, MorphMailBorderCornerGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 ld de, MorphMailBorderGFX ld c, 1 * 8 call LoadMailGFX_Color2 - ld de, MorphMailBorderCorner1GFX - ld c, 1 * 8 - call LoadMailGFX_Color2 - ld de, MorphMailBorderCorner2GFX - ld c, 1 * 8 - call LoadMailGFX_Color2 ld de, EonMailBorder1GFX ld c, 1 * 8 call LoadMailGFX_Color1 @@ -418,16 +418,16 @@ LoadBlueSkyMailGFX: ; b9582 ld de, MailCloudGFX ld c, 6 * 8 call LoadMailGFX_Color1 - ld de, FlowerMailSenderUnderlineGFX + ld de, FlowerMailBorderGFX + 6 * 8 ld c, 1 * 8 call LoadMailGFX_Color1 ld de, MailCloudGFX ld c, 1 * 8 call LoadMailGFX_Color1 - ld de, MailCloud2GFX + ld de, MailCloudGFX + 2 * 8 ld c, 2 * 8 call LoadMailGFX_Color1 - ld de, MailCloud3GFX + ld de, MailCloudGFX + 5 * 8 ld c, 1 * 8 call LoadMailGFX_Color1 @@ -497,10 +497,10 @@ LoadFlowerMailGFX: ; b963e ld de, MailOddishGFX ld c, 4 * 8 call LoadMailGFX_Color3 - ld de, FlowerMailSenderUnderlineGFX + ld de, FlowerMailBorderGFX + 6 * 8 ld c, 1 * 8 call LoadMailGFX_Color2 - ld de, FlowerMailLargeFlowerGFX + ld de, FlowerMailFlowerGFX ld c, 4 * 8 call LoadMailGFX_Color1 ld c, 4 * 8 @@ -580,7 +580,7 @@ LoadMusicMailGFX: ; b9710 ld de, MusicMailBorderGFX ld c, 4 * 8 call LoadMailGFX_Color2 - ld de, MorphMailBorderCorner2GFX + ld de, MorphMailBorderGFX ld c, 2 * 8 call LoadMailGFX_Color2 ld de, MailNatuGFX @@ -628,10 +628,10 @@ LoadMirageMailGFX: ; b9776 ld de, MailMewGFX ld c, 18 * 8 call LoadMailGFX_Color2 - ld de, MirageMailTopDividerGFX + ld de, LiteBlueMailBorderGFX + 1 * 8 ld c, 1 * 8 call LoadMailGFX_Color1 - ld de, MirageMailBottomDividerGFX + ld de, LiteBlueMailBorderGFX + 6 * 8 ld c, 1 * 8 call LoadMailGFX_Color1 @@ -947,7 +947,7 @@ INCBIN "gfx/mail/0b992e.1bpp" PortraitMailSmallPokeballGFX: ; b9936 INCBIN "gfx/mail/0b9936.1bpp" -MorphMailBorderCorner2GFX: ; b993e +MorphMailBorderGFX: ; b993e INCBIN "gfx/mail/0b993e.1bpp" MusicMailSmallNoteGFX: ; b9946 @@ -1016,20 +1016,14 @@ INCBIN "gfx/mail/0b9c3e.1bpp" LovelyMailLargeHeartGFX: ; b9c5e INCBIN "gfx/mail/0b9c5e.1bpp" -MorphMailBorderCorner1GFX: ; b9c7e +MorphMailBorderCornerGFX: ; b9c7e INCBIN "gfx/mail/0b9c7e.1bpp" -MorphMailBorderGFX: ; b9c96 -INCBIN "gfx/mail/0b9c96.1bpp" - MailLargeCircleGFX: ; b9c9e INCBIN "gfx/mail/0b9c9e.1bpp" -FlowerMailLargeFlowerGFX: ; b9cbe +FlowerMailFlowerGFX: ; b9cbe INCBIN "gfx/mail/0b9cbe.1bpp" - -FlowerMailSmallFlowerGFX: ; b9cde -; indirectly referenced INCBIN "gfx/mail/0b9cde.1bpp" MusicMailLargeNoteGFX: ; b9cfe @@ -1038,33 +1032,15 @@ INCBIN "gfx/mail/0b9cfe.1bpp" MailCloudGFX: ; b9d16 INCBIN "gfx/mail/0b9d16.1bpp" -MailCloud2GFX: ; b9d26 -INCBIN "gfx/mail/0b9d26.1bpp" - -MailCloud3GFX: ; b9d3e -INCBIN "gfx/mail/0b9d3e.1bpp" - SurfMailBorderGFX: ; b9d46 INCBIN "gfx/mail/0b9d46.1bpp" -EonMailBorder3GFX: ; b9d76 -INCBIN "gfx/mail/0b9d76.1bpp" - FlowerMailBorderGFX: ; b9d86 INCBIN "gfx/mail/0b9d86.1bpp" -FlowerMailSenderUnderlineGFX: ; b9db6 -INCBIN "gfx/mail/0b9db6.1bpp" - LiteBlueMailBorderGFX: ; b9dc6 INCBIN "gfx/mail/0b9dc6.1bpp" -MirageMailTopDividerGFX: ; b9dce -INCBIN "gfx/mail/0b9dce.1bpp" - -MirageMailBottomDividerGFX: ; b9df6 -INCBIN "gfx/mail/0b9df6.1bpp" - MusicMailBorderGFX: ; b9e06 INCBIN "gfx/mail/0b9e06.1bpp" diff --git a/gfx/mail/0b9926.1bpp b/gfx/mail/0b9926.1bpp deleted file mode 100644 index 07411676c26a6b05a084cd0fb0acbccef70cb854..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 NcmZQzU|{$U!~g^Y0RR91 diff --git a/gfx/mail/0b9926.png b/gfx/mail/0b9926.png new file mode 100644 index 0000000000000000000000000000000000000000..8a280b3996fa5f31f63258ba46ce80fb3b9215b8 GIT binary patch literal 74 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<33|FXhE&{2{_%f4V_yTqF*b%( WxxAlqp1jurDe`pnb6Mw<&;$U9SQRM% literal 0 HcmV?d00001 diff --git a/gfx/mail/0b992e.1bpp b/gfx/mail/0b992e.1bpp deleted file mode 100644 index 4efb35675..000000000 --- a/gfx/mail/0b992e.1bpp +++ /dev/null @@ -1 +0,0 @@ -HLm} \ No newline at end of file diff --git a/gfx/mail/0b992e.png b/gfx/mail/0b992e.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1f176193c1f8347aeb7bb8e14c40111e72a999 GIT binary patch literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}ezopr0IDq+-v9sr literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9936.1bpp b/gfx/mail/0b9936.1bpp deleted file mode 100644 index 3db4de269..000000000 --- a/gfx/mail/0b9936.1bpp +++ /dev/null @@ -1 +0,0 @@ -<~~< \ No newline at end of file diff --git a/gfx/mail/0b9936.png b/gfx/mail/0b9936.png new file mode 100644 index 0000000000000000000000000000000000000000..666c59813155822341f7b2f9c9e1dbbc633ed06c GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$$GjthE&{2{&C=ZLBq_(pA5|X ijECi`1(;9#J;2Z4dzr22nD3wWAPt_belF{r5}E+gM;i+O literal 0 HcmV?d00001 diff --git a/gfx/mail/0b993e.1bpp b/gfx/mail/0b993e.1bpp deleted file mode 100644 index 28cda20bf09b116a68e1f87dfa617172b01ab6b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 NcmZQzr~?891^@`;0r>y` diff --git a/gfx/mail/0b993e.png b/gfx/mail/0b993e.png new file mode 100644 index 0000000000000000000000000000000000000000..0fc395ef881e49b3c076180e41a154b8a4fe76da GIT binary patch literal 76 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<346LYhE&{2{_%f4V+WssvOok2 YL+c@K)?M`%#6ZeCUHx3vIVCg!0ER^qoB#j- literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9946.1bpp b/gfx/mail/0b9946.1bpp deleted file mode 100644 index 4352e1061..000000000 --- a/gfx/mail/0b9946.1bpp +++ /dev/null @@ -1 +0,0 @@ -p` \ No newline at end of file diff --git a/gfx/mail/0b9946.png b/gfx/mail/0b9946.png new file mode 100644 index 0000000000000000000000000000000000000000..cc95134f680e42f74ba334cfedb4ef754dbbab0a GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$$GjthE&{2{*iqCL;L)P=MxRA i&KEqeXFgotcKAPI_a`2KB0k^6APt_belF{r5}E)7p&Rr7 literal 0 HcmV?d00001 diff --git a/gfx/mail/0b994e.1bpp b/gfx/mail/0b994e.1bpp deleted file mode 100644 index 88ddd73f9f8cd3f2b54df328bf4c5880993af7cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 VcmZQzV6ZuCbC>}HjLYBM1ppgd1atrZ diff --git a/gfx/mail/0b994e.png b/gfx/mail/0b994e.png new file mode 100644 index 0000000000000000000000000000000000000000..2f8d140c4d54e6d177a6e068a9ce5d84a563bd03 GIT binary patch literal 91 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3lBbJfNX4z>AOGhwHrahJ{!rgA nslai?74|k}c8M7?B`YczG7ZJE&t?B!0aEVi>gTe~DWM4f&-fYo literal 0 HcmV?d00001 diff --git a/gfx/mail/0b995e.1bpp b/gfx/mail/0b995e.1bpp deleted file mode 100644 index af75f645a9d6352705b829d7d031e984b8326684..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 NcmZQzU|=W*0ssWA0o?!q diff --git a/gfx/mail/0b995e.png b/gfx/mail/0b995e.png new file mode 100644 index 0000000000000000000000000000000000000000..6c32516edb5868e4ca75b14f1bc1645c4690ff2c GIT binary patch literal 74 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<33|FXhE&{2{_%f4V;`SPgEGVB W4&I-?4b(+JiacHYT-G@yGywo|h!fHP literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9966.1bpp b/gfx/mail/0b9966.1bpp deleted file mode 100644 index bbf05317b88c9cca4588b4408344e4bacc85b2c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmZQzU|>l2_ALPb2DSpN diff --git a/gfx/mail/0b9966.png b/gfx/mail/0b9966.png new file mode 100644 index 0000000000000000000000000000000000000000..211848bffe93b6a437150f36ed03c3eacc854342 GIT binary patch literal 80 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e*@hE&{2{_%f4V;|rD^aKkY cr}qEM3~P?^GN-8Zfb=kUy85}Sb4q9e00jdUF8}}l literal 0 HcmV?d00001 diff --git a/gfx/mail/0b996e.1bpp b/gfx/mail/0b996e.1bpp deleted file mode 100644 index 266c919648b01e94b514072c7c31d48cdcc5cd17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmZQDtFN!Oli>gW3GD(F diff --git a/gfx/mail/0b996e.png b/gfx/mail/0b996e.png new file mode 100644 index 0000000000000000000000000000000000000000..51a61a19dc90fb5106b9d6c4c6b904bf824e80a9 GIT binary patch literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}emdKI;Vst0G+cLFaQ7m literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9976.1bpp b/gfx/mail/0b9976.1bpp deleted file mode 100644 index 1c2e21946b026f6e7630520b3dcd1c9806a28731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmZQzu(z|ZFi-#h1keFO diff --git a/gfx/mail/0b9976.png b/gfx/mail/0b9976.png new file mode 100644 index 0000000000000000000000000000000000000000..f5d98bf9d659ea2a2be402da6011f41075e61065 GIT binary patch literal 88 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$$PpuhE&{2{_%f4V~3rAK}|y1 lj|1mF9Gv&?aDChP|BMq>bH7*JTC)?R#naW#Wt~$(698La9@hW> literal 0 HcmV?d00001 diff --git a/gfx/mail/0b997e.1bpp b/gfx/mail/0b997e.1bpp deleted file mode 100644 index 4957ff4c2a274ba3f9f7597ca9cf9b37beae16c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 TcmZQzumb@G1_l`*CBpy!5?}%; diff --git a/gfx/mail/0b997e.png b/gfx/mail/0b997e.png new file mode 100644 index 0000000000000000000000000000000000000000..83c029e90b360a624dddde7edf842c53647f24d4 GIT binary patch literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c1SA;dueEpuq@+Dv978H@CI8@O;YoPJ{8_$E h;bWs@D??Xf3gfxgqKied7ySn*_jL7hS?83{1OO(=7ia(g literal 0 HcmV?d00001 diff --git a/gfx/mail/0b998e.1bpp b/gfx/mail/0b998e.1bpp deleted file mode 100644 index 8d6a0e319..000000000 --- a/gfx/mail/0b998e.1bpp +++ /dev/null @@ -1 +0,0 @@ -<~~< \ No newline at end of file diff --git a/gfx/mail/0b998e.png b/gfx/mail/0b998e.png new file mode 100644 index 0000000000000000000000000000000000000000..b34ffce17908d4ce20d8e09ae8b8254173d60d8d GIT binary patch literal 77 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e4?zZh1x$JGBCKv UJg>=Vy$3SW)78&qol`;+0EH+i=l}o! literal 0 HcmV?d00001 diff --git a/gfx/mail/0b99c6.1bpp b/gfx/mail/0b99c6.1bpp deleted file mode 100644 index 77d1e45ba18674d34eeb9c71c0525fe6e152dd30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmZ=r$gj7r|36>Cpy0uW4>t}lK!LqoU46a1JU;`weEt7FA0B-8@#ha88yhnK+%yx; diff --git a/gfx/mail/0b99c6.png b/gfx/mail/0b99c6.png new file mode 100644 index 0000000000000000000000000000000000000000..51c0d4a9346e2c3f3723df0709f1eb7a4fd7d443 GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^5nV(b7u5~;3Bhpghc fHhtFEUN=wPv)^p)`mML4K&E@T`njxgN@xNAn$Iv$ literal 0 HcmV?d00001 diff --git a/gfx/mail/0b99f6.1bpp b/gfx/mail/0b99f6.1bpp deleted file mode 100644 index 3d9dcac5b664e4fef50e95a6917cd55ccfe9ab68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmZQzsQB~e-@iI$etCI&`k-s CM;65Z diff --git a/gfx/mail/0b99f6.png b/gfx/mail/0b99f6.png new file mode 100644 index 0000000000000000000000000000000000000000..a1b092e60e0cd5a067aa2a8fb43f7f73391b568a GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^57L!ldBB0k`67QF zbKFz29anj;vu)~PH_%XGVOc+^Wr<&+!xgz36V&GZ;}G^sWf$G5=WMGk@v6_^=uDTx kMUJb!oZA1g`Nf|~MzvZU%@eZ|cY>_&boFyt=akR{0N!#hJpcdz literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9a26.1bpp b/gfx/mail/0b9a26.1bpp deleted file mode 100644 index 295dec49df51d7dd9e2c7ee9834e3847666176d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 tcmb1;=a-kax3_=r;R6tTc+3C=@{G*P?EL)f&;LUJ!-fyP|Nr~{9{|Kc7hM1V diff --git a/gfx/mail/0b9a26.png b/gfx/mail/0b9a26.png new file mode 100644 index 0000000000000000000000000000000000000000..5ea40f472f92dbfbc05a3b66988e414b0b89424a GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^5vFd~yDU z3DP@uDH}3)x;{*J^2tf_h>0hQObAQ<3;AcEkMzCFPT*~@9HVTkczi= QuYk<+boFyt=akR{0HXXR)Bpeg literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9a56.1bpp b/gfx/mail/0b9a56.1bpp deleted file mode 100644 index 7ade46c6c13562a74fbfa49173ab1d84a67370d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmV-00MGxx@c4LqJs$@E009FB@BjD!aPZ*Z#0(w}4-W?)A3s0*{QUU-{{R0ze}Dh} G{`~M94;lCX diff --git a/gfx/mail/0b9a56.png b/gfx/mail/0b9a56.png new file mode 100644 index 0000000000000000000000000000000000000000..6c020746f1c2ce95a6aab9d1116526761699ea87 GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^5~SFk#FVq#{FhXT}v_#ExC0@^vT&rT7kjReJ3nU?Dy>~lAPE7 cvCZZMFVdQ&MBb@096q%E&u=k literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9a86.1bpp b/gfx/mail/0b9a86.1bpp deleted file mode 100644 index 34fa18d291715b83c3f88c3f992eaab339a05ddd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmZQzVBnLN=VxbNU`YNC1VEZ$&cAD{E*+_ z6+bg`Gq3%Oq=d8|{7d;5H0vx_g|@T@)+=0LXWMXxv7?Qd$4ucB^XLD}^*Q00007AAf%U0002s`2PL?0000O93BpTKR-Vo4+9VW{QUg;^XBFT4m|L{ z0000#KMx;2KfnL>`}^nq{QCdDcfg!^`!WFkeirlL%|9NV^XJF&+T5JX#?YMJ&TOy3o{3iLw{YIR)Sb?q*Lv-1OdJhqYzfwn;--ubL zvagCgwW*PL?UKb01@~T>%`Nu%#L?qNzkXOHZF`CF@(Q6-Nl8nOX4G#xCzd5)ajg4p zszGP!!K34;0@%F+@>PClwQeq*(2r%Dpl~vND2x(2OI!^w?til>VeE< zBM7vaxfjr=Xn|Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0Uk+2K~z{r-Ij|E z!Y~L$SO5Q?RhD50Yj1hA8c(vgY!*0>bZyT!#~)KJ*jl^p?s!vitW1d|f=H@|HKmRl zDfMyvrtl`VHblquHj+3eh!%Q^_Y@FqihCUiUiYQ~D}^nwdNEuzNI}LriD-e$Y<*@e z12>r+qNBA{xlOz1YEik)noEN6ngj`NVwf}_fk3&;p9y0hK9B@ol4`jb<_R*p3!E`4 z-z`XdLsFM1Yd{L2lT4r|DUck28Xi8X?UJ0yF{9_Hv*>EcUVN0ZCz(EM@0z5mSTil=cXcgZG0S9X%s4Pr_rsO4DNg8c6a n$BloHq)$ diff --git a/gfx/mail/0b9bfe.png b/gfx/mail/0b9bfe.png new file mode 100644 index 0000000000000000000000000000000000000000..5c2dcb10b42378709d3a11c7d6eece6557758690 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJJ5LwKkcwNXJ*PPt6nLEFzeE*C zuoryId!W@C$7*lbF7PQie#2$Gg9(nx2R*!%?FVdQ&MBb@01?+DG5`Po literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9c1e.1bpp b/gfx/mail/0b9c1e.1bpp deleted file mode 100644 index 205a60248b458b79ce2b31e8a20b8fdbc3cc6753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 qcmV+*0N?+?V{>~yAAk1%hn~K?`2PQoA0HnN2Ol2r`1ttn;P`kC6cN$@ diff --git a/gfx/mail/0b9c1e.png b/gfx/mail/0b9c1e.png new file mode 100644 index 0000000000000000000000000000000000000000..7614323692f6d69127e2cfaac6f5b1ca1a523fb2 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJTTd6qkcwNbod-D&81NinF?R_2 z$iTY3?n0}L!+}fV}ityXV1Uf*Q?sT?c9W7Mx)b`izfUy QHy>o6r>mdKI;Vst09O$wX8-^I literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9c3e.1bpp b/gfx/mail/0b9c3e.1bpp deleted file mode 100644 index faa0439c8cf418efce128fcb9c2824e28a4ba95e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 jcmZQzU}R?Jm$!E~aNq$De5n5~&&U7-A3l8eApxWTxw8x> diff --git a/gfx/mail/0b9c3e.png b/gfx/mail/0b9c3e.png new file mode 100644 index 0000000000000000000000000000000000000000..1a518f7746d3066782836f65e675703f6adf8bd8 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJQ%@JikcwNbr#EskC@?S|Y+$yS zw0d{rY72)4zFM=J_2UWz&O9h`zu|iDsn*8sF79imo-xg5pZ`^R(c>FdPe2BFy85}S Ib4q9e057Q|82|tP literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9c5e.1bpp b/gfx/mail/0b9c5e.1bpp deleted file mode 100644 index 6587f4505f3f896278c2183fc71888fe85765870..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ocmZQzkg=<;ueWDlu&DX>@82JLd46_gMh1pIKR!G-(7?a|0JTpHJpcdz diff --git a/gfx/mail/0b9c5e.png b/gfx/mail/0b9c5e.png new file mode 100644 index 0000000000000000000000000000000000000000..0753285746fc969ed79cadfa959ad5de7fc2c8e2 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJb59q?kcwNrXHIi6IB+muWaQqU z61{zih{BF{&o?Ai9KT@9_mnH;rOJ)=1Ny9v#-+Cu~6@ Jvd$@?2>>z2AiV$p literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9c7e.1bpp b/gfx/mail/0b9c7e.1bpp deleted file mode 100644 index 0057e120d1652c47ae76ad31683e78709978f3de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 fcmZQzWM=1=x36btIPl=Zk3awF?dAE|nHd=XUPTA- diff --git a/gfx/mail/0b9c7e.png b/gfx/mail/0b9c7e.png new file mode 100755 index 0000000000000000000000000000000000000000..f9e7a3cae3317d903436235734472645dd8036ec GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBV3DVbV~B(=R%3b)G=z)}tP*8&9YNG;qyK5!|qS;az literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9c96.1bpp b/gfx/mail/0b9c96.1bpp deleted file mode 100644 index 8798f0fec30548673dfef600ba18ef0c0bbd2eb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmezO=f{T!2O1avARGn* diff --git a/gfx/mail/0b9c9e.1bpp b/gfx/mail/0b9c9e.1bpp deleted file mode 100644 index d1f0f6b7e42196c65ce975f3cecf9ad7c1eebe59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 qcmV+*0N?)r2OmFwfB*jg!0`C|{Qmy`|Nnn~KOYDF{{H;@`0&6z*A@5x diff --git a/gfx/mail/0b9c9e.png b/gfx/mail/0b9c9e.png new file mode 100644 index 0000000000000000000000000000000000000000..d91eae23f1ae7c86a6a6ae226e3e34a26ada5b98 GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJJx>?MkcwN$KloXA{_}tMpZ??U zfe-T^GBY>Z9%f`?tK(o~ITOLzBD8^TL)-*ShO*bfW;4p7?}1G4boFyt=akR{05;Sf ABLDyZ literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9cbe.1bpp b/gfx/mail/0b9cbe.1bpp deleted file mode 100644 index 503b8da3cbb15671935e91a05bb81f80025c49dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ocmZQ(XD|Q%=f{r&4<5YxZ!a%jAz@QrZ)d|GCt>sN-#;4$01iqIN&o-= diff --git a/gfx/mail/0b9cbe.png b/gfx/mail/0b9cbe.png new file mode 100644 index 0000000000000000000000000000000000000000..2147bef318d081d6ba9cb47239c9cb52475c3580 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJb59q?kcwNnCk}ElIB+l@bl}>c z67BD)>F_}$U;cB%mc3`l&7no J%Q~loCICKnBLn~d literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9cde.1bpp b/gfx/mail/0b9cde.1bpp deleted file mode 100644 index d6d1b99c2a42abb183ca814f71f26fb7a7189f3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 mcmZQzU|`^pv$F?M3<)28{E*?1vA2`sVJJu_`0?XI0s{bTCJ9pj diff --git a/gfx/mail/0b9cde.png b/gfx/mail/0b9cde.png new file mode 100644 index 0000000000000000000000000000000000000000..3f0d34edce07ac2d02f9e70533ed8fcc1593102a GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJLr)jSkcwN$KloXAUa6=%RkP*$jDs%?_bUFwjKcnAOHYae+NVW diff --git a/gfx/mail/0b9cfe.png b/gfx/mail/0b9cfe.png new file mode 100755 index 0000000000000000000000000000000000000000..4b7a26faaf31594d84f3640bb73f40f80d711908 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBV4S1mjNwj N@O1TaS?83{1ORAwPKE#g literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9d16.1bpp b/gfx/mail/0b9d16.1bpp deleted file mode 100644 index 61e9e30343f77667b669f656e83f9e5f08c32e6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 WcmZQzU|^81|NozXq2kYfAOHX>mNn{1`ISV`@iy0XBj({-ZRBb+KpkSe=i(`m||J^AMxeh3Bw3NR8e=hgBNs@%s zN&8v>*QcFjN8UDa?M%^A4q-Gt{pzXz#k{8VI~FCr`#C3})RKG2Z)t~$?K_yRRyYe! z+5Mt{WpZaw#K#+#4RdCdPHfSa)ZL_4b?}}gM}1jXYqW5RW|`nc-o1<5UY(g$P!F`6 N!PC{xWt~$(69DI$O=185 literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9d26.1bpp b/gfx/mail/0b9d26.1bpp deleted file mode 100644 index 2f7129dabedc9d7bb575cccd5917ec0c5ace0f0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 ccmZQzVEFUz-+v&ex0hpJU;wfH*)cEx0H;|E2><{9 diff --git a/gfx/mail/0b9d3e.1bpp b/gfx/mail/0b9d3e.1bpp deleted file mode 100644 index e8417d2110b77f0c447a056b709ca5f793f6c039..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 McmezWzk&e-01?RocK`qY diff --git a/gfx/mail/0b9d46.1bpp b/gfx/mail/0b9d46.1bpp deleted file mode 100644 index e3e1dc2e77fe9704394f249b065c7f7a289f01ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 ucmezW|Ns9FKmeo|{y#t52&Dh>1Ht=uZ(h83^X~oka&vKU^YZUdHU9yiO(e1a diff --git a/gfx/mail/0b9d46.png b/gfx/mail/0b9d46.png new file mode 100755 index 0000000000000000000000000000000000000000..466d26c397b6c0555598eef20f522267a3d2735d GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB;1*98#}E(it&!PnDuT;C!g``{jVkFzpm?f%yes!&P0zU zjex0l(i&X%wd-iCx<7xadO+F9te{4reJiq@9o1_luAR7l(ef6iZ^f=D*_VV%R6=ua zD!CrY`tZ$6)?SAtg}LWmNKFK1>Vi fo>vf&@Qs!4tf%rXOP1F__cM69`njxgN@xNARR?W^ literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9d76.1bpp b/gfx/mail/0b9d76.1bpp deleted file mode 100644 index cd7cd4e7660286cb061ecadc92f49fa148164278..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 VcmZoX{QN(||NsB_fdEMT2LM)p3Sa;L diff --git a/gfx/mail/0b9d86.1bpp b/gfx/mail/0b9d86.1bpp deleted file mode 100644 index b048e2bfd40455e2a550261d2350122f4ff59d6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmV-00MGyb|Igq4{`~O&|HJ41emnsG|MUBQe?JfS{NB#a-u(Cr!eKU*%6o zJ=3k~UU;zYyHF&v`qk;7yAP=rmz5=EE@M;gzP2T^d(Uc)X*x_X3py8D2*w5bzd71* z&*7`Th=boTsd>ge3rrO&bY`<(xOc9uv4A~&$|vSM|59ZCUE)6q^cI7stDnm{r-UW| DM-_Mj literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9db6.1bpp b/gfx/mail/0b9db6.1bpp deleted file mode 100644 index e894196d77f99dea28c405a2d62ee362631adc15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 YcmZRusr&!@@c;k(_Vx9@KmY#^08aG^ng9R* diff --git a/gfx/mail/0b9dc6.1bpp b/gfx/mail/0b9dc6.1bpp deleted file mode 100644 index 9c56c6746..000000000 --- a/gfx/mail/0b9dc6.1bpp +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gfx/mail/0b9dc6.png b/gfx/mail/0b9dc6.png new file mode 100755 index 0000000000000000000000000000000000000000..878021bf8585a94aa6a784c512391060a9152b59 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB;7(5$#}E(iy_2~4S`0W`R({`K9Db&6;g+YD zS>ls=tj=(35e(eF-e}$by*=BT@BMX)O0M*?W_j?GEB96AcE;8FnPJ8@`7T5)WuHAh^uwmn>p_6lWTOhaF9xOa$+=iBKdyW&gM{mR`Dp;s>XR@_uCox kZ+0FR32^;rsQQcX%)bKV&nLc~0(yeM)78&qol`;+0MsFIsQ>@~ literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9dce.1bpp b/gfx/mail/0b9dce.1bpp deleted file mode 100644 index 3afe8b3035a0a6024fc2029ff4a48d3a07c3a6c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 ucmezWU*d3@jReF0|IEL+f#AZ8GtZu#xp9G8+BiMkSep9+5ZpiT|33hteih9C diff --git a/gfx/mail/0b9df6.1bpp b/gfx/mail/0b9df6.1bpp deleted file mode 100644 index d74a3ff4a376281e6a31fb6f651fad3c058fed94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 WcmZROut_^C@&7+J5d3ET{~rJ^7Y4il diff --git a/gfx/mail/0b9e06.1bpp b/gfx/mail/0b9e06.1bpp deleted file mode 100644 index 8f082c642f9502cdabeee67aa061a2e9b923393f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 icmZRO`}gnP2L>Sc0A$E9R8&;d*x1-G$jQmsfoK5kkPGzy diff --git a/gfx/mail/0b9e06.png b/gfx/mail/0b9e06.png new file mode 100644 index 0000000000000000000000000000000000000000..035757ee407251558b2858d05afbdbb961c9868a GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJBTpB{kcwN$KloXA>Sr{vFdH+^ zNN5xK@5uE3e*?#YH;mN^+?@~pA2{=&@jtV@5MvNK1Is_ftsh&N#6YHay85}Sb4q9e E0D+$$RsaA1 literal 0 HcmV?d00001 diff --git a/gfx/mail/0b9e26.1bpp b/gfx/mail/0b9e26.1bpp deleted file mode 100644 index efe2887cf..000000000 --- a/gfx/mail/0b9e26.1bpp +++ /dev/null @@ -1 +0,0 @@ -Ù<<χ \ No newline at end of file diff --git a/gfx/mail/0b9e26.png b/gfx/mail/0b9e26.png new file mode 100644 index 0000000000000000000000000000000000000000..48b8e7b7bbf3bb5c0a48cd544f4cd357a2f45973 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW1SA;NRQx#rq#Qh5978H@B_|{#JotYgA^C7Z z4O>eCkAk?QfjmPegW!aZjq)ehl@-48b1+H@2rdxWKjoqO`UWE0MQdD0CRwX>QDdxrs)$! diff --git a/gfx/mail/0b9e4e.png b/gfx/mail/0b9e4e.png new file mode 100644 index 0000000000000000000000000000000000000000..9efb3401f2dfa8e700c36bea4db42699957c39c7 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW1SA;NRQx#rq*Odz978H@CI9$8{~?316%*GX s#tFO+og~gY->7VoTJYf~Ll_G~>n)w-51CROfa)1MUHx3vIVCg!0Ah(7^#A|> literal 0 HcmV?d00001 From a71005fafa13fe325d6a3fc62f24dea8ec97ffb2 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 18 Jun 2017 00:54:02 -0400 Subject: [PATCH 12/46] Remove debug statement from tools/gfx --- tools/gfx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/gfx.c b/tools/gfx.c index 85ce44625..4389a3f46 100644 --- a/tools/gfx.c +++ b/tools/gfx.c @@ -31,7 +31,7 @@ void get_args(int argc, char *argv[]) { {0} }; for (int opt = 0; opt != -1;) { - switch(opt = getopt_long(argc, argv, "ho:d:", long_options)) { + switch (opt = getopt_long(argc, argv, "ho:d:", long_options)) { case 'h': Options.help = true; break; @@ -45,7 +45,6 @@ void get_args(int argc, char *argv[]) { case -1: break; default: - printf("ay %d", opt); usage(); exit(1); break; From 93a3a7d3c56534b7170dd2c3510c8ba1ee21067b Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 20 Jun 2017 23:36:28 -0400 Subject: [PATCH 13/46] Use $(if) in the makefile. Fix gfx/mail. Fixes 384788f3700a5c429dfa86c6ec673a648b4b1c42 --- Makefile | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index c5ec33540..17a16dbff 100644 --- a/Makefile +++ b/Makefile @@ -58,10 +58,6 @@ pokecrystal.gbc: $(crystal_obj) rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ -define LOUD -echo "$1"; $1 -endef - # For files that the compressor can't match, there will be a .lz file suffixed with the hash of the correct uncompressed file. # If the hash of the uncompressed file matches, use this .lz instead. # This allows pngs to be used for compressed graphics and still match. @@ -69,11 +65,7 @@ endef %.lz: hash = $(shell md5sum $(*D)/$(*F) | sed "s/\(.\{8\}\).*/\1/") %.lz: % $(eval filename := $@.$(hash)) - @if [ -f $(filename) ]; then \ - $(call LOUD, cp $(filename) $@); \ - else \ - $(call LOUD, tools/lzcomp $< $@); \ - fi + $(if $(wildcard $(filename)),cp $(filename) $@,tools/lzcomp $< $@) # Terrible hacks to match animations. Delete these rules if you don't care about matching. @@ -118,23 +110,27 @@ gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimens # Misc file-specific graphics rules -gfx/shrink%.2bpp: gfx/shrink%.png - rgbgfx -h -o $@ $< +gfx/shrink%.2bpp: rgbgfx += -h -gfx/trainers/%.2bpp: gfx/trainers/%.png - rgbgfx -h -o $@ $< +gfx/trainers/%.2bpp: rgbgfx += -h -gfx/mail/%.1bpp: gfx/mail/%.png - rgbgfx -d1 -o $@ $< - tools/gfx -d1 --remove-whitespace -o $@ $@ +gfx/mail/0b9b46.1bpp: tools/gfx += --remove-whitespace +gfx/mail/0b9d46.1bpp: tools/gfx += --remove-whitespace +gfx/mail/0b9d86.1bpp: tools/gfx += --remove-whitespace +gfx/mail/0b9dc6.1bpp: tools/gfx += --remove-whitespace +gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace %.bin: ; %.blk: ; %.2bpp: %.png - rgbgfx -o $@ $< + rgbgfx $(rgbgfx) -o $@ $< + $(if $(tools/gfx),tools/gfx $(tools/gfx) -o $@ $@) + %.1bpp: %.png - rgbgfx -d1 -o $@ $< + rgbgfx $(rgbgfx) -d1 -o $@ $< + $(if $(tools/gfx),tools/gfx $(tools/gfx) -d1 -o $@ $@) + %.tilemap: %.png rgbgfx -t $@ $< %.gbcpal: %.png From f10ed64d1a8651ee7efbc9aca8e033a01ca6dee1 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 20 Jun 2017 23:42:29 -0400 Subject: [PATCH 14/46] pngs in gfx/pokedex --- Makefile | 2 ++ .../{pokedex.2bpp.lz => pokedex.2bpp.lz.3726dd3f} | Bin gfx/pokedex/pokedex.png | Bin 0 -> 433 bytes gfx/pokedex/select_start.2bpp | 1 - gfx/pokedex/select_start.png | Bin 0 -> 130 bytes gfx/pokedex/{sgb.2bpp.lz => sgb.2bpp.lz.82bc0a7b} | Bin gfx/pokedex/sgb.png | Bin 0 -> 429 bytes ...slowpoke.2bpp.lz => slowpoke.2bpp.lz.49a91b42} | Bin gfx/pokedex/slowpoke.png | Bin 0 -> 391 bytes 9 files changed, 2 insertions(+), 1 deletion(-) rename gfx/pokedex/{pokedex.2bpp.lz => pokedex.2bpp.lz.3726dd3f} (100%) create mode 100644 gfx/pokedex/pokedex.png delete mode 100644 gfx/pokedex/select_start.2bpp create mode 100644 gfx/pokedex/select_start.png rename gfx/pokedex/{sgb.2bpp.lz => sgb.2bpp.lz.82bc0a7b} (100%) create mode 100644 gfx/pokedex/sgb.png rename gfx/pokedex/{slowpoke.2bpp.lz => slowpoke.2bpp.lz.49a91b42} (100%) create mode 100644 gfx/pokedex/slowpoke.png diff --git a/Makefile b/Makefile index 17a16dbff..380c61324 100644 --- a/Makefile +++ b/Makefile @@ -120,6 +120,8 @@ gfx/mail/0b9d86.1bpp: tools/gfx += --remove-whitespace gfx/mail/0b9dc6.1bpp: tools/gfx += --remove-whitespace gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace +gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace + %.bin: ; %.blk: ; diff --git a/gfx/pokedex/pokedex.2bpp.lz b/gfx/pokedex/pokedex.2bpp.lz.3726dd3f similarity index 100% rename from gfx/pokedex/pokedex.2bpp.lz rename to gfx/pokedex/pokedex.2bpp.lz.3726dd3f diff --git a/gfx/pokedex/pokedex.png b/gfx/pokedex/pokedex.png new file mode 100644 index 0000000000000000000000000000000000000000..48af514c7759e2d42a5f4c426369b30016c0655c GIT binary patch literal 433 zcmV;i0Z#sjP)!}Wd=F;UjnLr$RMwF1hiz@A@=bC7>}8r!L?FIKv`+60GmpqGJZ#$3BKJT zEM5snSyi+zU1X(EYA>nNo_d6@O-f)87?_l>rOvcfr4T+75Yn0iOo~Fm2|@bSQ^NNf zgFHg>hzwBX5s&ZtVH^RLj?GK9JL=L1T2f(C!u2B1lucQ~nwk|r0flol)cjDOKsE>P z6jWh9jzED@4E95pffj{e&_z$Z25oF0;M{sl5QX6p&b5|9F#G{Rj3el;s`8Q(=%yE^ ziwW#1#b6pyPw!RD_ui^8Vg~Xr_3R!Xrh~?@oD=j(`@~t@3t|HC3P}6VA@2gS_7)Jg bMw|z~2I-C|+a+R500000NkvXXu0mjf)rGlr literal 0 HcmV?d00001 diff --git a/gfx/pokedex/select_start.2bpp b/gfx/pokedex/select_start.2bpp deleted file mode 100644 index c223eb635..000000000 --- a/gfx/pokedex/select_start.2bpp +++ /dev/null @@ -1 +0,0 @@ -ˉ,,mm,,mmmm$$ۛUUUUUUUU \ No newline at end of file diff --git a/gfx/pokedex/select_start.png b/gfx/pokedex/select_start.png new file mode 100644 index 0000000000000000000000000000000000000000..efa8d4a462e8e0ffbd5ddd77e84b0f01fbbbbca3 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^5dOj{;hwI3F6*2UngHq1ExrH% literal 0 HcmV?d00001 diff --git a/gfx/pokedex/sgb.2bpp.lz b/gfx/pokedex/sgb.2bpp.lz.82bc0a7b similarity index 100% rename from gfx/pokedex/sgb.2bpp.lz rename to gfx/pokedex/sgb.2bpp.lz.82bc0a7b diff --git a/gfx/pokedex/sgb.png b/gfx/pokedex/sgb.png new file mode 100644 index 0000000000000000000000000000000000000000..bbacb114d217081a9d86f6155405e462063b8cdc GIT binary patch literal 429 zcmV;e0aE^nP)F$Yr$8A2lCzlR zR9^(hSwnT27oZsbb0F-80+eb8KuT%{?)d^RZd2Fb+8_yl-go~$TZbY>yc58y! zN&st{M*7ObHjb=|R+NjP3BF#`AptQ+NVLNIb^A3mCU0ak#o0NO`)au0AMZvp03#ChNs Xs4bBC47Yzn#JxeE=CZ--yx5X*|&%R7e}WO zB!BEY1^g`EjSg+{1KO1n;BeLR=!K z^B5-%i)Yy8@wv$M;u3DIf3^4ZEe=b4_E(!}kP+dLh9%M+n9&c5pkdyLOB<|xOov6V zXP!w{zpU{(m2BoVLH_vLNhxAp&k)!43<(Gn559a zm<571Pfc95QGTW7i3d$wz*Su8AvK+?D5$9jVPZ9rHKjm l@MiS7=^YFvc87^$pC9RfsUyg-WI_M{002ovPDHLkV1n(KtU~|* literal 0 HcmV?d00001 From 99f6249de8825373ee929bb1cde376564d03e58e Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 20 Jun 2017 23:46:01 -0400 Subject: [PATCH 15/46] pngs in gfx/pokegear - flymap_label_border.2bpp was actually 1bpp --- engine/pokegear.asm | 2 +- gfx/pokegear/dexmap_nest_icon.2bpp | 1 - gfx/pokegear/dexmap_nest_icon.png | Bin 0 -> 86 bytes gfx/pokegear/flymap_label_border.2bpp | Bin 48 -> 0 bytes gfx/pokegear/flymap_label_border.png | Bin 0 -> 121 bytes 5 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 gfx/pokegear/dexmap_nest_icon.2bpp create mode 100644 gfx/pokegear/dexmap_nest_icon.png delete mode 100644 gfx/pokegear/flymap_label_border.2bpp create mode 100644 gfx/pokegear/flymap_label_border.png diff --git a/engine/pokegear.asm b/engine/pokegear.asm index d180ee875..b9f2ec505 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -2987,7 +2987,7 @@ INCBIN "gfx/misc/kanto.bin" PokedexNestIconGFX: ; 922d1 INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp" FlyMapLabelBorderGFX: ; 922e1 -INCBIN "gfx/pokegear/flymap_label_border.2bpp" +INCBIN "gfx/pokegear/flymap_label_border.1bpp" ; XXX xor a diff --git a/gfx/pokegear/dexmap_nest_icon.2bpp b/gfx/pokegear/dexmap_nest_icon.2bpp deleted file mode 100644 index 48a4938e6..000000000 --- a/gfx/pokegear/dexmap_nest_icon.2bpp +++ /dev/null @@ -1 +0,0 @@ -BBffZZ$$ \ No newline at end of file diff --git a/gfx/pokegear/dexmap_nest_icon.png b/gfx/pokegear/dexmap_nest_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f8ffdc82dcafcfeb560c76098bce571c2b0b0599 GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$$GjthE&{2w)j8u;fF*v1%ZS_ i0YOH?a}vficKi(fwQO!TnYOF~Y4CLQb6Mw<&;$Tv2NuHs literal 0 HcmV?d00001 diff --git a/gfx/pokegear/flymap_label_border.2bpp b/gfx/pokegear/flymap_label_border.2bpp deleted file mode 100644 index 671aab1d756b16f834cca87c4fff021e0a5afed5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 tcmezI;6OtI0|SFRJ2N9AkOqQ=h64|N0BJ@>W_EcAn>q%DIvWWX4FD_-3eNxl diff --git a/gfx/pokegear/flymap_label_border.png b/gfx/pokegear/flymap_label_border.png new file mode 100644 index 0000000000000000000000000000000000000000..69818d0e564d5e14f5d27086107cb8b3e0e40b5d GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SDF;s%$B>F!r9HcO84P)xCfYQ( zCzbX;Vbqz}B2wgTe~DWM4fhh-)J literal 0 HcmV?d00001 From 2e0344e63de4a47d9535d9af47cc9f49cf11f5fc Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 20 Jun 2017 23:47:33 -0400 Subject: [PATCH 16/46] pngs in gfx/special/celebi --- gfx/special/celebi/1.2bpp | 1 - gfx/special/celebi/1.png | Bin 0 -> 148 bytes gfx/special/celebi/2.2bpp | Bin 64 -> 0 bytes gfx/special/celebi/2.png | Bin 0 -> 148 bytes gfx/special/celebi/3.2bpp | Bin 64 -> 0 bytes gfx/special/celebi/3.png | Bin 0 -> 148 bytes gfx/special/celebi/4.2bpp | Bin 64 -> 0 bytes gfx/special/celebi/4.png | Bin 0 -> 148 bytes gfx/special/celebi/leaf.2bpp | Bin 64 -> 0 bytes gfx/special/celebi/leaf.png | Bin 0 -> 134 bytes 10 files changed, 1 deletion(-) delete mode 100644 gfx/special/celebi/1.2bpp create mode 100644 gfx/special/celebi/1.png delete mode 100644 gfx/special/celebi/2.2bpp create mode 100644 gfx/special/celebi/2.png delete mode 100644 gfx/special/celebi/3.2bpp create mode 100644 gfx/special/celebi/3.png delete mode 100644 gfx/special/celebi/4.2bpp create mode 100644 gfx/special/celebi/4.png delete mode 100644 gfx/special/celebi/leaf.2bpp create mode 100644 gfx/special/celebi/leaf.png diff --git a/gfx/special/celebi/1.2bpp b/gfx/special/celebi/1.2bpp deleted file mode 100644 index 6379fc92f..000000000 --- a/gfx/special/celebi/1.2bpp +++ /dev/null @@ -1 +0,0 @@ -00.>  d$6&_g?83<}__{jn @ ظ00 \ No newline at end of file diff --git a/gfx/special/celebi/1.png b/gfx/special/celebi/1.png new file mode 100644 index 0000000000000000000000000000000000000000..bd07ec8c4b8b1195eae570469eb5e8c9bd325d32 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|v!Xipc%kcwN30SxQ^Gko~}_&mc$ z<{yt4{XMhGPvO{0two7=YTM u`u{VWU|Ia1;fR8YJ;PyPR(pp3{2%@=zo%qWr0{u3 z{uk#NJ_ax?X804z$-(f4b5T3Pf00#_8UC}bTFk(IU==fifZ>XMhGPvO{0two7=SvW u`u{VWU|Ia1;fR8YJ;PyPR(pp3{2%^L+oSlxX=70n$U09~KbLh*2~7alYcf>; literal 0 HcmV?d00001 diff --git a/gfx/special/celebi/3.2bpp b/gfx/special/celebi/3.2bpp deleted file mode 100644 index 00cac65a741ce8aa1562a8c3f9efff62575b3830..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmV-G0Kfk*FfKk79~d7N9SIN2&$stvBsLQB;m`g2Ci({c0{#wKYdqJ6S7gMs5o$d0SK6x`S|RN{v5He0P!H; M|NlBC8yf}&0G1jN#Q*>R diff --git a/gfx/special/celebi/leaf.png b/gfx/special/celebi/leaf.png new file mode 100644 index 0000000000000000000000000000000000000000..b10e0cf8c4c96c17b9eed47b9fcc58e28173778d GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJUr!gukcwN$KmPy!FW<)h=fAzd zoTxwl4Vu%A)Tgp-6|EODcG3NJ<@|!9^#|rPKD7T|&$hry;v=Jr0dpsRx1@x`j$i(| gX+IMFH_Gd9GyEvlnUsEi2FQE{Pgg&ebxsLQ08cD0=l}o! literal 0 HcmV?d00001 From 57385679850b0886a5728f995d96866a48ebfe37 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 21 Jun 2017 00:13:09 -0400 Subject: [PATCH 17/46] pngs in gfx/splash --- engine/crystal_intro.asm | 3 ++- gfx/splash/logo.1bpp | Bin 224 -> 0 bytes gfx/splash/logo1.png | Bin 0 -> 385 bytes gfx/splash/logo2.png | Bin 0 -> 172 bytes 4 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 gfx/splash/logo.1bpp create mode 100755 gfx/splash/logo1.png create mode 100755 gfx/splash/logo2.png diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 29bb0934f..5bf77181a 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -367,7 +367,8 @@ GameFreakLogoPalettes: ; e47ac ; e47cc GameFreakLogo: ; e47cc -INCBIN "gfx/splash/logo.1bpp" +INCBIN "gfx/splash/logo1.1bpp" +INCBIN "gfx/splash/logo2.1bpp" ; e48ac CrystalIntro: ; e48ac diff --git a/gfx/splash/logo.1bpp b/gfx/splash/logo.1bpp deleted file mode 100644 index c59bf619760e02ee5ac5f5598617a0c431de90f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmXAizY4-I5QndbuC4(=Hz#p+5Z!zU2c^|a{@biJTEW$a=xYcHom>RzBPa#a$)t-! z2(1_W4(_}Aac~_wyj^G)2x&C7JptTVF8lo}WHuWO?F_U%!a;(jl+Eb7AgDW;Q3n8O zl`0|V&2%*#qxnJXU+A^tIUagWpR|r{4PCN8{~^t;?|W%#wp|zmD9ez_M;vp`?~#;J vDfJ7niI+hL_r%%=v%nO7Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0TxL_K~zXf-IL)C zff8)FPyK6qJgm{DE#QBSoJ$XD4}t>mYA z%-xk0KO73fa2+LORr7l;Qu%r&LJuS#c>eBS%6*F2F!)1|Nq-DApc&xLB<-h$=a~=u zndn}{a{$?+dg@o@pn3jGO|pMM3W8i$gT~t2ne|ma)k(u9sxx%D*H(?Vmd>F*@4K2` zFUSLc1+<|z*Ji1PQu)xkz3O>?r}OD~uTJ-RXSAcF{VNYMD})@^6?FZ&9<%;O&R5Mr z&CjO!YA;A$l~uZ$`xivh-=IGG6{rtVlazOj=slVF37zLG)eNkq_nuWxNi~(W<|g#J ff0SyV|6*C5cp)+HPuGw200000NkvXXu0mjf2otGS literal 0 HcmV?d00001 diff --git a/gfx/splash/logo2.png b/gfx/splash/logo2.png new file mode 100755 index 0000000000000000000000000000000000000000..7038efb543ab2c8cdabbcf58e9db03e16043f31a GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^5F!x#tbJ8VqlH_2m^~IDc?~?vW?%>=$2NRD0|Hz;3to9e+jUBXU-mvl7G9B WzGJ5Bjnda3XL!2$xvX Date: Wed, 21 Jun 2017 00:14:21 -0400 Subject: [PATCH 18/46] pngs in gfx/stats --- gfx/stats/shiny.2bpp | 1 - gfx/stats/shiny.png | Bin 0 -> 89 bytes 2 files changed, 1 deletion(-) delete mode 100644 gfx/stats/shiny.2bpp create mode 100644 gfx/stats/shiny.png diff --git a/gfx/stats/shiny.2bpp b/gfx/stats/shiny.2bpp deleted file mode 100644 index cfe4e8f9e..000000000 --- a/gfx/stats/shiny.2bpp +++ /dev/null @@ -1 +0,0 @@ -@@BB88 \ No newline at end of file diff --git a/gfx/stats/shiny.png b/gfx/stats/shiny.png new file mode 100644 index 0000000000000000000000000000000000000000..010aeafbf1ad6440cb2262e9993b0165747d98a1 GIT binary patch literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e Date: Wed, 21 Jun 2017 00:22:41 -0400 Subject: [PATCH 19/46] pngs in gfx/tilesets --- gfx/tilesets/{00.2bpp.lz => 00.2bpp.lz.0c7e555a} | Bin gfx/tilesets/00.png | Bin 0 -> 2084 bytes gfx/tilesets/{01.2bpp.lz => 01.2bpp.lz.0c7e555a} | Bin gfx/tilesets/01.png | Bin 0 -> 2084 bytes gfx/tilesets/{02.2bpp.lz => 02.2bpp.lz.391603fb} | Bin gfx/tilesets/02.png | Bin 0 -> 2341 bytes gfx/tilesets/{03.2bpp.lz => 03.2bpp.lz.a29f5d51} | Bin gfx/tilesets/03.png | Bin 0 -> 1316 bytes gfx/tilesets/{04.2bpp.lz => 04.2bpp.lz.391603fb} | Bin gfx/tilesets/04.png | Bin 0 -> 2341 bytes gfx/tilesets/{05.2bpp.lz => 05.2bpp.lz.c848ef13} | Bin gfx/tilesets/05.png | Bin 0 -> 1264 bytes gfx/tilesets/{06.2bpp.lz => 06.2bpp.lz.252cbd8f} | Bin gfx/tilesets/06.png | Bin 0 -> 1005 bytes gfx/tilesets/{07.2bpp.lz => 07.2bpp.lz.e1c4014c} | Bin gfx/tilesets/07.png | Bin 0 -> 1195 bytes gfx/tilesets/{08.2bpp.lz => 08.2bpp.lz.f5a55006} | Bin gfx/tilesets/08.png | Bin 0 -> 1146 bytes gfx/tilesets/{09.2bpp.lz => 09.2bpp.lz.56b1a405} | Bin gfx/tilesets/09.png | Bin 0 -> 1062 bytes gfx/tilesets/{10.2bpp.lz => 10.2bpp.lz.b8d0f547} | Bin gfx/tilesets/10.png | Bin 0 -> 2041 bytes gfx/tilesets/{11.2bpp.lz => 11.2bpp.lz.454cfd8b} | Bin gfx/tilesets/11.png | Bin 0 -> 1131 bytes gfx/tilesets/{12.2bpp.lz => 12.2bpp.lz.e2e94f92} | Bin gfx/tilesets/12.png | Bin 0 -> 1773 bytes gfx/tilesets/{13.2bpp.lz => 13.2bpp.lz.63b414d4} | Bin gfx/tilesets/13.png | Bin 0 -> 2047 bytes gfx/tilesets/{14.2bpp.lz => 14.2bpp.lz.71d29a2f} | Bin gfx/tilesets/14.png | Bin 0 -> 1583 bytes gfx/tilesets/{15.2bpp.lz => 15.2bpp.lz.c1f2ed8f} | Bin gfx/tilesets/15.png | Bin 0 -> 1282 bytes gfx/tilesets/{16.2bpp.lz => 16.2bpp.lz.dd51d079} | Bin gfx/tilesets/16.png | Bin 0 -> 1203 bytes gfx/tilesets/{17.2bpp.lz => 17.2bpp.lz.1600ca86} | Bin gfx/tilesets/17.png | Bin 0 -> 1156 bytes gfx/tilesets/{18.2bpp.lz => 18.2bpp.lz.93800351} | Bin gfx/tilesets/18.png | Bin 0 -> 2284 bytes gfx/tilesets/{19.2bpp.lz => 19.2bpp.lz.0c1544c1} | Bin gfx/tilesets/19.png | Bin 0 -> 1226 bytes gfx/tilesets/{20.2bpp.lz => 20.2bpp.lz.35e51007} | Bin gfx/tilesets/20.png | Bin 0 -> 1250 bytes gfx/tilesets/{21.2bpp.lz => 21.2bpp.lz.febbc4ec} | Bin gfx/tilesets/21.png | Bin 0 -> 2498 bytes gfx/tilesets/{22.2bpp.lz => 22.2bpp.lz.467b6a2d} | Bin gfx/tilesets/22.png | Bin 0 -> 993 bytes gfx/tilesets/{23.2bpp.lz => 23.2bpp.lz.bc56789c} | Bin gfx/tilesets/23.png | Bin 0 -> 1505 bytes gfx/tilesets/{24.2bpp.lz => 24.2bpp.lz.3437812a} | Bin gfx/tilesets/24.png | Bin 0 -> 1044 bytes gfx/tilesets/{25.2bpp.lz => 25.2bpp.lz.7fcb81d6} | Bin gfx/tilesets/25.png | Bin 0 -> 1334 bytes gfx/tilesets/{26.2bpp.lz => 26.2bpp.lz.8b42470b} | Bin gfx/tilesets/26.png | Bin 0 -> 1909 bytes gfx/tilesets/{27.2bpp.lz => 27.2bpp.lz.27cdd9ad} | Bin gfx/tilesets/27.png | Bin 0 -> 1419 bytes gfx/tilesets/{28.2bpp.lz => 28.2bpp.lz.cace291c} | Bin gfx/tilesets/28.png | Bin 0 -> 1143 bytes gfx/tilesets/{29.2bpp.lz => 29.2bpp.lz.e23bc89f} | Bin gfx/tilesets/29.png | Bin 0 -> 2592 bytes gfx/tilesets/{30.2bpp.lz => 30.2bpp.lz.25b9c4b6} | Bin gfx/tilesets/30.png | Bin 0 -> 851 bytes gfx/tilesets/{31.2bpp.lz => 31.2bpp.lz.6b0ac896} | Bin gfx/tilesets/31.png | Bin 0 -> 1264 bytes gfx/tilesets/{32.2bpp.lz => 32.2bpp.lz.8b42470b} | Bin gfx/tilesets/32.png | Bin 0 -> 1909 bytes gfx/tilesets/{33.2bpp.lz => 33.2bpp.lz.8b42470b} | Bin gfx/tilesets/33.png | Bin 0 -> 1909 bytes gfx/tilesets/{34.2bpp.lz => 34.2bpp.lz.8b42470b} | Bin gfx/tilesets/34.png | Bin 0 -> 1909 bytes gfx/tilesets/{35.2bpp.lz => 35.2bpp.lz.8b42470b} | Bin gfx/tilesets/35.png | Bin 0 -> 1909 bytes gfx/tilesets/{36.2bpp.lz => 36.2bpp.lz.8b42470b} | Bin gfx/tilesets/36.png | Bin 0 -> 1909 bytes gfx/tilesets/flower/cgb_1.2bpp | 1 - gfx/tilesets/flower/cgb_1.png | Bin 0 -> 90 bytes gfx/tilesets/flower/cgb_2.2bpp | 1 - gfx/tilesets/flower/cgb_2.png | Bin 0 -> 88 bytes gfx/tilesets/flower/dmg_1.2bpp | 1 - gfx/tilesets/flower/dmg_1.png | Bin 0 -> 90 bytes gfx/tilesets/flower/dmg_2.2bpp | 1 - gfx/tilesets/flower/dmg_2.png | Bin 0 -> 90 bytes gfx/tilesets/forest-tree/1.2bpp | 1 - gfx/tilesets/forest-tree/1.png | Bin 0 -> 90 bytes gfx/tilesets/forest-tree/2.2bpp | 2 -- gfx/tilesets/forest-tree/2.png | Bin 0 -> 90 bytes gfx/tilesets/forest-tree/3.2bpp | Bin 16 -> 0 bytes gfx/tilesets/forest-tree/3.png | Bin 0 -> 90 bytes gfx/tilesets/forest-tree/4.2bpp | Bin 16 -> 0 bytes gfx/tilesets/forest-tree/4.png | Bin 0 -> 90 bytes gfx/tilesets/fountain/1.2bpp | Bin 16 -> 0 bytes gfx/tilesets/fountain/1.png | Bin 0 -> 79 bytes gfx/tilesets/fountain/2.2bpp | Bin 16 -> 0 bytes gfx/tilesets/fountain/2.png | Bin 0 -> 81 bytes gfx/tilesets/fountain/3.2bpp | Bin 16 -> 0 bytes gfx/tilesets/fountain/3.png | Bin 0 -> 87 bytes gfx/tilesets/fountain/4.2bpp | Bin 16 -> 0 bytes gfx/tilesets/fountain/4.png | Bin 0 -> 89 bytes gfx/tilesets/fountain/5.2bpp | Bin 16 -> 0 bytes gfx/tilesets/fountain/5.png | Bin 0 -> 85 bytes gfx/tilesets/roofs/0.2bpp | Bin 144 -> 0 bytes gfx/tilesets/roofs/0.png | Bin 0 -> 102 bytes gfx/tilesets/roofs/1.2bpp | Bin 144 -> 0 bytes gfx/tilesets/roofs/1.png | Bin 0 -> 103 bytes gfx/tilesets/roofs/2.2bpp | Bin 144 -> 0 bytes gfx/tilesets/roofs/2.png | Bin 0 -> 143 bytes gfx/tilesets/roofs/3.2bpp | Bin 144 -> 0 bytes gfx/tilesets/roofs/3.png | Bin 0 -> 97 bytes gfx/tilesets/roofs/4.2bpp | Bin 144 -> 0 bytes gfx/tilesets/roofs/4.png | Bin 0 -> 112 bytes gfx/tilesets/safari/1.2bpp | Bin 16 -> 0 bytes gfx/tilesets/safari/1.png | Bin 0 -> 89 bytes gfx/tilesets/safari/2.2bpp | Bin 16 -> 0 bytes gfx/tilesets/safari/2.png | Bin 0 -> 89 bytes gfx/tilesets/safari/3.2bpp | Bin 16 -> 0 bytes gfx/tilesets/safari/3.png | Bin 0 -> 87 bytes gfx/tilesets/safari/4.2bpp | Bin 16 -> 0 bytes gfx/tilesets/safari/4.png | Bin 0 -> 79 bytes gfx/tilesets/sprout-pillar/1.2bpp | 1 - gfx/tilesets/sprout-pillar/1.png | Bin 0 -> 137 bytes gfx/tilesets/sprout-pillar/10.2bpp | 1 - gfx/tilesets/sprout-pillar/10.png | Bin 0 -> 118 bytes gfx/tilesets/sprout-pillar/2.2bpp | 1 - gfx/tilesets/sprout-pillar/2.png | Bin 0 -> 133 bytes gfx/tilesets/sprout-pillar/3.2bpp | 1 - gfx/tilesets/sprout-pillar/3.png | Bin 0 -> 127 bytes gfx/tilesets/sprout-pillar/4.2bpp | 1 - gfx/tilesets/sprout-pillar/4.png | Bin 0 -> 130 bytes gfx/tilesets/sprout-pillar/5.2bpp | 1 - gfx/tilesets/sprout-pillar/5.png | Bin 0 -> 117 bytes gfx/tilesets/sprout-pillar/6.2bpp | 1 - gfx/tilesets/sprout-pillar/6.png | Bin 0 -> 116 bytes gfx/tilesets/sprout-pillar/7.2bpp | 1 - gfx/tilesets/sprout-pillar/7.png | Bin 0 -> 115 bytes gfx/tilesets/sprout-pillar/8.2bpp | 1 - gfx/tilesets/sprout-pillar/8.png | Bin 0 -> 115 bytes gfx/tilesets/sprout-pillar/9.2bpp | 1 - gfx/tilesets/sprout-pillar/9.png | Bin 0 -> 127 bytes gfx/tilesets/water.png | Bin 0 -> 100 bytes gfx/tilesets/whirlpool/1.2bpp | Bin 64 -> 0 bytes gfx/tilesets/whirlpool/1.png | Bin 0 -> 146 bytes gfx/tilesets/whirlpool/2.2bpp | Bin 64 -> 0 bytes gfx/tilesets/whirlpool/2.png | Bin 0 -> 145 bytes gfx/tilesets/whirlpool/3.2bpp | Bin 64 -> 0 bytes gfx/tilesets/whirlpool/3.png | Bin 0 -> 146 bytes gfx/tilesets/whirlpool/4.2bpp | Bin 64 -> 0 bytes gfx/tilesets/whirlpool/4.png | Bin 0 -> 145 bytes 147 files changed, 17 deletions(-) rename gfx/tilesets/{00.2bpp.lz => 00.2bpp.lz.0c7e555a} (100%) create mode 100644 gfx/tilesets/00.png rename gfx/tilesets/{01.2bpp.lz => 01.2bpp.lz.0c7e555a} (100%) create mode 100644 gfx/tilesets/01.png rename gfx/tilesets/{02.2bpp.lz => 02.2bpp.lz.391603fb} (100%) create mode 100644 gfx/tilesets/02.png rename gfx/tilesets/{03.2bpp.lz => 03.2bpp.lz.a29f5d51} (100%) create mode 100644 gfx/tilesets/03.png rename gfx/tilesets/{04.2bpp.lz => 04.2bpp.lz.391603fb} (100%) create mode 100644 gfx/tilesets/04.png rename gfx/tilesets/{05.2bpp.lz => 05.2bpp.lz.c848ef13} (100%) create mode 100644 gfx/tilesets/05.png rename gfx/tilesets/{06.2bpp.lz => 06.2bpp.lz.252cbd8f} (100%) create mode 100644 gfx/tilesets/06.png rename gfx/tilesets/{07.2bpp.lz => 07.2bpp.lz.e1c4014c} (100%) create mode 100644 gfx/tilesets/07.png rename gfx/tilesets/{08.2bpp.lz => 08.2bpp.lz.f5a55006} (100%) create mode 100644 gfx/tilesets/08.png rename gfx/tilesets/{09.2bpp.lz => 09.2bpp.lz.56b1a405} (100%) create mode 100644 gfx/tilesets/09.png rename gfx/tilesets/{10.2bpp.lz => 10.2bpp.lz.b8d0f547} (100%) create mode 100644 gfx/tilesets/10.png rename gfx/tilesets/{11.2bpp.lz => 11.2bpp.lz.454cfd8b} (100%) create mode 100644 gfx/tilesets/11.png rename gfx/tilesets/{12.2bpp.lz => 12.2bpp.lz.e2e94f92} (100%) create mode 100644 gfx/tilesets/12.png rename gfx/tilesets/{13.2bpp.lz => 13.2bpp.lz.63b414d4} (100%) create mode 100644 gfx/tilesets/13.png rename gfx/tilesets/{14.2bpp.lz => 14.2bpp.lz.71d29a2f} (100%) create mode 100644 gfx/tilesets/14.png rename gfx/tilesets/{15.2bpp.lz => 15.2bpp.lz.c1f2ed8f} (100%) create mode 100644 gfx/tilesets/15.png rename gfx/tilesets/{16.2bpp.lz => 16.2bpp.lz.dd51d079} (100%) create mode 100644 gfx/tilesets/16.png rename gfx/tilesets/{17.2bpp.lz => 17.2bpp.lz.1600ca86} (100%) create mode 100644 gfx/tilesets/17.png rename gfx/tilesets/{18.2bpp.lz => 18.2bpp.lz.93800351} (100%) create mode 100644 gfx/tilesets/18.png rename gfx/tilesets/{19.2bpp.lz => 19.2bpp.lz.0c1544c1} (100%) create mode 100644 gfx/tilesets/19.png rename gfx/tilesets/{20.2bpp.lz => 20.2bpp.lz.35e51007} (100%) create mode 100644 gfx/tilesets/20.png rename gfx/tilesets/{21.2bpp.lz => 21.2bpp.lz.febbc4ec} (100%) create mode 100644 gfx/tilesets/21.png rename gfx/tilesets/{22.2bpp.lz => 22.2bpp.lz.467b6a2d} (100%) create mode 100644 gfx/tilesets/22.png rename gfx/tilesets/{23.2bpp.lz => 23.2bpp.lz.bc56789c} (100%) create mode 100644 gfx/tilesets/23.png rename gfx/tilesets/{24.2bpp.lz => 24.2bpp.lz.3437812a} (100%) create mode 100644 gfx/tilesets/24.png rename gfx/tilesets/{25.2bpp.lz => 25.2bpp.lz.7fcb81d6} (100%) create mode 100644 gfx/tilesets/25.png rename gfx/tilesets/{26.2bpp.lz => 26.2bpp.lz.8b42470b} (100%) create mode 100644 gfx/tilesets/26.png rename gfx/tilesets/{27.2bpp.lz => 27.2bpp.lz.27cdd9ad} (100%) create mode 100644 gfx/tilesets/27.png rename gfx/tilesets/{28.2bpp.lz => 28.2bpp.lz.cace291c} (100%) create mode 100644 gfx/tilesets/28.png rename gfx/tilesets/{29.2bpp.lz => 29.2bpp.lz.e23bc89f} (100%) create mode 100644 gfx/tilesets/29.png rename gfx/tilesets/{30.2bpp.lz => 30.2bpp.lz.25b9c4b6} (100%) create mode 100644 gfx/tilesets/30.png rename gfx/tilesets/{31.2bpp.lz => 31.2bpp.lz.6b0ac896} (100%) create mode 100644 gfx/tilesets/31.png rename gfx/tilesets/{32.2bpp.lz => 32.2bpp.lz.8b42470b} (100%) create mode 100644 gfx/tilesets/32.png rename gfx/tilesets/{33.2bpp.lz => 33.2bpp.lz.8b42470b} (100%) create mode 100644 gfx/tilesets/33.png rename gfx/tilesets/{34.2bpp.lz => 34.2bpp.lz.8b42470b} (100%) create mode 100644 gfx/tilesets/34.png rename gfx/tilesets/{35.2bpp.lz => 35.2bpp.lz.8b42470b} (100%) create mode 100644 gfx/tilesets/35.png rename gfx/tilesets/{36.2bpp.lz => 36.2bpp.lz.8b42470b} (100%) create mode 100644 gfx/tilesets/36.png delete mode 100644 gfx/tilesets/flower/cgb_1.2bpp create mode 100644 gfx/tilesets/flower/cgb_1.png delete mode 100644 gfx/tilesets/flower/cgb_2.2bpp create mode 100644 gfx/tilesets/flower/cgb_2.png delete mode 100644 gfx/tilesets/flower/dmg_1.2bpp create mode 100644 gfx/tilesets/flower/dmg_1.png delete mode 100644 gfx/tilesets/flower/dmg_2.2bpp create mode 100644 gfx/tilesets/flower/dmg_2.png delete mode 100644 gfx/tilesets/forest-tree/1.2bpp create mode 100644 gfx/tilesets/forest-tree/1.png delete mode 100644 gfx/tilesets/forest-tree/2.2bpp create mode 100644 gfx/tilesets/forest-tree/2.png delete mode 100644 gfx/tilesets/forest-tree/3.2bpp create mode 100644 gfx/tilesets/forest-tree/3.png delete mode 100644 gfx/tilesets/forest-tree/4.2bpp create mode 100644 gfx/tilesets/forest-tree/4.png delete mode 100644 gfx/tilesets/fountain/1.2bpp create mode 100644 gfx/tilesets/fountain/1.png delete mode 100644 gfx/tilesets/fountain/2.2bpp create mode 100644 gfx/tilesets/fountain/2.png delete mode 100644 gfx/tilesets/fountain/3.2bpp create mode 100644 gfx/tilesets/fountain/3.png delete mode 100644 gfx/tilesets/fountain/4.2bpp create mode 100644 gfx/tilesets/fountain/4.png delete mode 100644 gfx/tilesets/fountain/5.2bpp create mode 100644 gfx/tilesets/fountain/5.png delete mode 100644 gfx/tilesets/roofs/0.2bpp create mode 100644 gfx/tilesets/roofs/0.png delete mode 100644 gfx/tilesets/roofs/1.2bpp create mode 100644 gfx/tilesets/roofs/1.png delete mode 100644 gfx/tilesets/roofs/2.2bpp create mode 100644 gfx/tilesets/roofs/2.png delete mode 100644 gfx/tilesets/roofs/3.2bpp create mode 100644 gfx/tilesets/roofs/3.png delete mode 100644 gfx/tilesets/roofs/4.2bpp create mode 100644 gfx/tilesets/roofs/4.png delete mode 100644 gfx/tilesets/safari/1.2bpp create mode 100644 gfx/tilesets/safari/1.png delete mode 100644 gfx/tilesets/safari/2.2bpp create mode 100644 gfx/tilesets/safari/2.png delete mode 100644 gfx/tilesets/safari/3.2bpp create mode 100644 gfx/tilesets/safari/3.png delete mode 100644 gfx/tilesets/safari/4.2bpp create mode 100644 gfx/tilesets/safari/4.png delete mode 100644 gfx/tilesets/sprout-pillar/1.2bpp create mode 100644 gfx/tilesets/sprout-pillar/1.png delete mode 100644 gfx/tilesets/sprout-pillar/10.2bpp create mode 100644 gfx/tilesets/sprout-pillar/10.png delete mode 100644 gfx/tilesets/sprout-pillar/2.2bpp create mode 100644 gfx/tilesets/sprout-pillar/2.png delete mode 100644 gfx/tilesets/sprout-pillar/3.2bpp create mode 100644 gfx/tilesets/sprout-pillar/3.png delete mode 100644 gfx/tilesets/sprout-pillar/4.2bpp create mode 100644 gfx/tilesets/sprout-pillar/4.png delete mode 100644 gfx/tilesets/sprout-pillar/5.2bpp create mode 100644 gfx/tilesets/sprout-pillar/5.png delete mode 100644 gfx/tilesets/sprout-pillar/6.2bpp create mode 100644 gfx/tilesets/sprout-pillar/6.png delete mode 100644 gfx/tilesets/sprout-pillar/7.2bpp create mode 100644 gfx/tilesets/sprout-pillar/7.png delete mode 100644 gfx/tilesets/sprout-pillar/8.2bpp create mode 100644 gfx/tilesets/sprout-pillar/8.png delete mode 100644 gfx/tilesets/sprout-pillar/9.2bpp create mode 100644 gfx/tilesets/sprout-pillar/9.png create mode 100644 gfx/tilesets/water.png delete mode 100644 gfx/tilesets/whirlpool/1.2bpp create mode 100644 gfx/tilesets/whirlpool/1.png delete mode 100644 gfx/tilesets/whirlpool/2.2bpp create mode 100644 gfx/tilesets/whirlpool/2.png delete mode 100644 gfx/tilesets/whirlpool/3.2bpp create mode 100644 gfx/tilesets/whirlpool/3.png delete mode 100644 gfx/tilesets/whirlpool/4.2bpp create mode 100644 gfx/tilesets/whirlpool/4.png diff --git a/gfx/tilesets/00.2bpp.lz b/gfx/tilesets/00.2bpp.lz.0c7e555a similarity index 100% rename from gfx/tilesets/00.2bpp.lz rename to gfx/tilesets/00.2bpp.lz.0c7e555a diff --git a/gfx/tilesets/00.png b/gfx/tilesets/00.png new file mode 100644 index 0000000000000000000000000000000000000000..0fc2db12fd791d8a5782d074eb259eec2be78ab9 GIT binary patch literal 2084 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 LNkvXXu0mjf0Y6nO literal 0 HcmV?d00001 diff --git a/gfx/tilesets/03.2bpp.lz b/gfx/tilesets/03.2bpp.lz.a29f5d51 similarity index 100% rename from gfx/tilesets/03.2bpp.lz rename to gfx/tilesets/03.2bpp.lz.a29f5d51 diff --git a/gfx/tilesets/03.png b/gfx/tilesets/03.png new file mode 100644 index 0000000000000000000000000000000000000000..08b2cbeeaab6c5697f5094f73ba9d1db376637bc GIT binary patch literal 1316 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 LNkvXXu0mjf0Y6nO literal 0 HcmV?d00001 diff --git a/gfx/tilesets/05.2bpp.lz b/gfx/tilesets/05.2bpp.lz.c848ef13 similarity index 100% rename from gfx/tilesets/05.2bpp.lz rename to gfx/tilesets/05.2bpp.lz.c848ef13 diff --git a/gfx/tilesets/05.png b/gfx/tilesets/05.png new file mode 100644 index 0000000000000000000000000000000000000000..3ab7b5ce88e5ea8040dc55ceef0aa8b7cb12c70c GIT binary patch literal 1264 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 JPDHLkV1lxJGI{_2 literal 0 HcmV?d00001 diff --git a/gfx/tilesets/08.2bpp.lz b/gfx/tilesets/08.2bpp.lz.f5a55006 similarity index 100% rename from gfx/tilesets/08.2bpp.lz rename to gfx/tilesets/08.2bpp.lz.f5a55006 diff --git a/gfx/tilesets/08.png b/gfx/tilesets/08.png new file mode 100644 index 0000000000000000000000000000000000000000..b8f2db2d254f2ebcbca714d9f8330ee3bf989db7 GIT binary patch literal 1146 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 P00000NkvXXu0mjfYST!w literal 0 HcmV?d00001 diff --git a/gfx/tilesets/13.2bpp.lz b/gfx/tilesets/13.2bpp.lz.63b414d4 similarity index 100% rename from gfx/tilesets/13.2bpp.lz rename to gfx/tilesets/13.2bpp.lz.63b414d4 diff --git a/gfx/tilesets/13.png b/gfx/tilesets/13.png new file mode 100644 index 0000000000000000000000000000000000000000..7dde8574e7293a9456eb53a76d747d0d4f9aba27 GIT binary patch literal 2047 zcmVIt-zzo#8e=q!!zdI1~anYKM)M=V@efQq)1>O9|~pGNn$imhGSYAl;%M zl}r>^p;bUQXq{sWd%lT^7HLuoMQ&S_2(xF-iFy^;dEM^6!qbueFSYnBhLV*PWl&%qKoe&2MkEJNa5~38K zlrc>cg7Z4YvdaPH8LWVKoO2<10Pa2lG>vB9X+^pF1O?}{f6b|QOhF!dga|)T@dR`7 zki-83g)!|CSet}OZyEuLOYxpI#xks^V%DHgsnT-*Xnw|wKFlfzK$OB2a9*&R z^Me-O-uCoTPObnU4zBMW`U`zHPjD^xW@^R&Ukio6Y(kG^@U>9Vd~GOtC9p||D3dwk zz=gWzHR{Wn0r&?a8EqTh@=!rFz|0jrspt-7&TLx-IdOc&mC{QuzkRuvne)QgMySDr zo3{kTi;&#bVfQoh=E-dG5#rZ96w<&_Cz&t~L+ z+o*KN_QJd}x!#-6F6+?s6CMR;W4DOdHbqOK=3p#a))CdNd5S{=2-JfT7&CxiY0C4$ zuYN8k&FZ)MExYP#4A5{J6{i?2C3&rH%WOA5?5Kx6pv9+YUJdoV-_t9@8ZvOpWD+!h z7?x=t@LmmH?*HxEWt_i3i^aLhq{38}8!l?#&Jx^41n?t};0Vuc|J#o@)~A=3Hmn4} zr}h_YJG60tCejF%2H{43t~t9m4OSH*!|yCKIUfUf`ID(EM;efm1T<#!D_5jB{*H{K z6;Uh4yLr8p*J!t1)gTCTbOC}qDZ_55iO0L*UoalmqN({)F!l=T?}yTlWgqqbPAd^A zfm=V~+u8BsQ2OaEEO6g(cf6392wd=HR7=HYv>S#_JGYFGkQPrk9nA?)E})BZbdri7F0E>uR#3>83Gd2ZTofV{a)-Y$z-&GO zj-(?Ax~*2z0ysQ9VU?ZSC&5e)f|Iq0L?{$H?eV6oe>FwL1wMrYtli z8gnEoF&`>)Z-*mA9%w#yzpuH&PN2}Zz}@?P*oh#JU-3+Sh`tS33L?_HqVu#f=h|1H=RU_rMho6w<2OP%H?^sS zrYRwxJ|UTvVNOZfeADt(#9Cqu3knKh-H)4QrJi-+F9iY@fq(&oC}OP0=9`j=CIqL` z0Gs9>Dq?IDTup{UM2uo6oY1JvH=c|8*3}@yiwV#pqk#2PVW@TCn^zH32INfXk%R=3 ztjOsc-%X%J2x`tD1dLUA8777vvY>aU(j6ZH;FZ!e$A?>wF=Y(& z=};hqtuu{a8dCANV|v>~rZgjXhrV(REg)EsiUkDU=7FCW5gn_F|6!^22{`eKl>)OmKBZOV0o+^xHasBQA^w}P>qQ$7Ojgr5N8qVCb2frEwzd|U zlo(7^<543QCch%9jTD=rg{GYi3xBNEW}9iJH#(A;Uh+WkhMgz=v;XA}nuaN*4Nj*y zo3biVOVphw20>Xu#oAGJo&FBu(TQ2zxo{WX6c6A5Q0ty_Pf{ywZB=vxe}|vxTaGBY ztGgOO`Mf7ucD+PJuvvnN{K{Hv(@E@MRFuyn7=)l+JmBhfb-NE?utTKSK7ioHXy2vc zfy!FLgEU)P5!`5f^Yw?9wj6PFSLCNdm0d4xWH1j?1S)G4z1VMrqIwt}_EVIutD9;t dLgAys|9^`3xmub4YPJ9X002ovPDHLkV1kc6y~qFn literal 0 HcmV?d00001 diff --git a/gfx/tilesets/14.2bpp.lz b/gfx/tilesets/14.2bpp.lz.71d29a2f similarity index 100% rename from gfx/tilesets/14.2bpp.lz rename to gfx/tilesets/14.2bpp.lz.71d29a2f diff --git a/gfx/tilesets/14.png b/gfx/tilesets/14.png new file mode 100644 index 0000000000000000000000000000000000000000..77690063894c511f24d6a4e4f78e9e6e1b23c218 GIT binary patch literal 1583 zcmV+~2GIG5P)CD0(NtF<832mq*$_4Kk(P6~>F`IkYicNf2LbKsC zI#bxtEIgqy(jJLE>cf&X3UfhB`6Dk&x5kiVjxDp$nJ!W|JHLBdN}=z2*-0<7_jA7I z{Lc5B-|qn9Z6&}TFKDfnu?~C(jLnjj03pE_SwdzkvG3>G9kYbAa}ePQN<$avNZn=9 zVLRptM;ME1AaH~b9|A%;P!$HSWq^I;eGYE^Im6if3{Xn~nqp?QT?aIf1aHv}jBFJU z-dZ@o-uPVulwuzrkNg+P;)H}QKKB}Jz-)&^rnu|Awt?> zENWsBAu8nFOIW8VJ%<1wCpK@2-Y5ddgQCL4E7JfP;G@Q#JZpMm%Y|z_P&_gI;k2Y` zfKL&dQ_egn4#h^f;)g3!lG>~f1-WyFEIKHjD5sOJCi3;kiSOYH(51}*g{1^npeqF5 z!=lGE8juq&YyRpAyXj$GZ%rw73ZJ@cv-&Bu`XypEf+d#$5LF@&mQL zQp6%rG*UXK<@sQ7$m^n1tUB$5&d=`_RP#==iqsCyrVw>o{jREjWH%O%o~Q>Xi3m+` zC_Nlvr!QO;%T~O3@2JxG21@(GM2$oF*Fo^?=-Dsw$Sls*Z4ChZQ-s*SdU%m|T%suE zDtk_Ra?sTvC;F!p$p+4rMa9$RIEV@ZA&nYvI&I*UqXv&EZpYZ`^Ly(z1N2TxO7i3Y zH=~eJ`T4gh&-$MG=GyKYpw!{A$O-d0KnQ?XP-cp{G62TGnQQ0AFa4NBL0r28Wf!2$GeVP1@4)kfQa?U` zHqS)mBp?J|Y6Spoo?^>M0HF28rul#TQCtU%A;8+GgJ++{Hz@GPM@;vUz^F}bq((n{ zMd=r~`MQ~FhEjRf<2wl#p{^M!3Sh#Ajx;Py$FQs=x9I*7i-p+J8G5UZPRDQ`^+93l zBDI*Q?-8X4c*S0<&Ec{RXkMg4rPMd2gG+?C_arosuY<`XV9dSu4yE3a_29Sf-Fx|g zkauTO@O^(X4X|Qy@Y5genkc2xZm52Y{}@YksN?I%4P0VS)s_jKQ<+T~F8!qe??@VG zb1ftlG#l7s#N})N1ZwFjKx>k~#~`&2nTq694ZLb?x{5{hK(Dr*1#UibTlL$>uU{-! zrL{`k?M|z(H80`S@^lK8+~Kpz@PN?zx(-tN!-on>#^HfMH3?Gt1H>Kn)8PSXO@dT( zz!t;TSvSz_P14(REUZt0)@enZ+M6EQ0 zCEG)snPB`v3P_nCvNaF(=W1;%qV_Hv#8-Ha_~0Kow+^cK@214s(`FQ`IujUxk) z1GLvjuM)1z1X4Ls`Dde|c56WD zOG=3eofV{%t01VKx?Emt3NpaBUh=MQ0AmCXH91`AaJaI9DpAZ-j7lW0h^WO?yzXY5 hd;?hD{s;dF_!lVf_X2<&h_e6y002ovPDHLkV1gJ+@ZSIc literal 0 HcmV?d00001 diff --git a/gfx/tilesets/15.2bpp.lz b/gfx/tilesets/15.2bpp.lz.c1f2ed8f similarity index 100% rename from gfx/tilesets/15.2bpp.lz rename to gfx/tilesets/15.2bpp.lz.c1f2ed8f diff --git a/gfx/tilesets/15.png b/gfx/tilesets/15.png new file mode 100644 index 0000000000000000000000000000000000000000..582b9365d28703d1bc1ad66bc5577b0190dc572c GIT binary patch literal 1282 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 WzfR|k!ha+H0000?OMZ literal 0 HcmV?d00001 diff --git a/gfx/tilesets/18.2bpp.lz b/gfx/tilesets/18.2bpp.lz.93800351 similarity index 100% rename from gfx/tilesets/18.2bpp.lz rename to gfx/tilesets/18.2bpp.lz.93800351 diff --git a/gfx/tilesets/18.png b/gfx/tilesets/18.png new file mode 100644 index 0000000000000000000000000000000000000000..350c04932cfbb5f0b69874d945152bd9d5af6683 GIT binary patch literal 2284 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 M07*qoM6N<$f~rhnGXMYp literal 0 HcmV?d00001 diff --git a/gfx/tilesets/21.2bpp.lz b/gfx/tilesets/21.2bpp.lz.febbc4ec similarity index 100% rename from gfx/tilesets/21.2bpp.lz rename to gfx/tilesets/21.2bpp.lz.febbc4ec diff --git a/gfx/tilesets/21.png b/gfx/tilesets/21.png new file mode 100644 index 0000000000000000000000000000000000000000..889b0272740c6658100b4154f85a58dfe9b1b321 GIT binary patch literal 2498 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 M07*qoM6N<$f`}W!H~;_u literal 0 HcmV?d00001 diff --git a/gfx/tilesets/22.2bpp.lz b/gfx/tilesets/22.2bpp.lz.467b6a2d similarity index 100% rename from gfx/tilesets/22.2bpp.lz rename to gfx/tilesets/22.2bpp.lz.467b6a2d diff --git a/gfx/tilesets/22.png b/gfx/tilesets/22.png new file mode 100644 index 0000000000000000000000000000000000000000..1cd57402def5282eb77d490d1b74903f2f147df6 GIT binary patch literal 993 zcmV<710MW|P)Q$!DmZYrgQ42_mIf)AsJC4mnRFOH#FU0!`vOXWIe z1Qv<*7+!$XSXuqEmMVW=c>}7|Pk#QT=C1Dq|B3Lzmo>N9WXMfwm?s~=-QEz0ojr#V4;t`)Jj{C$PBKShzMfxv$Z3i&p>yqKhfVD{~Z8Cy(XfDkA(gy zr4CpApl#P$;$w;gK!B^%P7K*ObQ)=`EgaBFhyue2@kOa>!U3zpfE0C>l4Gk!8 z&}u!h_XHO033Sr{v1fmc&L1xdWVWXuH4XvZi^l}gZ4KPIF8(*-W!FFegD#>P@rlqW zweOEFTqp~iLP9kdVti}Vu=zU3n~FVQc<>r58Mwlbou=v$jTq3R3imYJx-kJ7!$I*a zAYDC-G4S$`y0aR~eD*FE0{4vUQYw&p2*7ud#}?5RxOIU~gC@5-0sF_7Hn;_WB*ST? zZ!ZsLnDF7`ae?g$QFaPfqov1SpA$I8Z)njI=rP|$%tJCGP%IE-t_esBw|yrMN0S1D zU83|&q8$IZboYy$3*Z_EU?Clt7h)~kEoLr2Ue@-5eD1>_5O6yZ32B)xG^t7b@*s$! zgU)pThOc+05FZ3_a?o1iYg~t~)&wL~zYMUX9CR-dy;~cn(h#SPfFsBCt%m0-CPMC` z0ZwHieiO64c10QNWdC;WwU3|AAw$JCXg{J+%O$Pq)b&W~A+QqDUZ z1c-Oq4l+n_efU$r(ij|HUl)+In2pyp}Q7YG5sn0{hG9957m7An91yG47WXihvrs668(Nzwr!eSM2@rAcvr$Q0fICJZPT z<0%qrmBkfcPJ#1dgiH{n$lbgSU`)vA4odN>2po1|AzI^1jxUQ!FM~9RKby9s# zlI-(qoKwldOcf$VBgT=J{eCm^1xJB+EmOZUQZstojl>(&^1}rwSJ*rUPz<4tJ4fzLPr-1>9kBW1&0xT*n z1sb9Zj1d4o4*}B#Si4mD><0s^DFHVipo8N*6+OlcH@efN?97*dFCGe11l|o;Po%+Cg#6S;VWg+B$L{f$ zz)JlcIw`(~C0I##L^lHP2oyJmSRWdLqm4R{bU;8B!OA9H>73iA z1B(tYxSL&^6Cef9TQUzi7z43d24~ZvECfe=&d|&Xz~H*xp8^Q^N_#uQX<(lZiiH4S znv`otXog<~3LAoTwFMs|tBYe{7l>kQXGKH! zho~>60Z3Sc4)1wTn#!EIJAzL3`8UMi+yB|0-h4C>OK%!?c?(I#I?@1F)Zx1A z>b2X-$#P>-38leUWobvLQJW8+KWSLV&?w%Ccd|{PXuwfjH7=CoD)lkCq zxZdWNjt;bJ&(k%S;D`|qd-VMT+vx7A3n@JiCnSkX3FPxx4tlsGZuf%R^8&4T=h zc7|{Hlw+B8CWI0OI6;s+^wR{zIOF=ioW`{{dCK+@M}+P*s)OB_v@=gU9!I@1KRU z+T;7JO;w>|3u$onHB0-M>Teq+u9iE?9Yx=#!40n@{dVz>8co}A`?%x9uhYQV4jWGF z9p9^}$II*v&0l4j(l$j8Kjd78;q6eSbJgv>a&`B}M=)c}3|G5XtZ6<$ zqp!^kadk=FZ9bj300QVGd}S$Sfuc;4;BlMg7njaSP?Q-2eTT~@e?P*0Xw3{8+-Nho z8y%B7jOzgMmzR`>aSS@vo3d6-4H|GiT9?oA!-73lGQ<5B`K_~Y52uMu00000NkvXX Hu0mjfVph6D literal 0 HcmV?d00001 diff --git a/gfx/tilesets/24.2bpp.lz b/gfx/tilesets/24.2bpp.lz.3437812a similarity index 100% rename from gfx/tilesets/24.2bpp.lz rename to gfx/tilesets/24.2bpp.lz.3437812a diff --git a/gfx/tilesets/24.png b/gfx/tilesets/24.png new file mode 100644 index 0000000000000000000000000000000000000000..0e5bdee7e91f179d5a430af0eb09efd0af50a80d GIT binary patch literal 1044 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 literal 0 HcmV?d00001 diff --git a/gfx/tilesets/27.2bpp.lz b/gfx/tilesets/27.2bpp.lz.27cdd9ad similarity index 100% rename from gfx/tilesets/27.2bpp.lz rename to gfx/tilesets/27.2bpp.lz.27cdd9ad diff --git a/gfx/tilesets/27.png b/gfx/tilesets/27.png new file mode 100644 index 0000000000000000000000000000000000000000..8d2d32e1f873a2bf0ca2dccb2d721074be2a853a GIT binary patch literal 1419 zcmV;61$6p}P)js>CL#Tc_|Fm&$S`Oo zqC+Oe{a3V-^^T>OpdmBx3c&?o2_y!iM#UINOcPo8CCh7h$8&C9w?;$a--eU5d-s0c zIrn?dIrkP2vz8E&43z0orrQx`0MWFi93e9huOc!C0@M+(O(6yV+&m>Ee=q9}^bjac zBff}ua}Kn;pbaV@#QR_V`sN&1{((N|gc?G;Q4NeiwYUORp`688?uL!ORE2_S02BD31!z5DN?+DURJ%9^EfF zYY?FHl^(yI{X=>5dK^^_XrC~TE5N!`Van+leL8Pnh4SvyZs_GF)DE&%)}nt)VR^|Y zoit>yK|YqfPBUhq(H=(p79tDuBY&-zo?f}qoH!0(dwR{!5YIzrLO<~1K1gODaPRVM zfSF{**ors_krR4sW%5oY|4P%5jTDNXK9zDGL`uFM3gz~?nee4O?q;&3UMSqS!k+awi(wQ+5f0mUDlC*?2{ zm-S3{3h429HKlIy^Udk+rR;-Z)IVMED4J+ANx9WCLLT*?d>;S^Lm7MShY(fUu-TBU)vRruY-cm*H{-T*FZPXdJo`t+NXrm zq`TASt!>`i)u)?xcBV|b;Q(Si=Vf?J4E)VP^y#NeD+^%p{h)Lkc0RELpjH3+&z+@? zIzz3=x-UxkvI>h2EFb&)d2vk%-uToeABrjqhl0q!BL$s|CU%gkd1 zxQDnV-ejhR%gkd1xQDnVm5@9xd(eX1OCM8+cPJ!}71$GxujO8%5CpWIDZZGjp z==Z`g19ONql+^apF~mj4HyPVZ2TbK^BCvqoxrlgc4uo$`UAPcwZ-dq)T#YK=o;o)_ z5^RGNoBjdh)cLW9c9e>LAK>?M7a?kLT*|Lx+Q2Eq2&t;caTl>%x_W~wm;`lH>5j?) zDcv%PjzL9t)U-^@;~c2yj+$y*1svV~29CV{4l25%<>bzRS>3Zge-6O=*aPqYJOKY2 Z@Hd&3e?~#OoSXmv002ovPDHLkV1nkUt#beX literal 0 HcmV?d00001 diff --git a/gfx/tilesets/28.2bpp.lz b/gfx/tilesets/28.2bpp.lz.cace291c similarity index 100% rename from gfx/tilesets/28.2bpp.lz rename to gfx/tilesets/28.2bpp.lz.cace291c diff --git a/gfx/tilesets/28.png b/gfx/tilesets/28.png new file mode 100644 index 0000000000000000000000000000000000000000..0a83d20436bbf45e08bf802f17f00bd9e126d503 GIT binary patch literal 1143 zcmV--1c>{IP)zILt1pIqA+)s} zNCca~P1*2GleBR2WLRJN%4j=K=b$f~;+w&sc~JveO&z%OHpg@By-9o_{slRQ5bpgv z&-Z!GIp1@EQUFA7hUgW=F8hfCLPC@claNab8!gY_B&GK(KxsFRX+iX~-@ZHqk>3vP zIT`^5ygZhjsI1dnO6~3tPqsQ>ZM>YL`_&A@)9+b8 z6_TWgv{K)Gp8$`|;K~_7F7n5fbH-779fZK2ZMf(KaEn=g`0nOrKM$Iw^brUGNa87J zQA7-H+#OgwOX)9H35mdgh8M6lwIQE^Xa~XCbEniD;)XF%RjezQNC93T<7hc@p86P~Hybr5_ zdV;SPb9}Bq3^98rCVdFMx|C@iU0mmL+mwk2o9PZOloeOLjb)VcY|b^C?yv%bTE{J@ zJn&Gja~_qgJyR3`j(FV(pkMao+hQ0q0YcEaXS$VU^O^3JccAk5SL@ zl=9Qdu*_hb1q=a5d<&8j+>-z-b89fZ0uV&h`KGPK0LIRcFmJ*iPifGFnBd!-MP})< zsc;E#$v@}PtQ!1aFh*&LWt0Gx{MVS3tA7z%+NVBakbs9?`F!1B=_!2+-wQ=SW znJA^lS3i;Y{U`uD#qE-`eo68`);$)GU&)xpx7W|vMwsr7E0S%6ICTdE4LeduvdB%WwP3RDmI-oSOgY#1c%t*aHQ0r36b_Fy%23*k3 z7d%S6IIGcQeUPDP(51TT?XruF&X@YXM*}oK12jMbG{FCWe*o?OleyGf50?M{002ov JPDHLkV1n%cCE@@8 literal 0 HcmV?d00001 diff --git a/gfx/tilesets/29.2bpp.lz b/gfx/tilesets/29.2bpp.lz.e23bc89f similarity index 100% rename from gfx/tilesets/29.2bpp.lz rename to gfx/tilesets/29.2bpp.lz.e23bc89f diff --git a/gfx/tilesets/29.png b/gfx/tilesets/29.png new file mode 100644 index 0000000000000000000000000000000000000000..d70eb53be94f1214d585a27b5099ea5f9ba1efcb GIT binary patch literal 2592 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 literal 0 HcmV?d00001 diff --git a/gfx/tilesets/31.2bpp.lz b/gfx/tilesets/31.2bpp.lz.6b0ac896 similarity index 100% rename from gfx/tilesets/31.2bpp.lz rename to gfx/tilesets/31.2bpp.lz.6b0ac896 diff --git a/gfx/tilesets/31.png b/gfx/tilesets/31.png new file mode 100644 index 0000000000000000000000000000000000000000..a85cc03946ad0921d3bc9180716c5077a8a30cc3 GIT binary patch literal 1264 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 literal 0 HcmV?d00001 diff --git a/gfx/tilesets/33.2bpp.lz b/gfx/tilesets/33.2bpp.lz.8b42470b similarity index 100% rename from gfx/tilesets/33.2bpp.lz rename to gfx/tilesets/33.2bpp.lz.8b42470b diff --git a/gfx/tilesets/33.png b/gfx/tilesets/33.png new file mode 100644 index 0000000000000000000000000000000000000000..f41866c586fa754d0086b052ccc6f172d0163a00 GIT binary patch literal 1909 zcmV-*2a5QKP)ru5g)mdBR`T>Y9;XQ$uF_N(ILDPN@=?6N=AmgB$b0cBbgqY@+8(eg!HnM_R#0o z4TRFe3&f@tEWC!bk){bG$Haj`(?bsXC*-j7oVeX{(>ODqY`ChiPg+HAfW|LLFlo14wo_~Gxd z#AUY3$`LqedgtgT|9azYnoh)IB9>X6FY@III*Y|$e-qm8Ocsm#;{IL1x05tap_8Uj zyFa+b9>d9GmXoDJ2I58Z#&2J}%^vany9u9=Wb`QK@1GWm5Z)iw>rd97yt!Fr?1L)+ z&4nA!T-*>ln~!!;y@L2)ANwy(p8ee+4=w=?XULDZ_p8T0<~&xkq{lMLhIC{a1e(Tq z%;tG6Jt)95&qs6rkN-D0k1Si{(ql2tMtL63+qb@HE;x_u;4!18j^@Wd`tR*Lrw3<; zGgdgqBz@tn=f0p&aW*dzju0<#7*phV-qnI`Nk3U3<-wXV{zmKblY_SS$5K;w-l302 zkL!Ejr-*-%3TdBf!|>sWTTiJb0l*FUpX~I}yTkAYCrV>OM!-$P&sZ7T_QT_$a35>+ ze{8q^V*sE6PCq9gII$c5*>1mOzz#o?kLo`9H!167Ja{m`TJj&Bkg~wvd;AdKBfu*w z_FwAj^%{sqsU!xtVzX>E;^<(R#Vg4&ZobN>su@X6da#O;bU^?>N<5H4vc^IPNTsod zgPBxFo^u5VV2@e0UjK4ETg|d1c}tJUYBJ{|Hk+3=Whs3NkANcRleMX`xL;xWU=u&0Iwl_ zT;0m0mju|}NBr|dR*Y4}XHZmZK7cxteKDF-ok!g9AVy0eMzYIYlRDj?@udS8fI~`s zW%;&=4<Zr>bAfIYylOyMT35_N@WzBa^npNI;lj^~v}0OR*@`Swme4ESMR zHT>t7c#rdfr;P^IKrv0dH2~*r5n}PWoNQ3L;}qTNh`lKd0KUG2t^~BUYFwj^aTThS z3lOTxZ3);3Ktw=b3$W>038*$~qT_k7Ekvk^{i!O=+e<|xsu9tUis1mzA+_QN9lcfd zs8`(V061q@sD8h8=7-cPR9$m#_Q2%1YnpQWnvj)Q!M&bc)Qha3RVqbxL=(Fc+Ob>! zwDVHp7V!c}Xh&St)A~g-35_OSj{^}w$5mpEzSV9vI-%8IZ%+jU63>e$`etxeQ^`|J z0xjz41URZuQuHr+WDc)suWVf&HNe+fzTcbrJ=IW%kEyR3RsgOARs3YVDTzumdwNR| zdTRaK`LDe8Yp;qTNIz6&67R)BA3$Rr1@{(sI>nTI-5mpzy z%R|2}QwU`i+#}2n$hZgQmDzh;QQUVNthBY$7hg+VwN;8F&|-dS@!Jy>0T&fJeLl_cRtnXYWkoodkDIyl5Z=5Xs)=i6uM|o96-nM34k_ zJCo&wmR9khcPcPyNwP$oXjcqM0BpKRdm=y{e3n%K6!hLN`L8Ydqss5gw)W-T7yjOW z!ke0)JV8iB4p4YKRIlTK52-79C^e&O$v|=!yY?5F?-A^;6)uVc98p9v#)KzF5=GB$5m>+-v?Bdt= zc_8&;dy7HKpKr>Cn9mw~G)KxX7 zdi23LAm>85q9W3OVcEz*qqhVXmULy=d_lU^@f+4cPL=g_NR700000NkvXXu0mjf#sZ#K literal 0 HcmV?d00001 diff --git a/gfx/tilesets/34.2bpp.lz b/gfx/tilesets/34.2bpp.lz.8b42470b similarity index 100% rename from gfx/tilesets/34.2bpp.lz rename to gfx/tilesets/34.2bpp.lz.8b42470b diff --git a/gfx/tilesets/34.png b/gfx/tilesets/34.png new file mode 100644 index 0000000000000000000000000000000000000000..f41866c586fa754d0086b052ccc6f172d0163a00 GIT binary patch literal 1909 zcmV-*2a5QKP)ru5g)mdBR`T>Y9;XQ$uF_N(ILDPN@=?6N=AmgB$b0cBbgqY@+8(eg!HnM_R#0o z4TRFe3&f@tEWC!bk){bG$Haj`(?bsXC*-j7oVeX{(>ODqY`ChiPg+HAfW|LLFlo14wo_~Gxd z#AUY3$`LqedgtgT|9azYnoh)IB9>X6FY@III*Y|$e-qm8Ocsm#;{IL1x05tap_8Uj zyFa+b9>d9GmXoDJ2I58Z#&2J}%^vany9u9=Wb`QK@1GWm5Z)iw>rd97yt!Fr?1L)+ z&4nA!T-*>ln~!!;y@L2)ANwy(p8ee+4=w=?XULDZ_p8T0<~&xkq{lMLhIC{a1e(Tq z%;tG6Jt)95&qs6rkN-D0k1Si{(ql2tMtL63+qb@HE;x_u;4!18j^@Wd`tR*Lrw3<; zGgdgqBz@tn=f0p&aW*dzju0<#7*phV-qnI`Nk3U3<-wXV{zmKblY_SS$5K;w-l302 zkL!Ejr-*-%3TdBf!|>sWTTiJb0l*FUpX~I}yTkAYCrV>OM!-$P&sZ7T_QT_$a35>+ ze{8q^V*sE6PCq9gII$c5*>1mOzz#o?kLo`9H!167Ja{m`TJj&Bkg~wvd;AdKBfu*w z_FwAj^%{sqsU!xtVzX>E;^<(R#Vg4&ZobN>su@X6da#O;bU^?>N<5H4vc^IPNTsod zgPBxFo^u5VV2@e0UjK4ETg|d1c}tJUYBJ{|Hk+3=Whs3NkANcRleMX`xL;xWU=u&0Iwl_ zT;0m0mju|}NBr|dR*Y4}XHZmZK7cxteKDF-ok!g9AVy0eMzYIYlRDj?@udS8fI~`s zW%;&=4<Zr>bAfIYylOyMT35_N@WzBa^npNI;lj^~v}0OR*@`Swme4ESMR zHT>t7c#rdfr;P^IKrv0dH2~*r5n}PWoNQ3L;}qTNh`lKd0KUG2t^~BUYFwj^aTThS z3lOTxZ3);3Ktw=b3$W>038*$~qT_k7Ekvk^{i!O=+e<|xsu9tUis1mzA+_QN9lcfd zs8`(V061q@sD8h8=7-cPR9$m#_Q2%1YnpQWnvj)Q!M&bc)Qha3RVqbxL=(Fc+Ob>! zwDVHp7V!c}Xh&St)A~g-35_OSj{^}w$5mpEzSV9vI-%8IZ%+jU63>e$`etxeQ^`|J z0xjz41URZuQuHr+WDc)suWVf&HNe+fzTcbrJ=IW%kEyR3RsgOARs3YVDTzumdwNR| zdTRaK`LDe8Yp;qTNIz6&67R)BA3$Rr1@{(sI>nTI-5mpzy z%R|2}QwU`i+#}2n$hZgQmDzh;QQUVNthBY$7hg+VwN;8F&|-dS@!Jy>0T&fJeLl_cRtnXYWkoodkDIyl5Z=5Xs)=i6uM|o96-nM34k_ zJCo&wmR9khcPcPyNwP$oXjcqM0BpKRdm=y{e3n%K6!hLN`L8Ydqss5gw)W-T7yjOW z!ke0)JV8iB4p4YKRIlTK52-79C^e&O$v|=!yY?5F?-A^;6)uVc98p9v#)KzF5=GB$5m>+-v?Bdt= zc_8&;dy7HKpKr>Cn9mw~G)KxX7 zdi23LAm>85q9W3OVcEz*qqhVXmULy=d_lU^@f+4cPL=g_NR700000NkvXXu0mjf#sZ#K literal 0 HcmV?d00001 diff --git a/gfx/tilesets/35.2bpp.lz b/gfx/tilesets/35.2bpp.lz.8b42470b similarity index 100% rename from gfx/tilesets/35.2bpp.lz rename to gfx/tilesets/35.2bpp.lz.8b42470b diff --git a/gfx/tilesets/35.png b/gfx/tilesets/35.png new file mode 100644 index 0000000000000000000000000000000000000000..f41866c586fa754d0086b052ccc6f172d0163a00 GIT binary patch literal 1909 zcmV-*2a5QKP)ru5g)mdBR`T>Y9;XQ$uF_N(ILDPN@=?6N=AmgB$b0cBbgqY@+8(eg!HnM_R#0o z4TRFe3&f@tEWC!bk){bG$Haj`(?bsXC*-j7oVeX{(>ODqY`ChiPg+HAfW|LLFlo14wo_~Gxd z#AUY3$`LqedgtgT|9azYnoh)IB9>X6FY@III*Y|$e-qm8Ocsm#;{IL1x05tap_8Uj zyFa+b9>d9GmXoDJ2I58Z#&2J}%^vany9u9=Wb`QK@1GWm5Z)iw>rd97yt!Fr?1L)+ z&4nA!T-*>ln~!!;y@L2)ANwy(p8ee+4=w=?XULDZ_p8T0<~&xkq{lMLhIC{a1e(Tq z%;tG6Jt)95&qs6rkN-D0k1Si{(ql2tMtL63+qb@HE;x_u;4!18j^@Wd`tR*Lrw3<; zGgdgqBz@tn=f0p&aW*dzju0<#7*phV-qnI`Nk3U3<-wXV{zmKblY_SS$5K;w-l302 zkL!Ejr-*-%3TdBf!|>sWTTiJb0l*FUpX~I}yTkAYCrV>OM!-$P&sZ7T_QT_$a35>+ ze{8q^V*sE6PCq9gII$c5*>1mOzz#o?kLo`9H!167Ja{m`TJj&Bkg~wvd;AdKBfu*w z_FwAj^%{sqsU!xtVzX>E;^<(R#Vg4&ZobN>su@X6da#O;bU^?>N<5H4vc^IPNTsod zgPBxFo^u5VV2@e0UjK4ETg|d1c}tJUYBJ{|Hk+3=Whs3NkANcRleMX`xL;xWU=u&0Iwl_ zT;0m0mju|}NBr|dR*Y4}XHZmZK7cxteKDF-ok!g9AVy0eMzYIYlRDj?@udS8fI~`s zW%;&=4<Zr>bAfIYylOyMT35_N@WzBa^npNI;lj^~v}0OR*@`Swme4ESMR zHT>t7c#rdfr;P^IKrv0dH2~*r5n}PWoNQ3L;}qTNh`lKd0KUG2t^~BUYFwj^aTThS z3lOTxZ3);3Ktw=b3$W>038*$~qT_k7Ekvk^{i!O=+e<|xsu9tUis1mzA+_QN9lcfd zs8`(V061q@sD8h8=7-cPR9$m#_Q2%1YnpQWnvj)Q!M&bc)Qha3RVqbxL=(Fc+Ob>! zwDVHp7V!c}Xh&St)A~g-35_OSj{^}w$5mpEzSV9vI-%8IZ%+jU63>e$`etxeQ^`|J z0xjz41URZuQuHr+WDc)suWVf&HNe+fzTcbrJ=IW%kEyR3RsgOARs3YVDTzumdwNR| zdTRaK`LDe8Yp;qTNIz6&67R)BA3$Rr1@{(sI>nTI-5mpzy z%R|2}QwU`i+#}2n$hZgQmDzh;QQUVNthBY$7hg+VwN;8F&|-dS@!Jy>0T&fJeLl_cRtnXYWkoodkDIyl5Z=5Xs)=i6uM|o96-nM34k_ zJCo&wmR9khcPcPyNwP$oXjcqM0BpKRdm=y{e3n%K6!hLN`L8Ydqss5gw)W-T7yjOW z!ke0)JV8iB4p4YKRIlTK52-79C^e&O$v|=!yY?5F?-A^;6)uVc98p9v#)KzF5=GB$5m>+-v?Bdt= zc_8&;dy7HKpKr>Cn9mw~G)KxX7 zdi23LAm>85q9W3OVcEz*qqhVXmULy=d_lU^@f+4cPL=g_NR700000NkvXXu0mjf#sZ#K literal 0 HcmV?d00001 diff --git a/gfx/tilesets/36.2bpp.lz b/gfx/tilesets/36.2bpp.lz.8b42470b similarity index 100% rename from gfx/tilesets/36.2bpp.lz rename to gfx/tilesets/36.2bpp.lz.8b42470b diff --git a/gfx/tilesets/36.png b/gfx/tilesets/36.png new file mode 100644 index 0000000000000000000000000000000000000000..f41866c586fa754d0086b052ccc6f172d0163a00 GIT binary patch literal 1909 zcmV-*2a5QKP)ru5g)mdBR`T>Y9;XQ$uF_N(ILDPN@=?6N=AmgB$b0cBbgqY@+8(eg!HnM_R#0o z4TRFe3&f@tEWC!bk){bG$Haj`(?bsXC*-j7oVeX{(>ODqY`ChiPg+HAfW|LLFlo14wo_~Gxd z#AUY3$`LqedgtgT|9azYnoh)IB9>X6FY@III*Y|$e-qm8Ocsm#;{IL1x05tap_8Uj zyFa+b9>d9GmXoDJ2I58Z#&2J}%^vany9u9=Wb`QK@1GWm5Z)iw>rd97yt!Fr?1L)+ z&4nA!T-*>ln~!!;y@L2)ANwy(p8ee+4=w=?XULDZ_p8T0<~&xkq{lMLhIC{a1e(Tq z%;tG6Jt)95&qs6rkN-D0k1Si{(ql2tMtL63+qb@HE;x_u;4!18j^@Wd`tR*Lrw3<; zGgdgqBz@tn=f0p&aW*dzju0<#7*phV-qnI`Nk3U3<-wXV{zmKblY_SS$5K;w-l302 zkL!Ejr-*-%3TdBf!|>sWTTiJb0l*FUpX~I}yTkAYCrV>OM!-$P&sZ7T_QT_$a35>+ ze{8q^V*sE6PCq9gII$c5*>1mOzz#o?kLo`9H!167Ja{m`TJj&Bkg~wvd;AdKBfu*w z_FwAj^%{sqsU!xtVzX>E;^<(R#Vg4&ZobN>su@X6da#O;bU^?>N<5H4vc^IPNTsod zgPBxFo^u5VV2@e0UjK4ETg|d1c}tJUYBJ{|Hk+3=Whs3NkANcRleMX`xL;xWU=u&0Iwl_ zT;0m0mju|}NBr|dR*Y4}XHZmZK7cxteKDF-ok!g9AVy0eMzYIYlRDj?@udS8fI~`s zW%;&=4<Zr>bAfIYylOyMT35_N@WzBa^npNI;lj^~v}0OR*@`Swme4ESMR zHT>t7c#rdfr;P^IKrv0dH2~*r5n}PWoNQ3L;}qTNh`lKd0KUG2t^~BUYFwj^aTThS z3lOTxZ3);3Ktw=b3$W>038*$~qT_k7Ekvk^{i!O=+e<|xsu9tUis1mzA+_QN9lcfd zs8`(V061q@sD8h8=7-cPR9$m#_Q2%1YnpQWnvj)Q!M&bc)Qha3RVqbxL=(Fc+Ob>! zwDVHp7V!c}Xh&St)A~g-35_OSj{^}w$5mpEzSV9vI-%8IZ%+jU63>e$`etxeQ^`|J z0xjz41URZuQuHr+WDc)suWVf&HNe+fzTcbrJ=IW%kEyR3RsgOARs3YVDTzumdwNR| zdTRaK`LDe8Yp;qTNIz6&67R)BA3$Rr1@{(sI>nTI-5mpzy z%R|2}QwU`i+#}2n$hZgQmDzh;QQUVNthBY$7hg+VwN;8F&|-dS@!Jy>0T&fJeLl_cRtnXYWkoodkDIyl5Z=5Xs)=i6uM|o96-nM34k_ zJCo&wmR9khcPcPyNwP$oXjcqM0BpKRdm=y{e3n%K6!hLN`L8Ydqss5gw)W-T7yjOW z!ke0)JV8iB4p4YKRIlTK52-79C^e&O$v|=!yY?5F?-A^;6)uVc98p9v#)KzF5=GB$5m>+-v?Bdt= zc_8&;dy7HKpKr>Cn9mw~G)KxX7 zdi23LAm>85q9W3OVcEz*qqhVXmULy=d_lU^@f+4cPL=g_NR700000NkvXXu0mjf#sZ#K literal 0 HcmV?d00001 diff --git a/gfx/tilesets/flower/cgb_1.2bpp b/gfx/tilesets/flower/cgb_1.2bpp deleted file mode 100644 index ffe58b93e..000000000 --- a/gfx/tilesets/flower/cgb_1.2bpp +++ /dev/null @@ -1 +0,0 @@ - M-mLAHE0 \ No newline at end of file diff --git a/gfx/tilesets/flower/cgb_1.png b/gfx/tilesets/flower/cgb_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e3fd2867bc16b3bfe5ce8880692f6b6c328521be GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e?S@Pa9Muv(rTmmaEhf097c)I$ztaD0e0st_19AE$d literal 0 HcmV?d00001 diff --git a/gfx/tilesets/flower/dmg_1.2bpp b/gfx/tilesets/flower/dmg_1.2bpp deleted file mode 100644 index ec9e9c6d4..000000000 --- a/gfx/tilesets/flower/dmg_1.2bpp +++ /dev/null @@ -1 +0,0 @@ - A! a 1HE0 \ No newline at end of file diff --git a/gfx/tilesets/flower/dmg_1.png b/gfx/tilesets/flower/dmg_1.png new file mode 100644 index 0000000000000000000000000000000000000000..428514af4fbe64bd27f8e6552c79e32c6d0337c8 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}ebP0l+XkKiiREM literal 0 HcmV?d00001 diff --git a/gfx/tilesets/flower/dmg_2.2bpp b/gfx/tilesets/flower/dmg_2.2bpp deleted file mode 100644 index 7bf87eab2..000000000 --- a/gfx/tilesets/flower/dmg_2.2bpp +++ /dev/null @@ -1 +0,0 @@ -A$BBfZ$E \ No newline at end of file diff --git a/gfx/tilesets/flower/dmg_2.png b/gfx/tilesets/flower/dmg_2.png new file mode 100644 index 0000000000000000000000000000000000000000..9a51250170c22dce82629fda4caedad24e5dab57 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<{9 diff --git a/gfx/tilesets/fountain/1.png b/gfx/tilesets/fountain/1.png new file mode 100644 index 0000000000000000000000000000000000000000..657a5c4556f5938e610f4f59743e584ed95f972c GIT binary patch literal 79 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}ehE&{2=HN|jSbQZ!z|wS* aqKXKEQyJ@)(6GB+AeEl3elF{r5}E*`@)NEA literal 0 HcmV?d00001 diff --git a/gfx/tilesets/fountain/2.2bpp b/gfx/tilesets/fountain/2.2bpp deleted file mode 100644 index 402b6c82864691f4e320493b63043cec7f98f137..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 TcmZSh&j5kfHI6g97x)hVK7a?o diff --git a/gfx/tilesets/fountain/2.png b/gfx/tilesets/fountain/2.png new file mode 100644 index 0000000000000000000000000000000000000000..af4652b642633352477106a4151af063290f9a31 GIT binary patch literal 81 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}epl);Y@|zJ(ax`q{q|M&t;ucLK6T>`y5mN literal 0 HcmV?d00001 diff --git a/gfx/tilesets/fountain/5.2bpp b/gfx/tilesets/fountain/5.2bpp deleted file mode 100644 index 484691f5f1f1b76790c0892b347c6c37a3ee90e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 YcmdNm?y{TVe^c(HT!#M){{{X706*{t=>Px# diff --git a/gfx/tilesets/fountain/5.png b/gfx/tilesets/fountain/5.png new file mode 100644 index 0000000000000000000000000000000000000000..a8c9475f9b9ce99c10054cb4c04ac0245219ad9c GIT binary patch literal 85 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$#}XrhE&{2?wEIK!mLvQQl|`T hCnZLybTGOoE@bc*W^)WbBAo$J@9FC2vd$@?2>@hB7S8|x literal 0 HcmV?d00001 diff --git a/gfx/tilesets/roofs/0.2bpp b/gfx/tilesets/roofs/0.2bpp deleted file mode 100644 index 51650e2e10f2351686055b0df1477ce048c6e805..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmcb6=q?yOxc~qEf&Ksg-&KM@hX4QngYa#22xJDbng0Uiq3Yo@R6R@|Og)UQuRm}A Xt`?{lXet9tEr|a2kDVE&7DNL8i2_>n diff --git a/gfx/tilesets/roofs/0.png b/gfx/tilesets/roofs/0.png new file mode 100644 index 0000000000000000000000000000000000000000..1aa48fb87efa7d301d66e4a90b4f078b0519764c GIT binary patch literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^5+KY3BpCYFRJ8&rT~8OskcwN$52D#vge5iv%~|Lm yaDahzl|md#PrJXo-75wUV`Jw3^$HaZd+Znr?m7Kj`ASwAWPqoupUXO@geCyOPaG}) literal 0 HcmV?d00001 diff --git a/gfx/tilesets/roofs/1.2bpp b/gfx/tilesets/roofs/1.2bpp deleted file mode 100644 index eea01d2f2f1781cf90b65115ac6c046c085b97fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmYL?K@I>w1OthO^D{5Q60)7Sv`K}Vf2|sV)HMWhcdR#Iy$S10sy5u2_X`^CtSFO* GT0?MkcwN$8=_cQyd^poxHvZ| zv@mjYTyOW1WynlR+wh;Cr9NSb=8=pwA};a_>tsA_`+HT^gG}&r^>bP0l+XkK-VYoE literal 0 HcmV?d00001 diff --git a/gfx/tilesets/roofs/2.2bpp b/gfx/tilesets/roofs/2.2bpp deleted file mode 100644 index 67db7f991aa76d3888ba6c5cb58b72af2a5a3ad7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmZ2Eed_9+?OVI|?mzs$;s5{tn$tyBTeh2a+XDFvXnaN>e`h;H{mSWkn|HTv?Y3-( tsMnls+YHi&&If8~X!yV9|Np}foj^VV!~dH9`+=%KI)Qvf#{ac&J^*z;QDFc8 diff --git a/gfx/tilesets/roofs/2.png b/gfx/tilesets/roofs/2.png new file mode 100644 index 0000000000000000000000000000000000000000..b97b8787e57b33f5c93695a360366013580dee2f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^5+KY3BpCYFRJ8)BFi#i9kcwN$8|DOYw(z8BraGKR zFkQ;UA-N`KRl|gX4NDm~BqNv|CODdia5zaUU|1!z+HS?nFmI4#7TYEnk&LxWO`-AMSG2@M0COOY~o`i#J@^tlcS?83{1OS*cDq8>m literal 0 HcmV?d00001 diff --git a/gfx/tilesets/roofs/3.2bpp b/gfx/tilesets/roofs/3.2bpp deleted file mode 100644 index 1d88fac5badd4e3ca2f52c585ddc4a6b8f3e5c30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmZXNK?(ps2m*?y}vd$@?2>@(r8v_6U literal 0 HcmV?d00001 diff --git a/gfx/tilesets/roofs/4.2bpp b/gfx/tilesets/roofs/4.2bpp deleted file mode 100644 index 87590db995d8c89db4a5d4657f9c440431196c0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmbQ=Fu!3!Kac=|{|*2D|7ZBm07O6nO#Oc-`B0MaClCU`f5!j+=L3}@Ly%Hr2vUy> W>+2g()kBSk>G}7Mk?|uZLI(it1xY6W diff --git a/gfx/tilesets/roofs/4.png b/gfx/tilesets/roofs/4.png new file mode 100644 index 0000000000000000000000000000000000000000..25bf71048d2dba5a1bef6a4b431d13ff92cf7823 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^5+KY3BpCYFRJ8&rb59q?kcwN$8=|*nT|FhmCLzkj zV#>2k;M6~Rfj^CbQ4XrB!wei4XW1=U$*gepjDfLZ)9Q|k>~6@ Jvd$@?2>?xfA&>w7 literal 0 HcmV?d00001 diff --git a/gfx/tilesets/safari/1.2bpp b/gfx/tilesets/safari/1.2bpp deleted file mode 100644 index d25f1badcec46e993e395aa480901208ba331c4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 YcmZSh-%v04T;;IDbEp5d|BC(t07E$l(f|Me diff --git a/gfx/tilesets/safari/1.png b/gfx/tilesets/safari/1.png new file mode 100644 index 0000000000000000000000000000000000000000..c5b500ccc6bf4f008df79a9a6fdb6fa9800f893a GIT binary patch literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e diff --git a/gfx/tilesets/safari/2.png b/gfx/tilesets/safari/2.png new file mode 100644 index 0000000000000000000000000000000000000000..1512e35ad51c549ce72ded9b05a91144f094f12f GIT binary patch literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e=Rj;A8Rt-1nKZ}^>bP0l+XkKF<%t; literal 0 HcmV?d00001 diff --git a/gfx/tilesets/safari/4.2bpp b/gfx/tilesets/safari/4.2bpp deleted file mode 100644 index e0142c688e16b07d0f2680cb6e2f80d04a84cb54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 ScmZSh&j5xT-<|%;09gP*)CgAq diff --git a/gfx/tilesets/safari/4.png b/gfx/tilesets/safari/4.png new file mode 100644 index 0000000000000000000000000000000000000000..8e4c8e0e50744c4028467b57089b46ead8ffa670 GIT binary patch literal 79 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}ehE&{2=HN|rSg?|3T_ca; b8V555hjLaO-U)h(K`K36{an^LB{Ts5n?w^J literal 0 HcmV?d00001 diff --git a/gfx/tilesets/sprout-pillar/1.2bpp b/gfx/tilesets/sprout-pillar/1.2bpp deleted file mode 100644 index 3bb46c953..000000000 --- a/gfx/tilesets/sprout-pillar/1.2bpp +++ /dev/null @@ -1 +0,0 @@ -__?//????_ Oo \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/1.png b/gfx/tilesets/sprout-pillar/1.png new file mode 100644 index 0000000000000000000000000000000000000000..c22fb2a13ff317539e88e50d04a675ca5eea6b84 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW1SA;NRQx#rqyju$978H@B@6JT3M3q8igK2W zk&x&!FxawSQR_mUMjjsdMjp1dPLC&D0c`^8ZT5UT+AQ-m5A#HZwD02ix*Kl&1li%~>gTe~DWM4faNj3i literal 0 HcmV?d00001 diff --git a/gfx/tilesets/sprout-pillar/10.2bpp b/gfx/tilesets/sprout-pillar/10.2bpp deleted file mode 100644 index a1af10a55..000000000 --- a/gfx/tilesets/sprout-pillar/10.2bpp +++ /dev/null @@ -1 +0,0 @@ -?____WWWUu \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/10.png b/gfx/tilesets/sprout-pillar/10.png new file mode 100644 index 0000000000000000000000000000000000000000..01dbe1afc5e8d61be45acb90ca983070014cf004 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW1SA;NRQx#rq-;H1978H@C37Ss6eK1HG)ycI zICMaPL#$;&fdJPNs|J?H1521=WKM`Ocp5f&?g(7S$fKvHpvi7PSqL)U)78&qol`;+0E1305C8xG literal 0 HcmV?d00001 diff --git a/gfx/tilesets/sprout-pillar/3.2bpp b/gfx/tilesets/sprout-pillar/3.2bpp deleted file mode 100644 index e4bb79a49..000000000 --- a/gfx/tilesets/sprout-pillar/3.2bpp +++ /dev/null @@ -1 +0,0 @@ -__?//????_ Oo \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/3.png b/gfx/tilesets/sprout-pillar/3.png new file mode 100644 index 0000000000000000000000000000000000000000..80ce4657c7ab53234592290a7a33e1035238dd6d GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW1SA;NRQx#rq})7R978H@B?}}Z9O#OYkcg3x z=xdNXk)g=!tiXKO-5^;>Xy>6u#UqUm`as!y`ZD Zi408nVgcRV?S&wdJzf1=);T3K0RRHKBZU9} literal 0 HcmV?d00001 diff --git a/gfx/tilesets/sprout-pillar/4.2bpp b/gfx/tilesets/sprout-pillar/4.2bpp deleted file mode 100644 index 08897f1da..000000000 --- a/gfx/tilesets/sprout-pillar/4.2bpp +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/4.png b/gfx/tilesets/sprout-pillar/4.png new file mode 100644 index 0000000000000000000000000000000000000000..9d523c4bc2166f4c9bdbddfe323d81cd22db96f6 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW1SA;NRQx#rq&z)c978H@<(@dm*ATivk;wa_GUst eL*U2Gi-Xom~EF-PWGEWHrU?etIZ&#o1DbML;%F`0I7a$kt%q=VAu0v7rnWS^1D!TWxy QK|RPkPgg&ebxsLQ049+sH~;_u literal 0 HcmV?d00001 diff --git a/gfx/tilesets/sprout-pillar/6.2bpp b/gfx/tilesets/sprout-pillar/6.2bpp deleted file mode 100644 index 5021b1c1f..000000000 --- a/gfx/tilesets/sprout-pillar/6.2bpp +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/6.png b/gfx/tilesets/sprout-pillar/6.png new file mode 100644 index 0000000000000000000000000000000000000000..0ca0e5936f67ef8b5599d0c5628c6e2e0ad9841e GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW1SA;NRQx#rq^vz%978H@wXr`4lkD^ Oka3=_elF{r5}E*}Q2vGc5x7V)w_V5@o! OGR@P~&t;ucLK6T-jwH_j literal 0 HcmV?d00001 diff --git a/gfx/tilesets/sprout-pillar/8.2bpp b/gfx/tilesets/sprout-pillar/8.2bpp deleted file mode 100644 index bb22068b8..000000000 --- a/gfx/tilesets/sprout-pillar/8.2bpp +++ /dev/null @@ -1 +0,0 @@ -??__//  \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/8.png b/gfx/tilesets/sprout-pillar/8.png new file mode 100644 index 0000000000000000000000000000000000000000..e81475618ffab1ec64e4b7bd8970588d45f35567 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW1SA;NRQx#rq^vw$978H@$sXIt%b+O0>^R+x zlf|s*4KvqIAq~mArJQcl)OvcSdoUk#+N)_FCAp&fsq^uJ-BUS}4~s{v61}V2xbZB= NG*4GQmvv4FO#p^+B9;IE literal 0 HcmV?d00001 diff --git a/gfx/tilesets/sprout-pillar/9.2bpp b/gfx/tilesets/sprout-pillar/9.2bpp deleted file mode 100644 index 1c206fb79..000000000 --- a/gfx/tilesets/sprout-pillar/9.2bpp +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/9.png b/gfx/tilesets/sprout-pillar/9.png new file mode 100644 index 0000000000000000000000000000000000000000..da74607be7de782f163c52b5b23b547b9bd0edd4 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW1SA;NRQx#rq})7R978H@sh-}+d%%E)<)CfD zsiO{mEhcaaBz(Q!^)ttSvG9m~^5Z^9E$iJc5~MkAd2#QH`Q&hW?}nn2JF!$sD}t9J;9-ysQfg x3?#YL)-#=49Z<-z*hIw3X-Z>&rjM%MSBB;PB=fH?sQ(Gl?&<31vd$@?2>=jn8V~>g literal 0 HcmV?d00001 diff --git a/gfx/tilesets/whirlpool/1.2bpp b/gfx/tilesets/whirlpool/1.2bpp deleted file mode 100644 index 0a58c6b238411d20efb7d517a6b080d962caa526..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmZQ5VmQyRf!{&mxIv%d3>9I9{R}tQ4LIBd&I$4eom861u%4lS{eVrggFV9shUXGT Uf&3lp7x)t-+y#0B&I)h?0DS-x^Z)<= diff --git a/gfx/tilesets/whirlpool/1.png b/gfx/tilesets/whirlpool/1.png new file mode 100644 index 0000000000000000000000000000000000000000..4641dbc0d0e2bedb4100f5c34e29cf298b94ddf0 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^96+qV1SA+7wCmOasYp*3$B>F!q9+vj8Wcnt9{!({ zuOhcR;ho?I5tqfSzYS)qao@G)q-P0wN=Hn#Y t;umGfD!HRg@BeYh`!}_!71^(RKE|(Cth&}*|E>VYGEY}Omvv4FO#oxQF$@3z literal 0 HcmV?d00001 diff --git a/gfx/tilesets/whirlpool/2.2bpp b/gfx/tilesets/whirlpool/2.2bpp deleted file mode 100644 index e1f841cf96cc3a680d21e8470e12edda49c29f5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmV-G0KfkLX8>FP3-AUQ;|y^OkqprQb^sgT1u(@JVu&&bvq+Kv(*Rn41#pK5^8`7> W86?R7?GWY&bBHpC5e(4;Sp?aN9~E8z diff --git a/gfx/tilesets/whirlpool/2.png b/gfx/tilesets/whirlpool/2.png new file mode 100644 index 0000000000000000000000000000000000000000..ce542405364971ab2c9e5b187bf2f36a3bc55cc1 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^96+qV1SA+7wCmOasR&OO$B>F!qGt@b8VqOzSOF7=8yy@@8$SwzxefBeljrIXfleY9(@C{%hT1*Wt~$(69B(lGdKVM literal 0 HcmV?d00001 diff --git a/gfx/tilesets/whirlpool/3.2bpp b/gfx/tilesets/whirlpool/3.2bpp deleted file mode 100644 index 9cdec83359b910a6070827e2e82bc2c41c424eb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmV-G0KfkvlOvcQoDk0r;Q^okS^&!+n;@DnixG$sOc2fpX8^Y_i!g~Wju^)eU;xkn WIsoPpNf6BuOc+KCqX(b>*Z^+5h!pGq diff --git a/gfx/tilesets/whirlpool/3.png b/gfx/tilesets/whirlpool/3.png new file mode 100644 index 0000000000000000000000000000000000000000..55b629440e659d0e657c2308bac6dd91f22fc05d GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^96+qV1SA+7wCmOasYp*3$B>F!qNl968Vm#&F78~C zGxe)T;?0Jtt_PetU+gBGDlz-Et&S4#6vmITQ1zFlLyEkQhS(Fyjf56Yo4=T0mHS?1~L=d#Wzp$P!%JTrm- literal 0 HcmV?d00001 diff --git a/gfx/tilesets/whirlpool/4.2bpp b/gfx/tilesets/whirlpool/4.2bpp deleted file mode 100644 index 414acce03251970078cfaacc487c8962f8065da7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmV-G0KfkjqX6ds4+8u=!QcY`4gmEC&F!q9+Ww8WbcNF20|n zrE-aL$w|JY7XM5-mrq#sLgbQ4Sboi$rc9sKO*%8L%w#KlsO9*AwN}7CC}GF{w{9P| t^oTt={AW|K^q%9~L77c;9@@$a?r?`KQa8|=?-2&F%hT1*Wt~$(69E2MG)4db literal 0 HcmV?d00001 From 647f9b4452fb166fedbbb987808bb0dae9623db2 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 21 Jun 2017 23:45:01 -0400 Subject: [PATCH 20/46] pngs in gfx/title --- Makefile | 5 +++++ engine/title.asm | 6 +++--- ...terleave.2bpp.lz => crystal.2bpp.lz.cd5aabdd} | Bin gfx/title/crystal.png | Bin 0 -> 507 bytes ...ogo.w160.t4.2bpp.lz => logo.2bpp.lz.f22013e3} | Bin gfx/title/logo.png | Bin 0 -> 1044 bytes gfx/title/old_bg.2bpp | Bin 4096 -> 0 bytes gfx/title/old_bg.png | Bin 0 -> 1770 bytes gfx/title/old_fg.2bpp | Bin 4096 -> 0 bytes gfx/title/old_fg.png | Bin 0 -> 691 bytes ...une.w128.2bpp.lz => suicune.2bpp.lz.30e490d0} | Bin gfx/title/suicune.png | Bin 0 -> 809 bytes 12 files changed, 8 insertions(+), 3 deletions(-) rename gfx/title/{crystal.w48.interleave.2bpp.lz => crystal.2bpp.lz.cd5aabdd} (100%) create mode 100644 gfx/title/crystal.png rename gfx/title/{logo.w160.t4.2bpp.lz => logo.2bpp.lz.f22013e3} (100%) create mode 100644 gfx/title/logo.png delete mode 100644 gfx/title/old_bg.2bpp create mode 100644 gfx/title/old_bg.png delete mode 100644 gfx/title/old_fg.2bpp create mode 100644 gfx/title/old_fg.png rename gfx/title/{suicune.w128.2bpp.lz => suicune.2bpp.lz.30e490d0} (100%) create mode 100644 gfx/title/suicune.png diff --git a/Makefile b/Makefile index 380c61324..9227fc660 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,11 @@ gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace +gfx/title/crystal.2bpp: tools/gfx += --interleave --width=48 +gfx/title/old_fg.2bpp: tools/gfx += --interleave --width=64 +gfx/title/logo.2bpp: rgbgfx += -x 4 + + %.bin: ; %.blk: ; diff --git a/engine/title.asm b/engine/title.asm index 787872939..36e2851d3 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -387,15 +387,15 @@ AnimateTitleCrystal: ; 10ef32 ; 10ef46 TitleSuicuneGFX: ; 10ef46 -INCBIN "gfx/title/suicune.w128.2bpp.lz" +INCBIN "gfx/title/suicune.2bpp.lz" ; 10f326 TitleLogoGFX: ; 10f326 -INCBIN "gfx/title/logo.w160.t4.2bpp.lz" +INCBIN "gfx/title/logo.2bpp.lz" ; 10fcee TitleCrystalGFX: ; 10fcee -INCBIN "gfx/title/crystal.w48.interleave.2bpp.lz" +INCBIN "gfx/title/crystal.2bpp.lz" ; 10fede TitleScreenPalettes: diff --git a/gfx/title/crystal.w48.interleave.2bpp.lz b/gfx/title/crystal.2bpp.lz.cd5aabdd similarity index 100% rename from gfx/title/crystal.w48.interleave.2bpp.lz rename to gfx/title/crystal.2bpp.lz.cd5aabdd diff --git a/gfx/title/crystal.png b/gfx/title/crystal.png new file mode 100644 index 0000000000000000000000000000000000000000..6f430cf1f83d2c9b5b9b7e6f0d3976c7db301043 GIT binary patch literal 507 zcmVQW-p!N|qtilZ#3#FnVLOz8H=%MgR?p$Pd@wo62%q4OFBt+qA z8zdZo-~KbP6IVz{;rP=(^PUsWBd4FXvM;jhdpW>!F~F_tu%1Y{#mg)zws@G#rAIqE z52fnROulnec394stqy1ru+;(Y2$*$o;CZ6Z#ev&%MJS53wruJM+uOa?5w=H7Vv7^D zXTH3)#Ywm4t5oYsvX*#(%lt3p+CnLs!k;8}XrTp~E{G&Yi=U!t3P{57_;sNHkY7^J zq{-AE8CC7#3init#J+RsBav?yJNF8V3<3VSeX!nPJjBu0xK}JYWQt7D?hp*|!+-~^ z_kr7?QY;nsL{9Oji1$I=!yjU_LFC*)50UDFrXBuB`OoWOUzJ80e4bGrX{5o$DJG;q zgkUviT7^=!LctqnBWgI3s`fuIbjRe95Wfy{8hhABBhhI*)=f3CK%o)eAh5%fu*}Kp xj~R!t2Ak7}XY;m4vtbLmx}>a literal 0 HcmV?d00001 diff --git a/gfx/title/logo.w160.t4.2bpp.lz b/gfx/title/logo.2bpp.lz.f22013e3 similarity index 100% rename from gfx/title/logo.w160.t4.2bpp.lz rename to gfx/title/logo.2bpp.lz.f22013e3 diff --git a/gfx/title/logo.png b/gfx/title/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2bfff59c9d8d4a188e2df4c35c5bc066954e6237 GIT binary patch literal 1044 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 diff --git a/gfx/title/old_bg.png b/gfx/title/old_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..2b6d5db20b458dc000ed1b869946e6669c22f6aa GIT binary patch literal 1770 zcmV1YtBd{rx8>5xzjM~tSm*N@eZ(F5}LNcz=Kdda2{#G8qZD!%4GNG6X;}k58}R%xpaF#Za@gd~YU4 zfV%Ru+%5;||bY(jPy5Y%|c$ zUdMGF-fg}8Oba9^_7I>_=kSaKw5LFg>Rx{&UR4NyBn5F?HnAxSt04-Zr0YW1KJXKu z<=a6vsrxPk^$R$(onfFj2t5S!l{&GZD=L;I7Hg*%2m>ets6n#}uvF-Wq3zcQusI7r z9qCS>Ybl_@Pz_G$_?fUNzXWJ2-2n6wupL%)%-E$V3G~^|0R03s0Zz5__~eHY=njHo zP+`CggZkNcc6!HP0229UfF2ko1DqS2MVyj=mWMCH3v%XxrC7%R$N=NxR}nvyKwn;@ zgK0+U!cykm0APbMNG&(PPe36LC#_+zNC5Zzf@cW(*a_EYJS%xPYyq6~fF1&x1C*i3 zTZ2MC1wfFYhk(N&2`H9l$V{${6CkX9L55x~@c=&o*fEG}LKK{CpqKiIT?V=;4EQ5$ z;21q%q+=*Z!%-L*A)uy*l?(8dZbKy@M8c$MLkv)&)DZ@x;ZH9TFr$%yfe8jU)qU{V zzTqMPNm*!dQmU4!Dlb!Qs{6(Q4y_FWTn4IrLHW7_PFw2fpVp~%X7cx!0_dxKJFLdp z&<5PMEcLCSx-@+7s|EDAp>*OKP(aGu+u(y2T#K5RAmERlK?$|Kqs>5)0S$V^>vEt{ z43MGna~ySAXBQkYP!jvNn-a*^0N-cBOPHA0ov|G<_$-+|-)#m?+>%YOL7U%AmJvpA zV8qA3kO!=>LHA!I!_xgA0SVs-tsU^KaZTM{6yj$nmdav@XUlb76hk8rUa)!xRIYiH zayN!XIp+Z_%A`JF!OW;ON*#aSGpwMIGsJv*nu9nKR?aS*U6>igZNGlB$cEfpt^*(r zC^G>gkSHUq`4@|#vWnT8hV4w6W*b=ZebdgBjq<+X3_ieY8Si~}AE@~ZJGYcu!W}YP zW5Yl3!4lq!?*necu*>rg=GhRZ8M;cZcjximk38Tv&aQ(yv`pl-K1GH+wj4xbnf9b* zT3I)dPLFK>O9E{0R`SE+$4)lx5+I+*5a}{V;Jxo{-2J50Z z*=#lfdODdTK-ULZ?s8odpM34%*x#H#$K$g)#6T;w4b-u%J!#l;K7DU9w2`wjdL#{f z3lcatNV~b}Skhqr_4qrfJEAU=mEUxUl>C?(qn{QM_u5fM8bwJ z?a*5uKr!#Zm*_F#FZ!l;R`&{;mZLp}(&%SEr9rp`WN?*mG+p}PbwPp>%tc6Xivh~Y z6Hs}&RF5dJXjT-o;M6okGZg0*DbBBA(~@z};TiGU@kAn7Dk1b3=cy4z*TW{xjHur6 zRaL@NchOl{e`KYQQwV+_;nwS0?c`!zujg@Zw)cYc^8!>&?lQ zUa;p(Z19JHiA|eBZ7dE`>mRp2wC+c*P8ainVYtiiutQQi*kuQAJ?v1~a2Doh&~EM8G~Xo+OH!BrV0j-t;giqjz3_b>f>7uB zIGInU(|MlP*qIn_a!}&)Tz;a!f0%O0(9c(s&W_P|~Lcjbe#_>u_}Z^cn5dQB}0h z)a|E@dsh`5zf_C`L6Qz5oJm1Ih#)A^OZRk#Sy?t3@OT1#wvP?mh~X57fVCmima5;d zr&|Xb&ShX8c0ro}MBLud0tMzv$(>5yJHMZ%Nv9v~I8}VJH=W$b_`+=jdswS-O_k;H zz4BX)FUvt4KDpkJ(L3CvL%h`#Ngl&}vq)>py3rhTA=qiRZUB(2ENhChO1j+H6x^jxtdOtqbb{6EaO# axDB`sxDB`sxDB`sxDB`sxDEWL4g3K(*O7Jr diff --git a/gfx/title/old_fg.png b/gfx/title/old_fg.png new file mode 100644 index 0000000000000000000000000000000000000000..1a7351d58cdfeaf0901034c974e146cda7f650a7 GIT binary patch literal 691 zcmV;k0!;mhP)Xb6X4#uF9%^q)U@5kH4qg#@HX=6p}+8^2zsk`8_-d_<;+D1jfb+ zw|trN?03g-@*a9UV>>S(k#M=Y=|lDmzgNJgykoeV9t_W@jS6^c*pa%yk@XDwoq$@- z<#yH=i8sIf1=2@W1m;gC(YO7d43NOI)L8Hh(Y?7O*}HB@F4JG7O9gD29;?12;jpb^*ME!F5H6P%9a` zP!vvZyTvhy+?!phlX|Armkf3-e8AL!SnW(ZU8ffA48H*?L@qG~G-j=w!SgdU?;fLZofM_F84ePrJszDK}iwcNRVyFd4F(<97<5o(Olq0V}V`@|# z+Crd}$^xnYh1*LI#R(`u?0S1_4`Mim7F^YK;Ifyb?Kz5mOeH0YS3)D-sIX8c(y6X1 zQx^ZKPfqLlkp2XwKASpCiTIgxJf4bY@FJZNiOM~5flcWw2R>6!dk7f2&X#6P3%ug1 zrp4=QaaEmBm*~K_JHRq(W_($kpa%FOi`Gox;ame0#p3+I2(R$PYy%i0__4-a?pS~8 zXqP+7kJS8!>Yecmukt-L6ZRMT{O!+<^J`*o&05`h2Kt;Whu4>Cefc@7o3Fvn+Bt{2 zHwf+)24sR$_7=ej>hipBj-cFMUM}Z8)@abjFITpg@vr=)0tg_000IagfB*srAb|fE Z{s0udXnt0RzJUM$002ovPDHLkV1kUZKZ5`O literal 0 HcmV?d00001 diff --git a/gfx/title/suicune.w128.2bpp.lz b/gfx/title/suicune.2bpp.lz.30e490d0 similarity index 100% rename from gfx/title/suicune.w128.2bpp.lz rename to gfx/title/suicune.2bpp.lz.30e490d0 diff --git a/gfx/title/suicune.png b/gfx/title/suicune.png new file mode 100644 index 0000000000000000000000000000000000000000..074a8ebf7e6ce9a1c70122baffb8fc2b2ec743cc GIT binary patch literal 809 zcmV+^1J?YBP)M-iRfY1MM?CQUuW}7NM5*4t{C?c}%Zds6vWR zaRTVT2nVZ3rb?F7YT&ZN*}nq%2XM~84B(9%5U_||L7!#I*JcVvcA!Myea>VB^7~$b zV2_CXaR*puDCS^~A9n99m(&V>Jk%51OHtQGx;jrP?TXrLQDq&bdCp zB?3*nss&id(7xIL^}?9)wko!Q+P8V`G271^p~60F8a^^00kDbuvLb#C?2rajlAPiS z#IhYId6@B;UwR4WOe{ch(Dg*gDfk9hThE@Ay`=QYxi_!aqhVi+eFtm%_bJvJH30qY z2KwC*tpnsuLx(C3_jggM52&wpTD!O|fEwFxp|K`B!U8lQt__T{23#pLcjyXXr_U}Y zp(#vYOvH>J6gyMsFXd4aljC>{^yMoLfrigo@jnCgDL~KV;03&Z{{TpB;0kD40NmS2 zu0YqK(UvI3-Tql|>X7-`SW`c^WLj}jNj+94DD7J1^0XH~?f~rq>=dH& z5(Ky}x|#s}mWT?j!p_0uXqEkKhV2IG8RGW^=)Q{|26XuV8IE=bIL1;+DRil?8eo_U z4n^uaJx>ZbwDJ?<_7~Vj#qCR&sJ?V+0K8rfDTG>>D4rh?8>m=soesxlgSRcL<`1zD nAbToEg(rYA@Y0JH@HfC8Mz7U9oz$j&00000NkvXXu0mjfrXO+= literal 0 HcmV?d00001 From bcb58c29397f8e901f6539f24d64fe6f31c69634 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 21 Jun 2017 23:47:21 -0400 Subject: [PATCH 21/46] Add --interleave to tools/gfx and refactor. For images composed of 8x16 sprites. The width has to be manually passed in. If this were an rgbgfx feature this would not be necessary. Fixes 647f9b4452fb166fedbbb987808bb0dae9623db2 --- tools/gfx.c | 88 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 23 deletions(-) diff --git a/tools/gfx.c b/tools/gfx.c index 4389a3f46..bfad43c0e 100644 --- a/tools/gfx.c +++ b/tools/gfx.c @@ -7,7 +7,12 @@ #include "common.h" static void usage(void) { - fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [-d depth] [-h] [-o outfile] infile \n"); + fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [-w width] [-d depth] [-h] [-o outfile] infile\n"); +} + +static void error(char *message) { + fprintf(stderr, message); + fprintf(stderr, "\n"); } struct Options { @@ -16,6 +21,8 @@ struct Options { int help; char *outfile; int depth; + int interleave; + int width; }; struct Options Options = { @@ -26,6 +33,8 @@ void get_args(int argc, char *argv[]) { struct option long_options[] = { {"remove-whitespace", no_argument, &Options.remove_whitespace, 1}, {"trim-whitespace", no_argument, &Options.trim_whitespace, 1}, + {"interleave", no_argument, &Options.interleave, 1}, + {"width", required_argument, 0, 'w'}, {"depth", required_argument, 0, 'd'}, {"help", no_argument, 0, 'h'}, {0} @@ -41,6 +50,9 @@ void get_args(int argc, char *argv[]) { case 'd': Options.depth = strtoul(optarg, NULL, 0); break; + case 'w': + Options.width = strtoul(optarg, NULL, 0); + break; case 0: case -1: break; @@ -52,6 +64,11 @@ void get_args(int argc, char *argv[]) { } } +struct Graphic { + int size; + uint8_t *data; +}; + bool is_whitespace(uint8_t *tile, int tile_size) { uint8_t WHITESPACE = 0; for (int i = 0; i < tile_size; i++) { @@ -62,37 +79,51 @@ bool is_whitespace(uint8_t *tile, int tile_size) { return true; } -void trim_whitespace(char *infile, char *outfile) { - int size; - uint8_t *data = read_u8(infile, &size); +void trim_whitespace(struct Graphic *graphic) { int tile_size = Options.depth * 8; - for (int i = size - tile_size; i > 0; i -= tile_size) { - if (is_whitespace(&data[i], tile_size)) { - size = i; + for (int i = graphic->size - tile_size; i > 0; i -= tile_size) { + if (is_whitespace(&graphic->data[i], tile_size)) { + graphic->size = i; } else { break; } } - write_u8(outfile, data, size); } -void remove_whitespace(char *infile, char *outfile) { - int size; - uint8_t *data = read_u8(infile, &size); +void remove_whitespace(struct Graphic *graphic) { int tile_size = Options.depth * 8; int i = 0; - for (int j = 0; i < size && j < size; i += tile_size, j += tile_size) { - while (is_whitespace(&data[j], tile_size)) { + for (int j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (is_whitespace(&graphic->data[j], tile_size)) { j += tile_size; } if (j > i) { - memcpy(&data[i], &data[j], tile_size); + memcpy(&graphic->data[i], &graphic->data[j], tile_size); } } - size = i; - write_u8(outfile, data, size); + graphic->size = i; } +void interleave(struct Graphic *graphic, int width) { + int tile_size = Options.depth * 8; + int width_tiles = width / 8; + int num_tiles = graphic->size / tile_size; + uint8_t *interleaved = malloc(graphic->size); + for (int i = 0; i < num_tiles; i++) { + int tile = i * 2; + int row = i / width_tiles; + tile -= width_tiles * row; + if (row % 2) { + tile -= width_tiles; + tile += 1; + } + memcpy(&interleaved[tile * tile_size], &graphic->data[i * tile_size], tile_size); + } + memcpy(graphic->data, interleaved, graphic->size); + free(interleaved); +} + + int main(int argc, char *argv[]) { get_args(argc, argv); argc -= optind; @@ -106,14 +137,25 @@ int main(int argc, char *argv[]) { exit(1); } char *infile = argv[0]; + struct Graphic graphic; + graphic.data = read_u8(infile, &graphic.size); if (Options.remove_whitespace) { - if (Options.outfile) { - remove_whitespace(infile, Options.outfile); - } - } else if (Options.trim_whitespace) { - if (Options.outfile) { - trim_whitespace(infile, Options.outfile); - } + remove_whitespace(&graphic); } + if (Options.trim_whitespace) { + trim_whitespace(&graphic); + } + if (Options.interleave) { + if (!Options.width) { + error("interleave: must set --width to a nonzero value"); + usage(); + exit(1); + } + interleave(&graphic, Options.width); + } + if (Options.outfile) { + write_u8(Options.outfile, graphic.data, graphic.size); + } + free(graphic.data); return 0; } From 31d9c1fffa4529ae36423d49641ed31acb12b8e7 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 22 Jun 2017 23:29:36 -0400 Subject: [PATCH 22/46] pngs in gfx/trade game_boy.png can be rearranged in a nicer way, but it's a job for another time --- Makefile | 2 ++ gfx/trade/arrow.2bpp | Bin 32 -> 0 bytes gfx/trade/arrow.png | Bin 0 -> 98 bytes gfx/trade/ball.2bpp | Bin 96 -> 0 bytes gfx/trade/ball.png | Bin 0 -> 300 bytes gfx/trade/bubble.2bpp | Bin 64 -> 0 bytes gfx/trade/bubble.png | Bin 0 -> 123 bytes gfx/trade/cable.2bpp | Bin 32 -> 0 bytes gfx/trade/cable.png | Bin 0 -> 100 bytes ...game_boy.2bpp.lz => game_boy.2bpp.lz.71a5f644} | Bin gfx/trade/game_boy.png | Bin 0 -> 360 bytes gfx/trade/poof.2bpp | Bin 192 -> 0 bytes gfx/trade/poof.png | Bin 0 -> 191 bytes 13 files changed, 2 insertions(+) delete mode 100644 gfx/trade/arrow.2bpp create mode 100644 gfx/trade/arrow.png delete mode 100644 gfx/trade/ball.2bpp create mode 100755 gfx/trade/ball.png delete mode 100644 gfx/trade/bubble.2bpp create mode 100644 gfx/trade/bubble.png delete mode 100644 gfx/trade/cable.2bpp create mode 100644 gfx/trade/cable.png rename gfx/trade/{game_boy.2bpp.lz => game_boy.2bpp.lz.71a5f644} (100%) create mode 100644 gfx/trade/game_boy.png delete mode 100644 gfx/trade/poof.2bpp create mode 100644 gfx/trade/poof.png diff --git a/Makefile b/Makefile index 9227fc660..c28a8841e 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,8 @@ gfx/title/crystal.2bpp: tools/gfx += --interleave --width=48 gfx/title/old_fg.2bpp: tools/gfx += --interleave --width=64 gfx/title/logo.2bpp: rgbgfx += -x 4 +gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace + %.bin: ; %.blk: ; diff --git a/gfx/trade/arrow.2bpp b/gfx/trade/arrow.2bpp deleted file mode 100644 index 637ea13c9937cea270d54541de05977cbff1f7eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 gcmZQDV6b4YVXy;28z9Sofrmi`$f^NC8z74Z062gHg#Z8m diff --git a/gfx/trade/arrow.png b/gfx/trade/arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..b740048ec1983484e88a37986b139de2f7d29a65 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3rl*TzNX4z>AHU{5%(gvzy`pXX v!vqojXaCZF$e;gUE_Y-vms|Y7JO4j2n5+<+y6=P6I*=|;S3j3^P6#VNW@e}~13SBfyt0k54UFH=knlj@gTM!e fdJuH118P%{mtbe-_#yGa;=~UQpp?LagoXwHJMa_z diff --git a/gfx/trade/ball.png b/gfx/trade/ball.png new file mode 100755 index 0000000000000000000000000000000000000000..4d3477bb618931598804c9ffaa863d980732e6e7 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!3HFyJAa%3QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XBj({-ZRBb+Kpx{AI7sn6}@3&K8`Ir?sTDF#7aek$^{iqe& ziXWT5F693!6kIOdHj(x3*F&`j7yrBWtethw_tdjL1RN4L7Os(Wa$wKnzO#^1!CL)! zOu5-}8G%24R&NPgro3dzDerSW8!Q#(N+j1tJN-Vnd@E8U2#a4Ul^NX`9d{PY=aCRs|Lqur<&G#t%nwBK7Fo! uu1rbF)B51w1)GJP7#ujhFx|KK&a&lMp}>;A?EXN{FnGH9xvXvb4NNXD!i)IR-fbWNMC%y4@Fj`Ee%J+1wJZpyR2yvVu-%3 UQ`VEo;|ns?)78&qol`;+00ieIF#rGn literal 0 HcmV?d00001 diff --git a/gfx/trade/cable.2bpp b/gfx/trade/cable.2bpp deleted file mode 100644 index 1f9974e99903d934eb8cc0a2c357c0991487cfe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 mcmZQzU|^7!|NsBNe}@0efBrMDv&+j@)Ia!t0LYUE3IYJvLk{-< diff --git a/gfx/trade/cable.png b/gfx/trade/cable.png new file mode 100644 index 0000000000000000000000000000000000000000..d06d8a877e2d14d439472721a93433a39dc96649 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3wx^3@NX4z>AOGhwcKkDFU`W<* w)(~(tToZNl!+!>k4-Fa~6GU|+wsC3jG4x6D+l%Hse*@Cz>FVdQ&MBb@0F#0nPXGV_ literal 0 HcmV?d00001 diff --git a/gfx/trade/game_boy.2bpp.lz b/gfx/trade/game_boy.2bpp.lz.71a5f644 similarity index 100% rename from gfx/trade/game_boy.2bpp.lz rename to gfx/trade/game_boy.2bpp.lz.71a5f644 diff --git a/gfx/trade/game_boy.png b/gfx/trade/game_boy.png new file mode 100644 index 0000000000000000000000000000000000000000..64c92260c3b2310c8963c966d833a821dfe3063e GIT binary patch literal 360 zcmV-u0hj)XP)Jhw_g=aQiA<(PTg}Xv`5*TMD{i_ISN}K$WFW+RE z!3b&W6H2o__;eLxya0}wvtQ8*@^`$Saa5-blR9nUBL-gvW#Yexa@=2`Wr~X)g6HP{ zhL#@VCv-;)D~b*tjf`^>%ulcfBc~narrEHOwFV1{gGkjT$YUt>JG3~PxE!H`)*I4M z(1{hNDf`1}4vN!^JO)iKEa@j!lvOPV&W?#Ng{5q~B2Qud#msU?F{-j^W31Zl4nzfC z=ztxa+U{2NWO)V8yE0Uv^iKRvM7D3vsQQ8r63^laTFLTI54C>Lr;iw4hnwd*M#1FX ziJpe*b4_IU20RWx4H)WBrxp~UZZL75)JE;h3a$hx;XVPTAcrD@nFy``0000I<>>Ppo z4<9&wu>WQH!2dwbVUL}oOfo|~5ZW`y1ECDVA0Yg}@Bj!80M&v3BO@C-2cMvvqKuM( i4?{sg&j-GS8lY?gNYcP3VFnORU?^ZnU{C;wpaK8`F!rRO*D9#P<74bab2 zjD7s7YXeKLfm6|;-xECE2(H_- Date: Thu, 22 Jun 2017 23:40:22 -0400 Subject: [PATCH 23/46] pngs in gfx/trainers --- Makefile | 2 ++ .../{beauty.2bpp.lz => beauty.2bpp.lz.c1c13787} | Bin gfx/trainers/beauty.pal | 4 ---- gfx/trainers/beauty.png | Bin 0 -> 534 bytes .../{biker.2bpp.lz => biker.2bpp.lz.cb40f7cd} | Bin gfx/trainers/biker.pal | 4 ---- gfx/trainers/biker.png | Bin 0 -> 650 bytes ...eeper.2bpp.lz => bird_keeper.2bpp.lz.1e56954c} | Bin gfx/trainers/bird_keeper.pal | 4 ---- gfx/trainers/bird_keeper.png | Bin 0 -> 489 bytes ...elt_t.2bpp.lz => blackbelt_t.2bpp.lz.4ef2481c} | Bin gfx/trainers/blackbelt_t.pal | 4 ---- gfx/trainers/blackbelt_t.png | Bin 0 -> 627 bytes .../{blaine.2bpp.lz => blaine.2bpp.lz.00a3b6f5} | Bin gfx/trainers/blaine.pal | 4 ---- gfx/trainers/blaine.png | Bin 0 -> 431 bytes .../{blue.2bpp.lz => blue.2bpp.lz.9fdbab8f} | Bin gfx/trainers/blue.pal | 4 ---- gfx/trainers/blue.png | Bin 0 -> 430 bytes .../{boarder.2bpp.lz => boarder.2bpp.lz.5d6881a8} | Bin gfx/trainers/boarder.pal | 4 ---- gfx/trainers/boarder.png | Bin 0 -> 581 bytes .../{brock.2bpp.lz => brock.2bpp.lz.5bdeb7bf} | Bin gfx/trainers/brock.pal | 4 ---- gfx/trainers/brock.png | Bin 0 -> 409 bytes .../{bruno.2bpp.lz => bruno.2bpp.lz.22f3c222} | Bin gfx/trainers/bruno.pal | 4 ---- gfx/trainers/bruno.png | Bin 0 -> 636 bytes ...tcher.2bpp.lz => bug_catcher.2bpp.lz.43144f97} | Bin gfx/trainers/bug_catcher.pal | 4 ---- gfx/trainers/bug_catcher.png | Bin 0 -> 525 bytes .../{bugsy.2bpp.lz => bugsy.2bpp.lz.c070450d} | Bin gfx/trainers/bugsy.pal | 4 ---- gfx/trainers/bugsy.png | Bin 0 -> 500 bytes .../{burglar.2bpp.lz => burglar.2bpp.lz.e063f42e} | Bin gfx/trainers/burglar.pal | 4 ---- gfx/trainers/burglar.png | Bin 0 -> 478 bytes .../{cal.2bpp.lz => cal.2bpp.lz.aac54a14} | Bin gfx/trainers/cal.pal | 4 ---- gfx/trainers/cal.png | Bin 0 -> 484 bytes .../{camper.2bpp.lz => camper.2bpp.lz.cc2357ea} | Bin gfx/trainers/camper.pal | 4 ---- gfx/trainers/camper.png | Bin 0 -> 483 bytes ...champion.2bpp.lz => champion.2bpp.lz.0175f5ea} | Bin gfx/trainers/champion.pal | 4 ---- gfx/trainers/champion.png | Bin 0 -> 617 bytes .../{chuck.2bpp.lz => chuck.2bpp.lz.cab13edd} | Bin gfx/trainers/chuck.pal | 4 ---- gfx/trainers/chuck.png | Bin 0 -> 620 bytes .../{clair.2bpp.lz => clair.2bpp.lz.a1771075} | Bin gfx/trainers/clair.pal | 4 ---- gfx/trainers/clair.png | Bin 0 -> 566 bytes ...r_f.2bpp.lz => cooltrainer_f.2bpp.lz.6fb1e652} | Bin gfx/trainers/cooltrainer_f.pal | 4 ---- gfx/trainers/cooltrainer_f.png | Bin 0 -> 487 bytes ...r_m.2bpp.lz => cooltrainer_m.2bpp.lz.0aa81882} | Bin gfx/trainers/cooltrainer_m.pal | 4 ---- gfx/trainers/cooltrainer_m.png | Bin 0 -> 489 bytes .../{erika.2bpp.lz => erika.2bpp.lz.58985f01} | Bin gfx/trainers/erika.pal | 4 ---- gfx/trainers/erika.png | Bin 0 -> 458 bytes ...ive_f.2bpp.lz => executive_f.2bpp.lz.c8b5dc9c} | Bin gfx/trainers/executive_f.pal | 4 ---- gfx/trainers/executive_f.png | Bin 0 -> 418 bytes ...ive_m.2bpp.lz => executive_m.2bpp.lz.211746a6} | Bin gfx/trainers/executive_m.pal | 4 ---- gfx/trainers/executive_m.png | Bin 0 -> 420 bytes .../{falkner.2bpp.lz => falkner.2bpp.lz.6ec6bbaf} | Bin gfx/trainers/falkner.pal | 4 ---- gfx/trainers/falkner.png | Bin 0 -> 507 bytes ...ther.2bpp.lz => firebreather.2bpp.lz.a790feb1} | Bin gfx/trainers/firebreather.pal | 4 ---- gfx/trainers/firebreather.png | Bin 0 -> 660 bytes .../{fisher.2bpp.lz => fisher.2bpp.lz.95bfbfd6} | Bin gfx/trainers/fisher.pal | 4 ---- gfx/trainers/fisher.png | Bin 0 -> 599 bytes ...ntleman.2bpp.lz => gentleman.2bpp.lz.d3d78e00} | Bin gfx/trainers/gentleman.pal | 4 ---- gfx/trainers/gentleman.png | Bin 0 -> 443 bytes .../{grunt_f.2bpp.lz => grunt_f.2bpp.lz.522aecd7} | Bin gfx/trainers/grunt_f.pal | 4 ---- gfx/trainers/grunt_f.png | Bin 0 -> 467 bytes .../{grunt_m.2bpp.lz => grunt_m.2bpp.lz.916e09d2} | Bin gfx/trainers/grunt_m.pal | 4 ---- gfx/trainers/grunt_m.png | Bin 0 -> 462 bytes ...itarist.2bpp.lz => guitarist.2bpp.lz.be5a9b71} | Bin gfx/trainers/guitarist.pal | 4 ---- gfx/trainers/guitarist.png | Bin 0 -> 575 bytes .../{hiker.2bpp.lz => hiker.2bpp.lz.07a4e386} | Bin gfx/trainers/hiker.pal | 4 ---- gfx/trainers/hiker.png | Bin 0 -> 632 bytes .../{janine.2bpp.lz => janine.2bpp.lz.5350f3ce} | Bin gfx/trainers/janine.pal | 4 ---- gfx/trainers/janine.png | Bin 0 -> 472 bytes .../{jasmine.2bpp.lz => jasmine.2bpp.lz.dcd58308} | Bin gfx/trainers/jasmine.pal | 4 ---- gfx/trainers/jasmine.png | Bin 0 -> 457 bytes .../{juggler.2bpp.lz => juggler.2bpp.lz.2d7625ba} | Bin gfx/trainers/juggler.pal | 4 ---- gfx/trainers/juggler.png | Bin 0 -> 572 bytes .../{karen.2bpp.lz => karen.2bpp.lz.7fc3d941} | Bin gfx/trainers/karen.pal | 4 ---- gfx/trainers/karen.png | Bin 0 -> 489 bytes ..._girl.2bpp.lz => kimono_girl.2bpp.lz.e8833d48} | Bin gfx/trainers/kimono_girl.pal | 4 ---- gfx/trainers/kimono_girl.png | Bin 0 -> 604 bytes .../{koga.2bpp.lz => koga.2bpp.lz.7a066020} | Bin gfx/trainers/koga.pal | 4 ---- gfx/trainers/koga.png | Bin 0 -> 489 bytes .../{lass.2bpp.lz => lass.2bpp.lz.e3726508} | Bin gfx/trainers/lass.pal | 4 ---- gfx/trainers/lass.png | Bin 0 -> 564 bytes ...lt_surge.2bpp.lz => lt_surge.2bpp.lz.4ac586d0} | Bin gfx/trainers/lt_surge.pal | 4 ---- gfx/trainers/lt_surge.png | Bin 0 -> 531 bytes .../{medium.2bpp.lz => medium.2bpp.lz.db642b9e} | Bin gfx/trainers/medium.pal | 4 ---- gfx/trainers/medium.png | Bin 0 -> 615 bytes .../{misty.2bpp.lz => misty.2bpp.lz.2ded1a10} | Bin gfx/trainers/misty.pal | 4 ---- gfx/trainers/misty.png | Bin 0 -> 458 bytes .../{morty.2bpp.lz => morty.2bpp.lz.aec5773b} | Bin gfx/trainers/morty.pal | 4 ---- gfx/trainers/morty.png | Bin 0 -> 480 bytes ...alman.2bpp.lz => mysticalman.2bpp.lz.35d01215} | Bin gfx/trainers/mysticalman.pal | 4 ---- gfx/trainers/mysticalman.png | Bin 0 -> 503 bytes .../{oak.2bpp.lz => oak.2bpp.lz.91a27df3} | Bin gfx/trainers/oak.pal | 4 ---- gfx/trainers/oak.png | Bin 0 -> 507 bytes .../{officer.2bpp.lz => officer.2bpp.lz.630b057a} | Bin gfx/trainers/officer.pal | 4 ---- gfx/trainers/officer.png | Bin 0 -> 432 bytes ...cnicker.2bpp.lz => picnicker.2bpp.lz.6842b86a} | Bin gfx/trainers/picnicker.pal | 4 ---- gfx/trainers/picnicker.png | Bin 0 -> 443 bytes ...kefan_f.2bpp.lz => pokefan_f.2bpp.lz.9cbd3f20} | Bin gfx/trainers/pokefan_f.pal | 4 ---- gfx/trainers/pokefan_f.png | Bin 0 -> 548 bytes ...kefan_m.2bpp.lz => pokefan_m.2bpp.lz.5bc5a3e1} | Bin gfx/trainers/pokefan_m.pal | 4 ---- gfx/trainers/pokefan_m.png | Bin 0 -> 599 bytes ...maniac.2bpp.lz => pokemaniac.2bpp.lz.786c5fce} | Bin gfx/trainers/pokemaniac.pal | 4 ---- gfx/trainers/pokemaniac.png | Bin 0 -> 574 bytes .../{pryce.2bpp.lz => pryce.2bpp.lz.1a98cae8} | Bin gfx/trainers/pryce.pal | 4 ---- gfx/trainers/pryce.png | Bin 0 -> 422 bytes ...ychic_t.2bpp.lz => psychic_t.2bpp.lz.ecd603f4} | Bin gfx/trainers/psychic_t.pal | 4 ---- gfx/trainers/psychic_t.png | Bin 0 -> 452 bytes .../{red.2bpp.lz => red.2bpp.lz.51104ac6} | Bin gfx/trainers/red.pal | 4 ---- gfx/trainers/red.png | Bin 0 -> 458 bytes .../{rival1.2bpp.lz => rival1.2bpp.lz.e43b32ef} | Bin gfx/trainers/rival1.pal | 4 ---- gfx/trainers/rival1.png | Bin 0 -> 502 bytes .../{rival2.2bpp.lz => rival2.2bpp.lz.562de263} | Bin gfx/trainers/rival2.pal | 4 ---- gfx/trainers/rival2.png | Bin 0 -> 429 bytes .../{sabrina.2bpp.lz => sabrina.2bpp.lz.d09a2b46} | Bin gfx/trainers/sabrina.pal | 4 ---- gfx/trainers/sabrina.png | Bin 0 -> 484 bytes .../{sage.2bpp.lz => sage.2bpp.lz.2038324b} | Bin gfx/trainers/sage.pal | 4 ---- gfx/trainers/sage.png | Bin 0 -> 385 bytes .../{sailor.2bpp.lz => sailor.2bpp.lz.0f7f3386} | Bin gfx/trainers/sailor.pal | 4 ---- gfx/trainers/sailor.png | Bin 0 -> 508 bytes ...hoolboy.2bpp.lz => schoolboy.2bpp.lz.6d26b31b} | Bin gfx/trainers/schoolboy.pal | 4 ---- gfx/trainers/schoolboy.png | Bin 0 -> 463 bytes ...ientist.2bpp.lz => scientist.2bpp.lz.2ef10474} | Bin gfx/trainers/scientist.pal | 4 ---- gfx/trainers/scientist.png | Bin 0 -> 523 bytes .../{skier.2bpp.lz => skier.2bpp.lz.399d4240} | Bin gfx/trainers/skier.pal | 4 ---- gfx/trainers/skier.png | Bin 0 -> 567 bytes ...r_nerd.2bpp.lz => super_nerd.2bpp.lz.c5362664} | Bin gfx/trainers/super_nerd.pal | 4 ---- gfx/trainers/super_nerd.png | Bin 0 -> 454 bytes ...immer_f.2bpp.lz => swimmer_f.2bpp.lz.c60d0ad6} | Bin gfx/trainers/swimmer_f.pal | 4 ---- gfx/trainers/swimmer_f.png | Bin 0 -> 489 bytes ...immer_m.2bpp.lz => swimmer_m.2bpp.lz.2c1a716e} | Bin gfx/trainers/swimmer_m.pal | 4 ---- gfx/trainers/swimmer_m.png | Bin 0 -> 467 bytes .../{teacher.2bpp.lz => teacher.2bpp.lz.1d131210} | Bin gfx/trainers/teacher.pal | 4 ---- gfx/trainers/teacher.png | Bin 0 -> 501 bytes .../{twins.2bpp.lz => twins.2bpp.lz.462fd733} | Bin gfx/trainers/twins.pal | 4 ---- gfx/trainers/twins.png | Bin 0 -> 526 bytes .../{whitney.2bpp.lz => whitney.2bpp.lz.dcb46ea6} | Bin gfx/trainers/whitney.pal | 4 ---- gfx/trainers/whitney.png | Bin 0 -> 469 bytes .../{will.2bpp.lz => will.2bpp.lz.842af358} | Bin gfx/trainers/will.pal | 4 ---- gfx/trainers/will.png | Bin 0 -> 471 bytes ...ungster.2bpp.lz => youngster.2bpp.lz.4bef139d} | Bin gfx/trainers/youngster.pal | 4 ---- gfx/trainers/youngster.png | Bin 0 -> 449 bytes 202 files changed, 2 insertions(+), 268 deletions(-) rename gfx/trainers/{beauty.2bpp.lz => beauty.2bpp.lz.c1c13787} (100%) delete mode 100644 gfx/trainers/beauty.pal create mode 100644 gfx/trainers/beauty.png rename gfx/trainers/{biker.2bpp.lz => biker.2bpp.lz.cb40f7cd} (100%) delete mode 100644 gfx/trainers/biker.pal create mode 100644 gfx/trainers/biker.png rename gfx/trainers/{bird_keeper.2bpp.lz => bird_keeper.2bpp.lz.1e56954c} (100%) delete mode 100644 gfx/trainers/bird_keeper.pal create mode 100644 gfx/trainers/bird_keeper.png rename gfx/trainers/{blackbelt_t.2bpp.lz => blackbelt_t.2bpp.lz.4ef2481c} (100%) delete mode 100644 gfx/trainers/blackbelt_t.pal create mode 100644 gfx/trainers/blackbelt_t.png rename gfx/trainers/{blaine.2bpp.lz => blaine.2bpp.lz.00a3b6f5} (100%) delete mode 100644 gfx/trainers/blaine.pal create mode 100644 gfx/trainers/blaine.png rename gfx/trainers/{blue.2bpp.lz => blue.2bpp.lz.9fdbab8f} (100%) delete mode 100644 gfx/trainers/blue.pal create mode 100644 gfx/trainers/blue.png rename gfx/trainers/{boarder.2bpp.lz => boarder.2bpp.lz.5d6881a8} (100%) delete mode 100644 gfx/trainers/boarder.pal create mode 100644 gfx/trainers/boarder.png rename gfx/trainers/{brock.2bpp.lz => brock.2bpp.lz.5bdeb7bf} (100%) delete mode 100644 gfx/trainers/brock.pal create mode 100644 gfx/trainers/brock.png rename gfx/trainers/{bruno.2bpp.lz => bruno.2bpp.lz.22f3c222} (100%) delete mode 100644 gfx/trainers/bruno.pal create mode 100644 gfx/trainers/bruno.png rename gfx/trainers/{bug_catcher.2bpp.lz => bug_catcher.2bpp.lz.43144f97} (100%) delete mode 100644 gfx/trainers/bug_catcher.pal create mode 100644 gfx/trainers/bug_catcher.png rename gfx/trainers/{bugsy.2bpp.lz => bugsy.2bpp.lz.c070450d} (100%) delete mode 100644 gfx/trainers/bugsy.pal create mode 100644 gfx/trainers/bugsy.png rename gfx/trainers/{burglar.2bpp.lz => burglar.2bpp.lz.e063f42e} (100%) delete mode 100644 gfx/trainers/burglar.pal create mode 100644 gfx/trainers/burglar.png rename gfx/trainers/{cal.2bpp.lz => cal.2bpp.lz.aac54a14} (100%) delete mode 100644 gfx/trainers/cal.pal create mode 100644 gfx/trainers/cal.png rename gfx/trainers/{camper.2bpp.lz => camper.2bpp.lz.cc2357ea} (100%) delete mode 100644 gfx/trainers/camper.pal create mode 100644 gfx/trainers/camper.png rename gfx/trainers/{champion.2bpp.lz => champion.2bpp.lz.0175f5ea} (100%) delete mode 100644 gfx/trainers/champion.pal create mode 100644 gfx/trainers/champion.png rename gfx/trainers/{chuck.2bpp.lz => chuck.2bpp.lz.cab13edd} (100%) delete mode 100644 gfx/trainers/chuck.pal create mode 100644 gfx/trainers/chuck.png rename gfx/trainers/{clair.2bpp.lz => clair.2bpp.lz.a1771075} (100%) delete mode 100644 gfx/trainers/clair.pal create mode 100644 gfx/trainers/clair.png rename gfx/trainers/{cooltrainer_f.2bpp.lz => cooltrainer_f.2bpp.lz.6fb1e652} (100%) delete mode 100644 gfx/trainers/cooltrainer_f.pal create mode 100644 gfx/trainers/cooltrainer_f.png rename gfx/trainers/{cooltrainer_m.2bpp.lz => cooltrainer_m.2bpp.lz.0aa81882} (100%) delete mode 100644 gfx/trainers/cooltrainer_m.pal create mode 100644 gfx/trainers/cooltrainer_m.png rename gfx/trainers/{erika.2bpp.lz => erika.2bpp.lz.58985f01} (100%) delete mode 100644 gfx/trainers/erika.pal create mode 100644 gfx/trainers/erika.png rename gfx/trainers/{executive_f.2bpp.lz => executive_f.2bpp.lz.c8b5dc9c} (100%) delete mode 100644 gfx/trainers/executive_f.pal create mode 100644 gfx/trainers/executive_f.png rename gfx/trainers/{executive_m.2bpp.lz => executive_m.2bpp.lz.211746a6} (100%) delete mode 100644 gfx/trainers/executive_m.pal create mode 100644 gfx/trainers/executive_m.png rename gfx/trainers/{falkner.2bpp.lz => falkner.2bpp.lz.6ec6bbaf} (100%) delete mode 100644 gfx/trainers/falkner.pal create mode 100644 gfx/trainers/falkner.png rename gfx/trainers/{firebreather.2bpp.lz => firebreather.2bpp.lz.a790feb1} (100%) delete mode 100644 gfx/trainers/firebreather.pal create mode 100644 gfx/trainers/firebreather.png rename gfx/trainers/{fisher.2bpp.lz => fisher.2bpp.lz.95bfbfd6} (100%) delete mode 100644 gfx/trainers/fisher.pal create mode 100644 gfx/trainers/fisher.png rename gfx/trainers/{gentleman.2bpp.lz => gentleman.2bpp.lz.d3d78e00} (100%) delete mode 100644 gfx/trainers/gentleman.pal create mode 100644 gfx/trainers/gentleman.png rename gfx/trainers/{grunt_f.2bpp.lz => grunt_f.2bpp.lz.522aecd7} (100%) delete mode 100644 gfx/trainers/grunt_f.pal create mode 100644 gfx/trainers/grunt_f.png rename gfx/trainers/{grunt_m.2bpp.lz => grunt_m.2bpp.lz.916e09d2} (100%) delete mode 100644 gfx/trainers/grunt_m.pal create mode 100644 gfx/trainers/grunt_m.png rename gfx/trainers/{guitarist.2bpp.lz => guitarist.2bpp.lz.be5a9b71} (100%) delete mode 100644 gfx/trainers/guitarist.pal create mode 100644 gfx/trainers/guitarist.png rename gfx/trainers/{hiker.2bpp.lz => hiker.2bpp.lz.07a4e386} (100%) delete mode 100644 gfx/trainers/hiker.pal create mode 100644 gfx/trainers/hiker.png rename gfx/trainers/{janine.2bpp.lz => janine.2bpp.lz.5350f3ce} (100%) delete mode 100644 gfx/trainers/janine.pal create mode 100644 gfx/trainers/janine.png rename gfx/trainers/{jasmine.2bpp.lz => jasmine.2bpp.lz.dcd58308} (100%) delete mode 100644 gfx/trainers/jasmine.pal create mode 100644 gfx/trainers/jasmine.png rename gfx/trainers/{juggler.2bpp.lz => juggler.2bpp.lz.2d7625ba} (100%) delete mode 100644 gfx/trainers/juggler.pal create mode 100644 gfx/trainers/juggler.png rename gfx/trainers/{karen.2bpp.lz => karen.2bpp.lz.7fc3d941} (100%) delete mode 100644 gfx/trainers/karen.pal create mode 100644 gfx/trainers/karen.png rename gfx/trainers/{kimono_girl.2bpp.lz => kimono_girl.2bpp.lz.e8833d48} (100%) delete mode 100644 gfx/trainers/kimono_girl.pal create mode 100644 gfx/trainers/kimono_girl.png rename gfx/trainers/{koga.2bpp.lz => koga.2bpp.lz.7a066020} (100%) delete mode 100644 gfx/trainers/koga.pal create mode 100644 gfx/trainers/koga.png rename gfx/trainers/{lass.2bpp.lz => lass.2bpp.lz.e3726508} (100%) delete mode 100644 gfx/trainers/lass.pal create mode 100644 gfx/trainers/lass.png rename gfx/trainers/{lt_surge.2bpp.lz => lt_surge.2bpp.lz.4ac586d0} (100%) delete mode 100644 gfx/trainers/lt_surge.pal create mode 100644 gfx/trainers/lt_surge.png rename gfx/trainers/{medium.2bpp.lz => medium.2bpp.lz.db642b9e} (100%) delete mode 100644 gfx/trainers/medium.pal create mode 100644 gfx/trainers/medium.png rename gfx/trainers/{misty.2bpp.lz => misty.2bpp.lz.2ded1a10} (100%) delete mode 100644 gfx/trainers/misty.pal create mode 100644 gfx/trainers/misty.png rename gfx/trainers/{morty.2bpp.lz => morty.2bpp.lz.aec5773b} (100%) delete mode 100644 gfx/trainers/morty.pal create mode 100644 gfx/trainers/morty.png rename gfx/trainers/{mysticalman.2bpp.lz => mysticalman.2bpp.lz.35d01215} (100%) delete mode 100644 gfx/trainers/mysticalman.pal create mode 100644 gfx/trainers/mysticalman.png rename gfx/trainers/{oak.2bpp.lz => oak.2bpp.lz.91a27df3} (100%) delete mode 100644 gfx/trainers/oak.pal create mode 100644 gfx/trainers/oak.png rename gfx/trainers/{officer.2bpp.lz => officer.2bpp.lz.630b057a} (100%) delete mode 100644 gfx/trainers/officer.pal create mode 100644 gfx/trainers/officer.png rename gfx/trainers/{picnicker.2bpp.lz => picnicker.2bpp.lz.6842b86a} (100%) delete mode 100644 gfx/trainers/picnicker.pal create mode 100644 gfx/trainers/picnicker.png rename gfx/trainers/{pokefan_f.2bpp.lz => pokefan_f.2bpp.lz.9cbd3f20} (100%) delete mode 100644 gfx/trainers/pokefan_f.pal create mode 100644 gfx/trainers/pokefan_f.png rename gfx/trainers/{pokefan_m.2bpp.lz => pokefan_m.2bpp.lz.5bc5a3e1} (100%) delete mode 100644 gfx/trainers/pokefan_m.pal create mode 100644 gfx/trainers/pokefan_m.png rename gfx/trainers/{pokemaniac.2bpp.lz => pokemaniac.2bpp.lz.786c5fce} (100%) delete mode 100644 gfx/trainers/pokemaniac.pal create mode 100644 gfx/trainers/pokemaniac.png rename gfx/trainers/{pryce.2bpp.lz => pryce.2bpp.lz.1a98cae8} (100%) delete mode 100644 gfx/trainers/pryce.pal create mode 100644 gfx/trainers/pryce.png rename gfx/trainers/{psychic_t.2bpp.lz => psychic_t.2bpp.lz.ecd603f4} (100%) delete mode 100644 gfx/trainers/psychic_t.pal create mode 100644 gfx/trainers/psychic_t.png rename gfx/trainers/{red.2bpp.lz => red.2bpp.lz.51104ac6} (100%) delete mode 100644 gfx/trainers/red.pal create mode 100644 gfx/trainers/red.png rename gfx/trainers/{rival1.2bpp.lz => rival1.2bpp.lz.e43b32ef} (100%) delete mode 100644 gfx/trainers/rival1.pal create mode 100644 gfx/trainers/rival1.png rename gfx/trainers/{rival2.2bpp.lz => rival2.2bpp.lz.562de263} (100%) delete mode 100644 gfx/trainers/rival2.pal create mode 100644 gfx/trainers/rival2.png rename gfx/trainers/{sabrina.2bpp.lz => sabrina.2bpp.lz.d09a2b46} (100%) delete mode 100644 gfx/trainers/sabrina.pal create mode 100644 gfx/trainers/sabrina.png rename gfx/trainers/{sage.2bpp.lz => sage.2bpp.lz.2038324b} (100%) delete mode 100644 gfx/trainers/sage.pal create mode 100644 gfx/trainers/sage.png rename gfx/trainers/{sailor.2bpp.lz => sailor.2bpp.lz.0f7f3386} (100%) delete mode 100644 gfx/trainers/sailor.pal create mode 100644 gfx/trainers/sailor.png rename gfx/trainers/{schoolboy.2bpp.lz => schoolboy.2bpp.lz.6d26b31b} (100%) delete mode 100644 gfx/trainers/schoolboy.pal create mode 100644 gfx/trainers/schoolboy.png rename gfx/trainers/{scientist.2bpp.lz => scientist.2bpp.lz.2ef10474} (100%) delete mode 100644 gfx/trainers/scientist.pal create mode 100644 gfx/trainers/scientist.png rename gfx/trainers/{skier.2bpp.lz => skier.2bpp.lz.399d4240} (100%) delete mode 100644 gfx/trainers/skier.pal create mode 100644 gfx/trainers/skier.png rename gfx/trainers/{super_nerd.2bpp.lz => super_nerd.2bpp.lz.c5362664} (100%) delete mode 100644 gfx/trainers/super_nerd.pal create mode 100644 gfx/trainers/super_nerd.png rename gfx/trainers/{swimmer_f.2bpp.lz => swimmer_f.2bpp.lz.c60d0ad6} (100%) delete mode 100644 gfx/trainers/swimmer_f.pal create mode 100644 gfx/trainers/swimmer_f.png rename gfx/trainers/{swimmer_m.2bpp.lz => swimmer_m.2bpp.lz.2c1a716e} (100%) delete mode 100644 gfx/trainers/swimmer_m.pal create mode 100644 gfx/trainers/swimmer_m.png rename gfx/trainers/{teacher.2bpp.lz => teacher.2bpp.lz.1d131210} (100%) delete mode 100644 gfx/trainers/teacher.pal create mode 100644 gfx/trainers/teacher.png rename gfx/trainers/{twins.2bpp.lz => twins.2bpp.lz.462fd733} (100%) delete mode 100644 gfx/trainers/twins.pal create mode 100644 gfx/trainers/twins.png rename gfx/trainers/{whitney.2bpp.lz => whitney.2bpp.lz.dcb46ea6} (100%) delete mode 100644 gfx/trainers/whitney.pal create mode 100644 gfx/trainers/whitney.png rename gfx/trainers/{will.2bpp.lz => will.2bpp.lz.842af358} (100%) delete mode 100644 gfx/trainers/will.pal create mode 100644 gfx/trainers/will.png rename gfx/trainers/{youngster.2bpp.lz => youngster.2bpp.lz.4bef139d} (100%) delete mode 100644 gfx/trainers/youngster.pal create mode 100644 gfx/trainers/youngster.png diff --git a/Makefile b/Makefile index c28a8841e..fb9e75a42 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,8 @@ gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimens gfx/shrink%.2bpp: rgbgfx += -h gfx/trainers/%.2bpp: rgbgfx += -h +gfx/trainers/%.pal: gfx/trainers/%.gbcpal + tools/palette -p $< > $@ gfx/mail/0b9b46.1bpp: tools/gfx += --remove-whitespace gfx/mail/0b9d46.1bpp: tools/gfx += --remove-whitespace diff --git a/gfx/trainers/beauty.2bpp.lz b/gfx/trainers/beauty.2bpp.lz.c1c13787 similarity index 100% rename from gfx/trainers/beauty.2bpp.lz rename to gfx/trainers/beauty.2bpp.lz.c1c13787 diff --git a/gfx/trainers/beauty.pal b/gfx/trainers/beauty.pal deleted file mode 100644 index 7183a0502..000000000 --- a/gfx/trainers/beauty.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 24, 17, 11 - RGB 08, 09, 17 - diff --git a/gfx/trainers/beauty.png b/gfx/trainers/beauty.png new file mode 100644 index 0000000000000000000000000000000000000000..bb483129032cf96053ff27f7d3443bd8a707111a GIT binary patch literal 534 zcmV+x0_pvUP)00005CNklzXzMiS;^ROk~`tr<9tUw~MG%CR~h& z@HDdCTA%;I>P8Au9^|mC8D|SNoL8OvQXqS&fa3y+tKCM|QTyN`g(N zoAt&-)8SHnZHdx^@lZRE?#|rjcKVF}Y-!MW^lmqs`jNI?7|NHo*#&twd3EP|aaAm@ Y52-5%LM~P3S^xk507*qoM6N<$g54MWs{jB1 literal 0 HcmV?d00001 diff --git a/gfx/trainers/biker.2bpp.lz b/gfx/trainers/biker.2bpp.lz.cb40f7cd similarity index 100% rename from gfx/trainers/biker.2bpp.lz rename to gfx/trainers/biker.2bpp.lz.cb40f7cd diff --git a/gfx/trainers/biker.pal b/gfx/trainers/biker.pal deleted file mode 100644 index bfffe557d..000000000 --- a/gfx/trainers/biker.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 20, 17, 09 - RGB 04, 03, 10 - diff --git a/gfx/trainers/biker.png b/gfx/trainers/biker.png new file mode 100644 index 0000000000000000000000000000000000000000..7bd4c84a639d9bfd3ca0308e529ac7912b8c3a0a GIT binary patch literal 650 zcmV;50(Jd~P)00006hNklth4%jg1SMk^Y5v0GvPuT_2E{P4OBR34n zQH8qcsk>)pJ0MUuTaim)rk^HGB-TSbNfd~+LW@!{r`bBm`gHT8bozOJ z7>vK{TU45E6KH^8DH%>ieI^!fTvQW)dwi-YX|RB~fB>2-Xukg*6A_eOS*EsFaLiOY zmjby$OA&hKrNIb{Yne#WqP~^E@L_EhMvzP;u|6^wGNKG(eY$y&#>_e5#hQ2v?&_{! z*@h~AbbS^j54Ib@W{z+1Qu9TgL8TPlC;nnp9ecaM>mesyoG~Y%DsdYZmjgMzn^m8D zi?Ru{N|vfzPA9B_(DUVbI59nyE6C66b+KXC^Ew`NDLFULdXRoj%7PBG%<9usws@!+ z6@E34urZaPMyXnggph_trm#n!sgMIbrv&6b7#~|^E)eA>27@I;lGUlbt5wpT32_j2 z3}l`*_Ck&Pfs4cyiEzn3Pu3Y(q-^;Myy8T3I3Lx~Fh>f$3k1<2jyvC^~xxfYEq zFn?@i1Z<5xE<>nJR=w4p6Zy-d&vfF67E{jA3sprtMBcGu90FglBC)m~m8H_@Z zuQL$c0>#dLs~{=$Tm}YTOHhoxseXI&RppHO;n5$1*Huw*XxhkV4j00004qNkl#fyVwIhWL~!g+@+4MNQLNOap#f5Y z+DSOpYAU3(vsnYu(wGRTmgU%ShK3MYA#g#!GM$J~2;w;zPVGp2HESap_ z6X-ckxWQ?wT8_Q`5}+53-c>Y17lH{vmDD=t>QN*%dI4K1GtTKe3vs4{yRt=qdPAB& zk5>qi5uM}&`7RmY`Z6`&C3(?1Xijzuwm`X}$^>Wcq^W-D_Gi$a8;r=BAYK)Zd7sH_ z{__#kWmxZ<_@5~ZrUYZN+y&={b1;nT*=umVFc_BgR^?ooxRRO1=bhsraV7KS(VJ+f fn00006KNklM|M?UU zp;gz;Tz7VR*BS`np{4xq1^wk`AO*&8yEf2Vu>%18UejzSanw-vxJDD=#(?)c>Hg?< z-UaB(`2{zD6OT)vMx-2YziBoGzd$4l^RyJhA zV&u=<3Ev~It*L@Sopq;F`K#ud$1ZL)69dX)hxT{MwV`YOu_(3A%2r)*<(JUKgq|W* zRgJLcftgc`EUON65FT)a6XO14Xkn{4%l`>vzG>d7W;L;SG-qGaeIm@puByn(XcIY? z@Yg+K)$&obf*2}a3^2;5yyVZ22~7*r@`$7weF=qr6S1wMX51NYVqt^!%*S&z-gJUT&z=IoOgXjKl8g|x{7+XS7Q062* z4fGL?QY=zS@ECDuV@lh)1-J<>dfLGx*$Cm>`;cJ~dmA?sS!WZg zx2JRqIC%0n{xRgEP6Elyd+@x^8)3(i695&5<0cSA)D*&}>Is;pLjS;%&eOhw$A7l7 zZf)-#hG{s*{<3(Od?KV1UP3D%GFxVg_E`a$fR91{(CW2Kl`T+lD`aejS9RGDRCc^o z8$00003_Nklq>#P2N5^#TLOTt12sF%tDTf$&J~fM!TyJd0L9R-Qh{h4DqM zlhVT!XEH+%FV$%qjNzxs*$c@tVAhzsSB;(lnACZ-$W;I(6I&Mrc4mN2s; zs}tXW50}izTdt7x>Jsm*0ppyRx;vSMj z*FRO2#AWmiTOc&cFH7_cfVf=RG##rK=kj3NbClUMs}k<#nyKpeL&pqla9?y=tB+`I z$cVrR*)d+7k9CekKJ96Fr@&Pl98gq}G{KFsYrGSY8!Y4_D0|&RF2xz*o%ng9FQ Z@dvJe1*Sic?tlOQ002ovPDHLkV1k4(#9ROX literal 0 HcmV?d00001 diff --git a/gfx/trainers/blue.2bpp.lz b/gfx/trainers/blue.2bpp.lz.9fdbab8f similarity index 100% rename from gfx/trainers/blue.2bpp.lz rename to gfx/trainers/blue.2bpp.lz.9fdbab8f diff --git a/gfx/trainers/blue.pal b/gfx/trainers/blue.pal deleted file mode 100644 index ce6b3f1d7..000000000 --- a/gfx/trainers/blue.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 24, 08 - RGB 12, 09, 19 - diff --git a/gfx/trainers/blue.png b/gfx/trainers/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..76a1e81afa9f6dce97c717b48ef8607c003d380b GIT binary patch literal 430 zcmV;f0a5;mP)00003^NklY3u_FAq}`V7_mUad=?u|ehU<+xn_<SA>)6GL+@Nj_jJD&PrKR@_bEr6^tHGeS6zXT%#cS#fd6axYMO=fqx+n#FBv z3TS?_y;jeprC8^pT$)2bcvig*=4(aM6{i(u7wweYyi~s-t07*qoM6N<$f`MJV@Bjb+ literal 0 HcmV?d00001 diff --git a/gfx/trainers/boarder.2bpp.lz b/gfx/trainers/boarder.2bpp.lz.5d6881a8 similarity index 100% rename from gfx/trainers/boarder.2bpp.lz rename to gfx/trainers/boarder.2bpp.lz.5d6881a8 diff --git a/gfx/trainers/boarder.pal b/gfx/trainers/boarder.pal deleted file mode 100644 index 4fb9af5e1..000000000 --- a/gfx/trainers/boarder.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 24, 19, 07 - RGB 13, 10, 19 - diff --git a/gfx/trainers/boarder.png b/gfx/trainers/boarder.png new file mode 100644 index 0000000000000000000000000000000000000000..a8174e9a58d84a909f67a2c1ac088f5973272417 GIT binary patch literal 581 zcmV-L0=oT)P)00005xNklNF*pIeUh?%)ZaVRl-{qLU^=iDD9r7U;2zBY?UicM{SJY|qrKS1 zXwu6-pF_mDG2{gH6RtBQE=um1v1I)r8=Zde6J zWfq49jsPP`ydJnfRDIjjKNgxve{18=3XmJ$IFFmDd}jg9N^41^p?M_MI`8;VqE%37 z{+Ob5^v#~ySv0zljW%OPF^h`^RElQ><~R)R2Xr+)j52xStU>B578r*vM(f9Gfj(hf zO}(ASdIEv2I63X0tTVi*fF!ZvhKXw9p0gjG(+TAokD38LWt9fPVkipN$!IFenx<=^ zR&+r@+Q8x3vg_MTT8z}5&MCbWY2RsT-%S2UF!QS$ZZ`Ytd$Cvdhud`fM!j2q&|V4V TFqdr^00000NkvXXu0mjfe@+ap literal 0 HcmV?d00001 diff --git a/gfx/trainers/brock.2bpp.lz b/gfx/trainers/brock.2bpp.lz.5bdeb7bf similarity index 100% rename from gfx/trainers/brock.2bpp.lz rename to gfx/trainers/brock.2bpp.lz.5bdeb7bf diff --git a/gfx/trainers/brock.pal b/gfx/trainers/brock.pal deleted file mode 100644 index f5a1b0c06..000000000 --- a/gfx/trainers/brock.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 18, 14 - RGB 14, 07, 10 - diff --git a/gfx/trainers/brock.png b/gfx/trainers/brock.png new file mode 100644 index 0000000000000000000000000000000000000000..0aea8a946c351666ce3823f47cc235547d4968ae GIT binary patch literal 409 zcmV;K0cQS*P)00003vNkl#o8u41*i{{onaC zPBQobM|DNS(2(|#o0D~|-y8P_^szL!Aj{B~0RqG3oe2)>feI2Xsb|Ru(oEX^tTEuEMnoj`$=N{<=EwbnhTrsOgR;Vu!*Pu_{gX<<%7U&+!h|!L%fN_bQFGm0kIxe4by49(g zB*@+$#_Axutj1g^z}lz#ZD7R8InX`d*17Y;{V(hf87c*^ubyHZ00000NkvXXu0mjf D7PP!f literal 0 HcmV?d00001 diff --git a/gfx/trainers/bruno.2bpp.lz b/gfx/trainers/bruno.2bpp.lz.22f3c222 similarity index 100% rename from gfx/trainers/bruno.2bpp.lz rename to gfx/trainers/bruno.2bpp.lz.22f3c222 diff --git a/gfx/trainers/bruno.pal b/gfx/trainers/bruno.pal deleted file mode 100644 index 41408a91d..000000000 --- a/gfx/trainers/bruno.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 17, 12 - RGB 08, 10, 12 - diff --git a/gfx/trainers/bruno.png b/gfx/trainers/bruno.png new file mode 100644 index 0000000000000000000000000000000000000000..c8a003eea79e90a837e1f946afc89ff6c94fadad GIT binary patch literal 636 zcmV-?0)zdDP)00006TNklyS<_e^y5oA*Sa-!YHH|h zEPy|NuI>+@GdfhNonKix(;Ck=Du{0N6 zfP(QY(06(5odtrCyq9UtD9K@Gruu!Fm!bFd0cPMG11^&X)1y(&NXP0gsQs&w-b`*B z{89WdWo(H7rOMbe;+e!0lhhSKG0ryoLmW~pG|U{Zn`Q@}Q*_9qE_GY}A0Paw+fGyt z@~dx0mW1TA=ip}Q^1w1PTP-XyeT0u%VQr{Kx^bErc#LRUD?CfHUK<4oKXip=&$+D!=KvyT(-gi^! zUW;}Q$p`0*v}<>*niDr$$%5$I_~d9sUAcsWTuXq0tYt7{5xPpdyD5%a*!q@(Fu=KW zcMjbSevWhfGE&3rW-Gt+*Bk&Rhb~RQ5u2<79ODMvc(=@Y@R}XfNp^)Ojk1$dD`ST{ zSkyW37KuLN(mPn%_+M7n~>`w>25wyjEFhP-b0R5ArViMEwJ= WVhQD|jJ)Ik0000000053NklXWBCwgAlN#eC=!h+gR-|1@buSuX&gf9g;!oD^x2;reqj*9N<1BxDrFK zA=#J`AY?J7xI!e3B8ENQ2O=z?oN$6?hVZZySmS^NHI6or+;G(RVF?PG%{%mLIxw<~ zO)lZqf^^wtnCRin>QMUM87~LmBsK1_mHo4yzb=ETDc`!b-E$Y7{vUYGAr--pE z?hRzr%juYpa~1SI4=)(4AZDrRQocSTW%Q?h>%Ilt9qHk}r-S@V)_<@c-2(>7z|Z|g P00000NkvXXu0mjf3oY^c literal 0 HcmV?d00001 diff --git a/gfx/trainers/bugsy.2bpp.lz b/gfx/trainers/bugsy.2bpp.lz.c070450d similarity index 100% rename from gfx/trainers/bugsy.2bpp.lz rename to gfx/trainers/bugsy.2bpp.lz.c070450d diff --git a/gfx/trainers/bugsy.pal b/gfx/trainers/bugsy.pal deleted file mode 100644 index 1743f663b..000000000 --- a/gfx/trainers/bugsy.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 26, 18, 15 - RGB 13, 21, 06 - diff --git a/gfx/trainers/bugsy.png b/gfx/trainers/bugsy.png new file mode 100644 index 0000000000000000000000000000000000000000..8b1f89537ffb3e373ee5698866906fbae74918d9 GIT binary patch literal 500 zcmV00004#NklRprQ&9sZq=??i-n$DzB(Gi!Q^I0PXTl z8n;Mt&^&Dr&RLQ*sh2+vPG1_5NDy?%IZzU>4B6G zTI4rx6}f47Z6Pl z%qoUIXQ~F-*%n}ev3BYn;M7Y_MMQ~6;8k&!T;Pocc<5fGx_JcKOe)$YXthArV{Z+x z^-5dE12k(Ik~xn2mHP$g00004fNklopxlSsxJq|5a!+wPvU6TAawAj78?bSHM>{$F*^|aeK~k^% zV~s~_BeetVaAi@X9>m(^EPXpyt3x!!=wC0usZ1I-Sqm0i=91PA5s(4>e$J6Qj~x@~ zT3RJlhnHLrRW8jDTra<9t-LDn7Azr9#8^z8uJJk_T^$TltRc?JJh{!s+!3HaHQJ6G zwHC?O1!3scWq+^--Cc&F{;zeldP)e9R(ys%_6Ow3o7l&rp0FJsPSV2~93H4?SW)9j zH)UqhsrP`3Q+g6J5}ck61V#a9s% z;A?xioq%yKZfpD#P^t$}a2v>M0u2XdSU UDQcIycmMzZ07*qoM6N<$f;98Zy#N3J literal 0 HcmV?d00001 diff --git a/gfx/trainers/cal.2bpp.lz b/gfx/trainers/cal.2bpp.lz.aac54a14 similarity index 100% rename from gfx/trainers/cal.2bpp.lz rename to gfx/trainers/cal.2bpp.lz.aac54a14 diff --git a/gfx/trainers/cal.pal b/gfx/trainers/cal.pal deleted file mode 100644 index 92101c5e3..000000000 --- a/gfx/trainers/cal.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 18, 12 - RGB 22, 09, 05 - diff --git a/gfx/trainers/cal.png b/gfx/trainers/cal.png new file mode 100644 index 0000000000000000000000000000000000000000..31a38cc5400d65fcb0e07a76f70a3617464ded41 GIT binary patch literal 484 zcmV00004lNklKR)(5(^3j3R6cp zxz#;`QO}oBM}uIoK9CIKqW!Wk*kg|%oA_`&4IYdI9ZE|#nO(iz#P@)vb!X_%WsJa` z!mijf;L+4ff!S&J{AQ>c#P=zl6?cIJF&TK;Hy@z4n}a_5)e9A&VNW9NqDA00004kNkl_fsGOW9@vsn zYcVe@Xa><@#yQgYjGM%!9n& Z{{cn12FCZ6yjlPN002ovPDHLkV1nD0+k*fA literal 0 HcmV?d00001 diff --git a/gfx/trainers/champion.2bpp.lz b/gfx/trainers/champion.2bpp.lz.0175f5ea similarity index 100% rename from gfx/trainers/champion.2bpp.lz rename to gfx/trainers/champion.2bpp.lz.0175f5ea diff --git a/gfx/trainers/champion.pal b/gfx/trainers/champion.pal deleted file mode 100644 index 3dee1efef..000000000 --- a/gfx/trainers/champion.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 29, 19, 15 - RGB 21, 09, 05 - diff --git a/gfx/trainers/champion.png b/gfx/trainers/champion.png new file mode 100644 index 0000000000000000000000000000000000000000..02494e7487fe2ba91068a3b07b82fa56e1ede9b1 GIT binary patch literal 617 zcmV-v0+#)WP)00006ANkl|~k!+tYb`1Cq5*@=NzsU9&Aq(tx{3N#o=f8h}_yVq~pnV0W znhQ4koaDr`rhJjioAxIeG(~vjVt1Is>854l8|4{!cHha4)qa5+aJh3RYm(HuGF_o_nx;lP zj5A7O99M5E*KF06O+%v7cTfdXR0H1apB%$lR5WLbXX+aOF}bzR1?)*}MZgWKmq>N4 zf`hY4G9;&z+=JrWG)xwgZNUmgZjvZs+w%d0DsFID^1@ZHOIAhifxRg>fQv#@%!2Uu z3{^3J(O(5*eXpyck$3@B5f?>y1YtkGMbXQ73pNYss0jB43K-XUR;)*tE5eM!TpaKo zguB?hn%e;daXBngtoyaCAb$XjdQM-|1wHG6SC&3h}f!dZ= zkQ=0d>obWbFeK?kS=w+Ax1-iha<^fX)00006DNkl60xsP{JbTo=Ffa4RkM*`+o8j)kiWHDAgpVwxARu6;RuwWrMGJ^tL{2VQ~}iebc5q z1gH-y+z35TqSyyVN04(YiO!_zv{c1Q2b~Efru|fp!kwy)!NYT}np*j3kzu<9*-~h4 zRU0d3v-f)55n!MzmvVTobfdyRQsL`VloMZh~h^{iPDl*>0>p;wKBOWx^>& z((A_~?PUZj41z|e48y>jRVfXWREW0rJCL)NMROJD;}TR`P_M(Waxgr2vlyIMoPLWX zPCG`sHb-tHBFKX`g0Y52!5PR?ZA3^$Y)f#isYWKJr=S*TmE$Gz!qYOw=E$H+krK+Rm! zT%2&;MESvNZJxtkLvP@Y#JzhA;F`R@{u_vNwZGx4@`-M%4J=m*mnXBeFR_1-d51(d zSyEhT*@DF4+ywn>g{9z000000005iNkl>SK z#mNRjQv(ePaf$5vjS-w$d^{Q*Oo?|U+47n!tZrq=RyH3kXL(FiyyU+IAn!1_P+Xp^ zluPukiJszM4tBw-mkP@7WjUaClA~TuPYF=$>aFQ{WrRoC4%*OtWg0%OICKXU)DNA6 z2p2E8XlyY&CM`}lCRceAJ3fJ)t~MdRSXt_E^<@JLRC1Bm-4PtIM~`sOJJ2?tTr(PF zMwh!8wSb}ck=&%6u1WD*O7818g`U17Z}W|^;s@k?qEg=s3+_bnz6|}mnI!2_j~R?Y zo+P(9?%?d?kmNJSNVX4g>d>(N0$MNrJFe(Z%L)9PbNgc4f)lxGICgZb!BclM$$xN= zXHbv0EwZLO9*Bj$Kvj)PcAJkWXLQcn4b|V0Z3z+-PU$8G}>?#mlfXDVA=K z?7iF+xqeet&?Ag**W9QA{d&AtbI-s!Nn^8#pCv2nerX;J9nHMa*8l(j07*qoM6N<$ Ef(Xz2cmMzZ literal 0 HcmV?d00001 diff --git a/gfx/trainers/cooltrainer_f.2bpp.lz b/gfx/trainers/cooltrainer_f.2bpp.lz.6fb1e652 similarity index 100% rename from gfx/trainers/cooltrainer_f.2bpp.lz rename to gfx/trainers/cooltrainer_f.2bpp.lz.6fb1e652 diff --git a/gfx/trainers/cooltrainer_f.pal b/gfx/trainers/cooltrainer_f.pal deleted file mode 100644 index bdeefabf8..000000000 --- a/gfx/trainers/cooltrainer_f.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 26, 18, 15 - RGB 22, 09, 03 - diff --git a/gfx/trainers/cooltrainer_f.png b/gfx/trainers/cooltrainer_f.png new file mode 100644 index 0000000000000000000000000000000000000000..9547ba3776af71af22fc391e737db445336f0400 GIT binary patch literal 487 zcmV00004oNkl;UDkwm9I3ELDl@w^tnZ1A{ z7bZO~1$0wC395g7q=j;2RY%ag;TPyntLn{HivWVx7<*2{K#bC(2gA8!q*y8ktE~$} z96cAC6ibdl$E31<%t&<-)O#^zS-lHf9`=&G@!OG;=$_ey*9PcLR=<(33JhIRe-kQP zcSwk@Dus58u}rjbsK{-*GIVK@2(qu1Y9zoOXO}*h83Nv2Xs)KmNAKsrz#Qh`gv)iK zYZb8vb#1Nsi=1*yM=FeDu$)DUIs9A{|;so32T dbgMVN42yAw{=ji|d002ovPDHLkV1gD5+du#S literal 0 HcmV?d00001 diff --git a/gfx/trainers/cooltrainer_m.2bpp.lz b/gfx/trainers/cooltrainer_m.2bpp.lz.0aa81882 similarity index 100% rename from gfx/trainers/cooltrainer_m.2bpp.lz rename to gfx/trainers/cooltrainer_m.2bpp.lz.0aa81882 diff --git a/gfx/trainers/cooltrainer_m.pal b/gfx/trainers/cooltrainer_m.pal deleted file mode 100644 index bdeefabf8..000000000 --- a/gfx/trainers/cooltrainer_m.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 26, 18, 15 - RGB 22, 09, 03 - diff --git a/gfx/trainers/cooltrainer_m.png b/gfx/trainers/cooltrainer_m.png new file mode 100644 index 0000000000000000000000000000000000000000..9a6620b454d0a61259191cc7edf61ef987d4b53b GIT binary patch literal 489 zcmV00004qNkl|~V2tE?_Us4Rj41~tX z>j5Jx)2)RVxKNE+CYd!!(HUmo5>j%d$3^=t-~#s~z1d8^S$vi2{RUbA_8;(t^2x67 zQ8!7pe{ys=NQ=g}2OxA-vm{!zcYE&7X?bQbiMZBSv0ZHIl;>zwP@`I7Y`o})f5tC7 z3QB?!jK6i#Bj|$I5LaD(%b6ZxEwE6tw@^;;AbMr6!~!H+>oaM4X`3Q-49sv_JF>Fl z$&uJ%jeT{2fl04DV+T`z4ANJyDm4W;yg^^U?&%Yb3rm7AIX`kYT8HhQk5vQPm+ii~ zGMJ91rfDqDu)3+*VbT`#^mvLeI$KrMEi<|Y=-3OK+&XrXV#Jx?986E|2AYDS+m)9B z-c=`HaAUCA_o@HCg9Eb0_dCWWc$E>;oJKYJlBm&j#P%H?XLDZ8dkxM9qwe(0=1*~2 f-HyO+sHdSn?O+G!w%A4g00000NkvXXu0mjf3O(TJ literal 0 HcmV?d00001 diff --git a/gfx/trainers/erika.2bpp.lz b/gfx/trainers/erika.2bpp.lz.58985f01 similarity index 100% rename from gfx/trainers/erika.2bpp.lz rename to gfx/trainers/erika.2bpp.lz.58985f01 diff --git a/gfx/trainers/erika.pal b/gfx/trainers/erika.pal deleted file mode 100644 index e8de9b43d..000000000 --- a/gfx/trainers/erika.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 18, 13 - RGB 07, 15, 08 - diff --git a/gfx/trainers/erika.png b/gfx/trainers/erika.png new file mode 100644 index 0000000000000000000000000000000000000000..9b1c282dd32e4b54a1edd3daa15846dc3f37600f GIT binary patch literal 458 zcmV;*0X6=KP)00004LNkl#E@xkOQ8uplOg4k%M?N!iH&r+ZF80qO+DIHax~n)ug>uCj0EaOc3ThpJ+w`vAJ2llnDCgdPOgNt|^rrCm#t zYE;LPrI=} zagzBif!aYioYc;X_wK4Vd;o|u;sge8$;qG9$mG&c1sZu^g102z^o>|MvIfV&j@fd_ z8}Rtbco7``zs=n^+QdO;A0zh(g17N04eama1(YHNniqdm&;S4c07*qoM6N<$g7dV{ ACIA2c literal 0 HcmV?d00001 diff --git a/gfx/trainers/executive_f.2bpp.lz b/gfx/trainers/executive_f.2bpp.lz.c8b5dc9c similarity index 100% rename from gfx/trainers/executive_f.2bpp.lz rename to gfx/trainers/executive_f.2bpp.lz.c8b5dc9c diff --git a/gfx/trainers/executive_f.pal b/gfx/trainers/executive_f.pal deleted file mode 100644 index 36ec86f8e..000000000 --- a/gfx/trainers/executive_f.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 22, 17 - RGB 19, 05, 12 - diff --git a/gfx/trainers/executive_f.png b/gfx/trainers/executive_f.png new file mode 100644 index 0000000000000000000000000000000000000000..ec1419758b622c5402e41816f72b9920c55e232e GIT binary patch literal 418 zcmV;T0bTxyP)00003&NklQY6GnIbI|3&jQRK^m5EhjKmCT0peN=r|KZ$OW2F#F3JVxWZbR<3K0FrErduM1)0S z=ZZ?IFaWk3BfpQT*h6n%eN*K@lK%HpjE#&VAlU)PdUP&Hrmiwqvq9#E;4Bm|Ct($f zc5MGJ$&PQUE^4xS)e7v6tQ%!fmJT{ZgIl6XHmerd4;m{1>84;a^nj)>ORX(qbBQpME*R;J4enylS4(= zp(4IX@iQ==fYfU@=W6ZLI~REJ-~?|29dp6%p*2Ie0r^LrGWG3x0J~uazrGSN)&Kwi M07*qoM6N<$f(*B{`2YX_ literal 0 HcmV?d00001 diff --git a/gfx/trainers/executive_m.2bpp.lz b/gfx/trainers/executive_m.2bpp.lz.211746a6 similarity index 100% rename from gfx/trainers/executive_m.2bpp.lz rename to gfx/trainers/executive_m.2bpp.lz.211746a6 diff --git a/gfx/trainers/executive_m.pal b/gfx/trainers/executive_m.pal deleted file mode 100644 index 66e0a46c9..000000000 --- a/gfx/trainers/executive_m.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 17, 05 - RGB 14, 05, 14 - diff --git a/gfx/trainers/executive_m.png b/gfx/trainers/executive_m.png new file mode 100644 index 0000000000000000000000000000000000000000..e88db5a78c4f9a3918adbee899b163b700711cef GIT binary patch literal 420 zcmV;V0bBlwP)00003)Nkl2txN3^yWOPLjsM=NUZ{n2zeF5VPv?W#LC5IiX;J`Ji9FP5}gO++Q_@iRV*na z1f{fAC8j9_QoA1@nk3b|$l`h+;t67&SOm$L3RYgN?QtE8U~G>K@&UdwB!ZDL=-f!j z<$xl|T8Gqjip=Qk0#q7gyu|uP5dQ;l3C61|r2(1bY9tq6K6b>B zTw+Ct9t*S!k2R#kk(_D8_Nalggyr}3?2Iyq>T>x9`kP#N;=V%tz2gIT5C~YHclomb O00003UZ00004bW%=J|NsC0Z74>00004+Nklq}Cf{ZIi6l3kA*F8dL0`C`@eJjIVjUl` zJBIQoT^x4^W+Cha5gOnR0sZ3@n}`fcNotXrq+q9K%Cx7e zh5}b4DCg*uWUX#NwgoePd1-vx*~(}lqVpGopi^$Hn{joLVUm4X*pI>rEs&KPXMMJs&T+juN{{GzFRe?C4F+!zqo^RU4AJt7+gRw+w!e=pddzBBo-FcG?1FaVUl`-w{R2Og2zbH6X}|yg002ovPDHLkV1j}i=@$S1 literal 0 HcmV?d00001 diff --git a/gfx/trainers/firebreather.2bpp.lz b/gfx/trainers/firebreather.2bpp.lz.a790feb1 similarity index 100% rename from gfx/trainers/firebreather.2bpp.lz rename to gfx/trainers/firebreather.2bpp.lz.a790feb1 diff --git a/gfx/trainers/firebreather.pal b/gfx/trainers/firebreather.pal deleted file mode 100644 index b051224dd..000000000 --- a/gfx/trainers/firebreather.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 27, 17, 11 - RGB 25, 05, 12 - diff --git a/gfx/trainers/firebreather.png b/gfx/trainers/firebreather.png new file mode 100644 index 0000000000000000000000000000000000000000..d838c3a585572b2a8985a3743e89dc848c17ce3f GIT binary patch literal 660 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 N002ovPDHLkV1kG97@`0G literal 0 HcmV?d00001 diff --git a/gfx/trainers/hiker.2bpp.lz b/gfx/trainers/hiker.2bpp.lz.07a4e386 similarity index 100% rename from gfx/trainers/hiker.2bpp.lz rename to gfx/trainers/hiker.2bpp.lz.07a4e386 diff --git a/gfx/trainers/hiker.pal b/gfx/trainers/hiker.pal deleted file mode 100644 index 8d0cb5c4c..000000000 --- a/gfx/trainers/hiker.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 23, 15, 09 - RGB 13, 08, 23 - diff --git a/gfx/trainers/hiker.png b/gfx/trainers/hiker.png new file mode 100644 index 0000000000000000000000000000000000000000..ff1712cbce933551d82c2213ed2d3bc26aa0b512 GIT binary patch literal 632 zcmV-;0*C#HP)00006PNklvn4)2!wIw{olEA zQ#9Jx^Xs@*(sVCB2M|z^|7C!E;2$tSe}w!S*Qcu({O2F^%I7a+_iYZf`W-9ccy*IO z`|#hd?sdtgqyKR|J_&Z6&NTlh$tN!x^)WWTTjSHtH=PHqr;*VTR%|Z2x~{!J4KkXvW;C zA`*4yVC1c+eK}Z$W5tZbD1pyjVOtP8KjRW4yf#n8WIH!Nt0y8s)jSx>QtoulLz!!g z2yMaD*&fkwu!7T1S12ewM?^-Ga#&_`9E^Vxje>7=R`^ug9lUIq>I%Zp2<9|wF#(9K zFv#Gv64J~Kv^Q2XZDU^nXo#o=O3zRvlf*j#8(3Z~~Bq!)IGDQL$wr-$! zFKwA%Lww(2T3ulWD;0fxA6n`7YnU! ShXz6b00006P)00004ZNklB5~rm=E@R0a4-kvt(#=HF9PgH%rQ= zrOjm_xfM!xC}`Ky76|2{Nc6p`Pqf_Pp68+|PzZvV2~Q#qzCfOpZ^j;=kgZSU=BL6d zQcfJbe%0RyIVEbKD812L9!22HTIh4L{Y_noX4KKa(TzxSc5Zb$WbsVEDl>NCeY8(1 zAkKm5*+b5a>M+u_JwIMiJ-K%-LubA=2W*4Ww^kd}Z4fiie6-K(tre*(ZjH-*m8QC; zjpBu~h6$;h_;q6EM&X)H00004KNklEowlF^R*Bltyfk=A(!5SzR4D!F$mVqVui`OE$fQ=bL_!2pr!00000NkvXXu0mjf*AdBE literal 0 HcmV?d00001 diff --git a/gfx/trainers/juggler.2bpp.lz b/gfx/trainers/juggler.2bpp.lz.2d7625ba similarity index 100% rename from gfx/trainers/juggler.2bpp.lz rename to gfx/trainers/juggler.2bpp.lz.2d7625ba diff --git a/gfx/trainers/juggler.pal b/gfx/trainers/juggler.pal deleted file mode 100644 index ffee98b09..000000000 --- a/gfx/trainers/juggler.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 26, 15, 10 - RGB 09, 06, 31 - diff --git a/gfx/trainers/juggler.png b/gfx/trainers/juggler.png new file mode 100644 index 0000000000000000000000000000000000000000..90001c3ce62c2935dfc8d34f1dbadb26e4076ef8 GIT binary patch literal 572 zcmV-C0>k}@P)00005oNkl;&ZFM$^Kud96LAtL3eLBdaW~i{`-Pd^B zM7B^p`L?oU|8N?w1zYF#(y-pCS-o-Z)s!2ea`iu4RIg)lz33k+9@+erOCZ{>2yWG} z%D#na&U@6n&HdU1&0hlnU+(O3l~psZ@yww5{y+d^ujDCBN>nNUlhRnTTV`ohNd&+h zs@-IdJ`*pd0-zg);#$mAG{steBlD~o9=ms2--Wul|w3CkZ_7jgsRrE-YK-?qks} zO9cM``2ewrbbvSo!yzM5cr`LHeS*D%Hmx&(4i#_K^fuLW-?b@}-cOHQZ{Ux9vFTHg z`@=2NYPx}8e=bh98cZOLFW8fH-yg?Z$f0zSry%Aug5-IqM|K|&)e8PkG4Xx?0000< KMNUMnLSTY^9|L^= literal 0 HcmV?d00001 diff --git a/gfx/trainers/karen.2bpp.lz b/gfx/trainers/karen.2bpp.lz.7fc3d941 similarity index 100% rename from gfx/trainers/karen.2bpp.lz rename to gfx/trainers/karen.2bpp.lz.7fc3d941 diff --git a/gfx/trainers/karen.pal b/gfx/trainers/karen.pal deleted file mode 100644 index 0eeb5fa2d..000000000 --- a/gfx/trainers/karen.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 18, 14 - RGB 21, 08, 07 - diff --git a/gfx/trainers/karen.png b/gfx/trainers/karen.png new file mode 100644 index 0000000000000000000000000000000000000000..46081bdae5390e965ca65318d7b34c022321e3ea GIT binary patch literal 489 zcmV00004qNkl*2B4lL`%zWSt zNXO9&QG}wGvad|e*ISTXa1w5>51LUn5}Bfo46$nR7GtC8HWC5W$ZRUrhhVKmW~K0| zfXSg2q;8Or`Jiz!gcUcjY-{$7D~+C|0ukDnMQ*YD(fyp5XG4xL6j6V2-11)kBsRu1yP3wknLZ*m|=nS|+_U6Qy)O$}wxC9HXhoYc!5Bh;8_E fj-GsTK(4JHJctHc36&NA00000NkvXXu0mjfShnG- literal 0 HcmV?d00001 diff --git a/gfx/trainers/kimono_girl.2bpp.lz b/gfx/trainers/kimono_girl.2bpp.lz.e8833d48 similarity index 100% rename from gfx/trainers/kimono_girl.2bpp.lz rename to gfx/trainers/kimono_girl.2bpp.lz.e8833d48 diff --git a/gfx/trainers/kimono_girl.pal b/gfx/trainers/kimono_girl.pal deleted file mode 100644 index 334b11d21..000000000 --- a/gfx/trainers/kimono_girl.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 29, 19, 15 - RGB 26, 09, 06 - diff --git a/gfx/trainers/kimono_girl.png b/gfx/trainers/kimono_girl.png new file mode 100644 index 0000000000000000000000000000000000000000..8f55ab1b2e61d52cab59b2e5617b2ca10e7e80e3 GIT binary patch literal 604 zcmV-i0;BzjP)00005|NklVYdwyaPfO%(^C-jmK(4=aQ_x_!4cIOipW2csrAW0}5<$UZ-xO?D6*oNpM&Z zN5Y_J$45FjG)llJ)OyuAf_np>|2>eyVmXP`5s01RnjjX7e&FnMxIG&g9s4ilrHYt; z{10Z7`{|Ui0DipN(&`o)55dP7j*8rn3_%3~Hx%^UM0E?YT^Y-W%`zaN5Y=rR#eR=O zHoZJ-8r&`)(H|{H%g(Oxu`L!!w@&dZA5k_HU&jNS_^Y%u0O;XVSsN%p`Tk>+>>KM`N%WXwKU q!&ZO7u8ZyySC_KrcTVJW#Qg&bX$sGppkMv~000000004qNklbH@GDoV4QuwxVb%O4d0cbLcpshG-~6g@y+F9fzA+k<8h#^>#tHlRXXI@iqT zB;L(zs`O_fX=ZZoBr5lS#ua%7G1#hX;YJ5)z0;xrrv%rjWw{whN(l!iyG*1?A~t80&A7`2q0+Jbuw-KzBZEM?QV^<->WXR3XH z!mSF9?}&rLGLQhU$2$y;<=x&N`vPE+1d{`AB-AGuTu*TrLzc=Cy^0OYrU)D z7M97h*VNY9$3ZT$iD;z4J-1|CKM0NJAcw{b?Q|vcB00005gNklpH>kv!uu7^^c8 z1Th*G=^rdO)8!U?-A*v9nYo!Rcc80IP`S6TmIq3twR@s%`ex#ckJyl5$$SK6lq8mi zwu#kmtC|hPDTU?z_>5-^noQ7bS?VGFpbT+N^8pU|nkTnqgp7y|nwp7A6{I}fkm;k# zQ|6vZF-&Yk%`Bv{l>!B7E_wDO;R3l_DD%n^+~#p|A&#?@%2tNIt2of=3#1objfVRf zRa}tHxAJvAdp<*wZND>mG1w|KdyCL)drvu%vvEUClQ@Hvd+brB07s*VqhwYci;c5q zP*vy?&1l!$2RJ3G>bR8mm%)K)QdP)k@dO;_q62$iVNsmp3anPW4pOaoltDR(L*g~4 zVu5y!8ganeI9xT@Y^S+L?$%!xP(7%zwbrIn+hb!h&*7{&yq0khC_&dyZi920cRW3T z-Z!WU`@&Op{x_bswLw`z*JAFnEYO^-t?cI}hbmA*3$#(7J+AK;*R-g7bGf%Hy1hKL zd_8YPo1XIGId}Z~sGh{b6rNkRzC9fpr@^`2D}DfCu?O%o>`4v)0000XP)R00004bW%=J|NsC0Z74>000059Nkl|NmU% z%Z7H71^1y(Wj2?YaIi6w$r%6R&j;s2_Aw4ZG^o(q7QtQ|tKp>;r4TE4^DAw8ZoKvlQYRIK$0=M9Uk}4&xAkmTnM@LmW;Opya|E5`aLlCmR&zz|0h}-;;bX z5|q~PTIFDenVdgJZtoDrHsM9d7jV!AUdv~s`gl&(t7qOTJjD?wGP&#pPnc#Dn30|P zh@u*XJ5kbc8TcVW=9<6qJx12LDoO@bS#^(ydjsmXaFQcYSFfrLMQ3E$6z=iT@!yXV zb@pls+@m|-wtBAB|JMrgH~(7Sk1tfb V2l}LAmqh>o002ovPDHLkV1mxx_xk_< literal 0 HcmV?d00001 diff --git a/gfx/trainers/medium.2bpp.lz b/gfx/trainers/medium.2bpp.lz.db642b9e similarity index 100% rename from gfx/trainers/medium.2bpp.lz rename to gfx/trainers/medium.2bpp.lz.db642b9e diff --git a/gfx/trainers/medium.pal b/gfx/trainers/medium.pal deleted file mode 100644 index e06b66f39..000000000 --- a/gfx/trainers/medium.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 17, 12 - RGB 09, 09, 14 - diff --git a/gfx/trainers/medium.png b/gfx/trainers/medium.png new file mode 100644 index 0000000000000000000000000000000000000000..4828a771d961719521c296e24fc35f1d2b2a5fe3 GIT binary patch literal 615 zcmV-t0+{`YP)000068Nkl zCJ^LAY=7LGZ5=w}XOd+TE#?0mwH@DbUy;JT0>8}F1J=JT@!df#;7f|7@&dl&8pQ^3 zR`m^6S@kXaObKDA?fW5E2vc$4Kw>BP9J2iabOK)d<5nqEt2DR8WG=uhnJ#uv9CQK{ zSK)sfVscfJMxqwS`iXI))q!>RgFxp@qaFwBReG<~Ib@HhM5#S7fg?-$E$Y%ND`yJ` zw6IDRDaUNzSdX1BZHq;P2gR(-#lHTxgPs^X+p1ETSiN&x2dgd{`MNgSrZy0e!y}mQ zY0~Q2>3l%dcYzf{+FC7jBB!eYr0?s2oG|Jx5%56H z7=4|f&%F4zWU2Z_o`rNt`vgc|ET&Nek-niCur5$~RXMDQ`iC*qygSGkvJnz@Bi6ax zPISMaZu+sQa_U<%0sfZGQ$)r{`Az6qJ@w#iHnn4%_5s(}o7OFHI{0$Yy6 z4!Qa$79j0c&~km|#6n45nr>6!9^~!Y%ymN63+M8%6WG2#OkfWm_C8F33@LE@IZb7m zy+)g4#q#>`B_`VvF_BqH`RJ{QUZUUYvsb1a@B=bg2y307f^h%<002ovPDHLkV1fYW B9L@j$ literal 0 HcmV?d00001 diff --git a/gfx/trainers/misty.2bpp.lz b/gfx/trainers/misty.2bpp.lz.2ded1a10 similarity index 100% rename from gfx/trainers/misty.2bpp.lz rename to gfx/trainers/misty.2bpp.lz.2ded1a10 diff --git a/gfx/trainers/misty.pal b/gfx/trainers/misty.pal deleted file mode 100644 index aab4b0849..000000000 --- a/gfx/trainers/misty.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 29, 19, 16 - RGB 20, 10, 05 - diff --git a/gfx/trainers/misty.png b/gfx/trainers/misty.png new file mode 100644 index 0000000000000000000000000000000000000000..64768409a99ed3a73ecd1b4034398fbfc7d077e8 GIT binary patch literal 458 zcmV;*0X6=KP)00004LNklG@XSaNk^#RsImS9?XGCX>kDIAvW`UH<<7bM@dAKLM$ z*reTc11gUv*fEd(yAxzkCwK(nD}t=%dD5TedI8o`l;ZNzVA`t@5?tRlY`=C@m@3rj zpl%gZ*;ED222*djF&D00$(VcCUA)M@55_Jyv-3@mzJ|FDX76;0L^3wPCUvk{c26=d zx(yH?`MSZ)3v83yBS%H{VpRVg|JdkzF}_|n54?K?@=aioR{#J207*qoM6N<$f{qH! AZvX%Q literal 0 HcmV?d00001 diff --git a/gfx/trainers/morty.2bpp.lz b/gfx/trainers/morty.2bpp.lz.aec5773b similarity index 100% rename from gfx/trainers/morty.2bpp.lz rename to gfx/trainers/morty.2bpp.lz.aec5773b diff --git a/gfx/trainers/morty.pal b/gfx/trainers/morty.pal deleted file mode 100644 index 736d93ba7..000000000 --- a/gfx/trainers/morty.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 29, 17, 12 - RGB 12, 07, 22 - diff --git a/gfx/trainers/morty.png b/gfx/trainers/morty.png new file mode 100644 index 0000000000000000000000000000000000000000..7f817e1a2b216c56f950bb6cdba359837f1a5514 GIT binary patch literal 480 zcmV<60U!Q}P)00004hNkl}oM4mR%;cYUR z8qT&aLgyHnIRSzDJ5t{BhDQo_qxlVor;zC}&d=P_y2?cO_3GJuf_R=~pjcM80-b=< zE^H3Bacj^U(4(8>tau96%FU{`cr=#DJ}yE}hw@I&b;+%EYVG!Bwg)HLR5N!v=b3FZ zwdL&Gk1c=~=K^PahAwao3`duCIn+o2=^RkV+^Up_=%924;Ge)r(*HNOvJ-WIzsU|? zfQ8{57@v395ka=xNaO;ksx=RrT&i>B@L=Ux>6^kKFtOUdoWdcnyt~};#h-z1_WuLF W{s;4K&njd9000000004&Nkl(+moG)ZIF1EtGrvDk)Wb7Q0dxxhu%*V~$ef zE~jTjMIMSzD;@#J#3ZdPX9@Y71lJ%H38B>kK{i16%(nAP^c1TQRWNCLT^y#l6hC^c za!2Ro&SSP)imSI)a;3$grG$>AF`u7vlbL`VdbLsh%7hBWsd-G6V!4$3wYD28g^>#i z(e74-rb82r4%cJqXXiO0)af_GLFq_P&fL)HLH@!iy>)s~l(&jBO6nJ!{ysOqQaoX! t@6I}@a<7?vKZ2Zo>PjBEuY&yi)*tS$2^SN(L)`!X002ovPDHLkV1l&v==uNv literal 0 HcmV?d00001 diff --git a/gfx/trainers/oak.2bpp.lz b/gfx/trainers/oak.2bpp.lz.91a27df3 similarity index 100% rename from gfx/trainers/oak.2bpp.lz rename to gfx/trainers/oak.2bpp.lz.91a27df3 diff --git a/gfx/trainers/oak.pal b/gfx/trainers/oak.pal deleted file mode 100644 index a4be7ff97..000000000 --- a/gfx/trainers/oak.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 24, 19, 11 - RGB 13, 16, 00 - diff --git a/gfx/trainers/oak.png b/gfx/trainers/oak.png new file mode 100644 index 0000000000000000000000000000000000000000..4b4fab1a30c0218797f1b510b443bf182a077cc6 GIT binary patch literal 507 zcmVW+p300004bW%=J|NsC0Z74>00004+Nkl-DJ9g8 z2({DSC2g(F*^_;*1{lq!=`L0ySQt6re7rsd{_gKlKTzK)r;`jpS?SUVcySI#^2oiq z)p43Thq1I=RzrIxrVIxrTckxHl}zcQIu0QWcnU#!N#~r&nPJxb!zO5yne&wMiojk7 zvD_`;BmaT-PO%&{svH~AKxE+^HyCc8Swi8WrKWRxwR}JHqL$2 z&GnIG2#X>A@Yce9lU`sX-CCIw0QV8GGH7YC<{*}-ogpOf>DbArY?lhJ;v4YBJ+{`G z_*iOfWM9#ZlH-WEfcDo-^4PT8S>%Uo|d@zPRMu+t`C_ss5b^Tq+fwqYB}LD_M93F xOJ#9#ur4pm3^ldy0eswVs=Eep00003`NklFaK3iztwiwEi{F#~E!hqk*0i;v+tRME(U2B-3252>Wlzns!$4fh%wX}k1zBEnpi zJqyspMTy9T7eT6$#5nsHQ&!}tH}tg@Wh^u#bdjeRJu<7?VeGX_Im-!k1nH4DpG=c+ zey!wcY`lk`uvFFq2oQ2n0WA4&>Z58Iqu+(1# zZYhs-qOivwwNhzaqV(@E+D4NX_}w)6AHd4wMT&e&8RyYu9WDp?Rc_lG&}A(uYwrLd zWotSv`CA8Qxk3m(WtMikgrMQgWe$3G30zlt3)>~6uelv63+LU6z9IW5zJb|-ukP}+ as*DeWLk87-06+Nv0000PQz*d literal 0 HcmV?d00001 diff --git a/gfx/trainers/picnicker.2bpp.lz b/gfx/trainers/picnicker.2bpp.lz.6842b86a similarity index 100% rename from gfx/trainers/picnicker.2bpp.lz rename to gfx/trainers/picnicker.2bpp.lz.6842b86a diff --git a/gfx/trainers/picnicker.pal b/gfx/trainers/picnicker.pal deleted file mode 100644 index d0eec39f9..000000000 --- a/gfx/trainers/picnicker.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 19, 08 - RGB 10, 20, 02 - diff --git a/gfx/trainers/picnicker.png b/gfx/trainers/picnicker.png new file mode 100644 index 0000000000000000000000000000000000000000..0721244f0fdc5e5d4f56ec22e78443b6fd878ab0 GIT binary patch literal 443 zcmV;s0Yv_ZP)000046Nkla{n*YO~vKzNUTkET1mt{#Rhw zgi{9b9`p+gg002ovPDHLkV1jUAygvW{ literal 0 HcmV?d00001 diff --git a/gfx/trainers/pokefan_f.2bpp.lz b/gfx/trainers/pokefan_f.2bpp.lz.9cbd3f20 similarity index 100% rename from gfx/trainers/pokefan_f.2bpp.lz rename to gfx/trainers/pokefan_f.2bpp.lz.9cbd3f20 diff --git a/gfx/trainers/pokefan_f.pal b/gfx/trainers/pokefan_f.pal deleted file mode 100644 index 57d1b94cf..000000000 --- a/gfx/trainers/pokefan_f.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 17, 14 - RGB 15, 04, 15 - diff --git a/gfx/trainers/pokefan_f.png b/gfx/trainers/pokefan_f.png new file mode 100644 index 0000000000000000000000000000000000000000..0bf45ace6528eebf43602a5be540738fc14d9a13 GIT binary patch literal 548 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 literal 0 HcmV?d00001 diff --git a/gfx/trainers/sage.2bpp.lz b/gfx/trainers/sage.2bpp.lz.2038324b similarity index 100% rename from gfx/trainers/sage.2bpp.lz rename to gfx/trainers/sage.2bpp.lz.2038324b diff --git a/gfx/trainers/sage.pal b/gfx/trainers/sage.pal deleted file mode 100644 index d61b39ec3..000000000 --- a/gfx/trainers/sage.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 22, 17 - RGB 08, 08, 20 - diff --git a/gfx/trainers/sage.png b/gfx/trainers/sage.png new file mode 100644 index 0000000000000000000000000000000000000000..df7e3e4f4b2b4e68b262bb112e2f6b80a70891d1 GIT binary patch literal 385 zcmV-{0e=38P)00003XNklxD3m2($COfEz6oMR9DMHxT?iCsdyOAVs&YplKD$q4JVs+WCbAuZaL&Mf$AKv+p6BG z!shsRAB$(lhQJl{YlwHl(+TzXJ#_pRTs?OKef2t&p7ZZu=XeFZPS`2vgbnp<+=ry6 fcuw~(|LOk#yt4?scqu7P00000NkvXXu0mjfSca_p literal 0 HcmV?d00001 diff --git a/gfx/trainers/sailor.2bpp.lz b/gfx/trainers/sailor.2bpp.lz.0f7f3386 similarity index 100% rename from gfx/trainers/sailor.2bpp.lz rename to gfx/trainers/sailor.2bpp.lz.0f7f3386 diff --git a/gfx/trainers/sailor.pal b/gfx/trainers/sailor.pal deleted file mode 100644 index 33b3c02b1..000000000 --- a/gfx/trainers/sailor.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 24, 14, 07 - RGB 03, 07, 13 - diff --git a/gfx/trainers/sailor.png b/gfx/trainers/sailor.png new file mode 100644 index 0000000000000000000000000000000000000000..09dee6b73eb01a598e74bf1e86a83060e3555207 GIT binary patch literal 508 zcmV00004-NklRJq%3g0kH&aLGEggG3M8iLus+SR$p-e1{0Iv?#q{^jdSal>!VMk@XNcBo@ z;(G3^on*r#{x*;uTyId{Kr|p8>k4#ItYc2W7Oc5>zIc&cOf)j$M^XE^;2IQ=vm5yvrO8_Lykv$5M|2>mv+Q~jX{5x z9;r#vAXo(nfd?11zHlan@aO@EIR%SL4nU)In51oP(opGQAYI=~#`R9DuzxLZuo+d{im3MXhv= ynlrLi)~>H17d69FEf-4HM;%`-c`YGUD%2n9q6cGOY}tSS000000004QNklY#^alhQ`B3YaO~)l+2qsHL*)z0u0l=y8bNEDQxHrxuCSKzO$p)?igh zpIq^ zS6MDm+;f~>Owjcz?i|D|5*-{Bmcp7G$9Vy;^J8^6rI$=2#5_5(4QDA6DoZLyW_1NF zuOaTwa@&C7I;E_~MIlyALW^u6S9X9@3*TcMr=8qk#}}%*lWwG7&Y9|T>85tob!UQ9 z$&&nI&mO;WC8W#NJC;LynyVRR)~Bef+1my3_|p2_egG1v2e%7xd}sgw002ovPDHLk FV1gfe(xm_Z literal 0 HcmV?d00001 diff --git a/gfx/trainers/scientist.2bpp.lz b/gfx/trainers/scientist.2bpp.lz.2ef10474 similarity index 100% rename from gfx/trainers/scientist.2bpp.lz rename to gfx/trainers/scientist.2bpp.lz.2ef10474 diff --git a/gfx/trainers/scientist.pal b/gfx/trainers/scientist.pal deleted file mode 100644 index 0661e50e8..000000000 --- a/gfx/trainers/scientist.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 24, 19, 11 - RGB 10, 13, 17 - diff --git a/gfx/trainers/scientist.png b/gfx/trainers/scientist.png new file mode 100644 index 0000000000000000000000000000000000000000..3ba33aef442a6dfaed6fffd71338ccd9c4103697 GIT binary patch literal 523 zcmV+m0`&cfP)000051NklZ*uf0u{ouS}fM!Iu?%QC>ZubA<9BXMrlbd zfgD+pQ3`Ga@0toi&9Zb5&Yzv?EZ-RujFHeE!a;_@>|jffP9ESbOwWi>4l)ww1i@i- zQ9dlA&ssrWC4@ms^8D{sIO_EQHsfcqPaGiT!;Xo41((a4QCQV=s|$lO*z0_PxGGX} z;2;M$)54R}(zm^6T0(t2z;d=aR$bo#=$pH~Hp{W=HK{aBFH-9!e8a5ISm87Z4oaE( z+ho_;wDIdxAE51z-uJdWL*%Mvwiq=erSS>7x2iY1hYI+RJiSQ#7U>+hg2%q>j1qKR zFxrrNXv1*|?CsG)jd5l8vl0MfpmfJMGc0M`FQDoz6D_d}rREWnojvaT|H~QuM3@Ji zyn~;qU_^13!;n|<+mF&#_~xf&o&`5YRQBd`JmPLG{c=8k8-GmL2YxT*6XgH^ N002ovPDHLkV1iR5@#p{m literal 0 HcmV?d00001 diff --git a/gfx/trainers/skier.2bpp.lz b/gfx/trainers/skier.2bpp.lz.399d4240 similarity index 100% rename from gfx/trainers/skier.2bpp.lz rename to gfx/trainers/skier.2bpp.lz.399d4240 diff --git a/gfx/trainers/skier.pal b/gfx/trainers/skier.pal deleted file mode 100644 index 9201ca909..000000000 --- a/gfx/trainers/skier.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 28, 19, 15 - RGB 24, 06, 14 - diff --git a/gfx/trainers/skier.png b/gfx/trainers/skier.png new file mode 100644 index 0000000000000000000000000000000000000000..7f9466f1a829a652211393a95f9cf40084eda045 GIT binary patch literal 567 zcmV-70?7S|P)00005jNklciW&foQiNi|KkX{E7cy#PQeXp4Ye{#U9%d?uLY5VUvaIhgp(2WDDGQ znw)vceS^$a#fTAIPLSct%h&~F4JRcxigtrkg9POuDIMl@PeEeQKq-WphLyBOj=D5U zJ<(cnB0m~s*H=xeCPsuaCWdBOjVxTdAZGN+oVm)L4(QtygeJ#H#0ISqB0|l7Pm}!~ zcB62g(H$D$X*|KbLd48)P+!!l{0MvS-ZwX!ig9da5gmh3hT6JJH92opQP9JLb)?xV z4W*s=2D(fUjl}Lco98?IfLxZq6wh=+e}OijRkD`eK3RsaEhA?}o~F=bpN1W#R6{n| zWuD=!QeE2%NEY{&OQ|G_BE`Kuo@X3N12gT1KtzGmY5ICPuco3gH}Ll?IDndl?`)IBI^)eT=>>r0UJ^B)wN2_8i1)%^ef002ovPDHLk FV1i_l1kV5f literal 0 HcmV?d00001 diff --git a/gfx/trainers/super_nerd.2bpp.lz b/gfx/trainers/super_nerd.2bpp.lz.c5362664 similarity index 100% rename from gfx/trainers/super_nerd.2bpp.lz rename to gfx/trainers/super_nerd.2bpp.lz.c5362664 diff --git a/gfx/trainers/super_nerd.pal b/gfx/trainers/super_nerd.pal deleted file mode 100644 index 862d4e21e..000000000 --- a/gfx/trainers/super_nerd.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 22, 17 - RGB 11, 09, 10 - diff --git a/gfx/trainers/super_nerd.png b/gfx/trainers/super_nerd.png new file mode 100644 index 0000000000000000000000000000000000000000..8636f2262d5309c4eabd1dc557555ae82e83b763 GIT binary patch literal 454 zcmV;%0XhDOP)00004HNkl6jv>l2FN6#gPIH#mp0|dlC z1c`=2<&;E{RW3EAQZzt)#WMp{&W)F;gJQ9a~J!wPB%WMl!l)xlyWch(`p zS0ym9h^2XTxzAu?k}-6hVh#Be)hSaM2crP|L%}1kz?r}TNiS~O3g52hOz^QOBMwZ3 z26_<;u++lQSeR5n?6I?^$fDL0iNygeFcZ(N)?MT13_Ehj!RjN6ass73>!PbZ011(7 zkrro7kxkVc%I>TG$D=6#Rx()k26(x$Gm`0ugY1BTAvGrX&wgYGLLqnpaoBLFO+*VY zxFE5UVONP8&q(tVZdY@4+;BPA3<3{H57Io@0yi$LZES?@8^^puV14bsevukoi?{nq wb|Ji%*T}sNnVX{A!TDpuz*8}!TkUuD0xpdP&B+ZLjQ{`u07*qoM6N<$f{Vt*00000 literal 0 HcmV?d00001 diff --git a/gfx/trainers/swimmer_f.2bpp.lz b/gfx/trainers/swimmer_f.2bpp.lz.c60d0ad6 similarity index 100% rename from gfx/trainers/swimmer_f.2bpp.lz rename to gfx/trainers/swimmer_f.2bpp.lz.c60d0ad6 diff --git a/gfx/trainers/swimmer_f.pal b/gfx/trainers/swimmer_f.pal deleted file mode 100644 index 6bddcbcc3..000000000 --- a/gfx/trainers/swimmer_f.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 16, 05 - RGB 06, 14, 04 - diff --git a/gfx/trainers/swimmer_f.png b/gfx/trainers/swimmer_f.png new file mode 100644 index 0000000000000000000000000000000000000000..affef5f5ed5b2d6dae06fbf3164a536dac819516 GIT binary patch literal 489 zcmV00004qNklJIyCWkfIK*|foZRHqA*<<(G^Xx?QevgFIDtdbd1;`C7|*-k;Skce zR|xX*km$g~DzeD_pwpS-AS!Cbq|-!H#iFL54WdS4mLA_8c`BzOkhK+;z{boN9y^$D zK01VzI5Lk5HS}3V-aTDQIk6kIOkHMM>`LRLE6dmhBd)WgU<*};Dx=3_uJne){Amtd zhqSXIxEs((8{X~RB?WDfw=tv1C@MQjFF_@!V+OULR*s8}WBQe?9OpX{vz=|RlDT~C zA?wnm5<%^Sg`*QpNVOs{c8eIBh00000NkvXXu0mjfs6X8H literal 0 HcmV?d00001 diff --git a/gfx/trainers/swimmer_m.2bpp.lz b/gfx/trainers/swimmer_m.2bpp.lz.2c1a716e similarity index 100% rename from gfx/trainers/swimmer_m.2bpp.lz rename to gfx/trainers/swimmer_m.2bpp.lz.2c1a716e diff --git a/gfx/trainers/swimmer_m.pal b/gfx/trainers/swimmer_m.pal deleted file mode 100644 index 164d2166b..000000000 --- a/gfx/trainers/swimmer_m.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 03, 04, 09 - RGB 21, 13, 01 - diff --git a/gfx/trainers/swimmer_m.png b/gfx/trainers/swimmer_m.png new file mode 100644 index 0000000000000000000000000000000000000000..2c0442385ea775e6bddc6e64630ebb9cf1a6d040 GIT binary patch literal 467 zcmV;^0WAKBP)00004UNklYlsgGP1EJpbjoc3WO9AqpMqol?##tzhRQnV za{_vvLgf;|*@N+(_0eU=sm4OJ{LH1=hd{}#`-)JF=>II(5UHthgV76;Wi@ZyM0IIL znB~VzQ`94&ZKN%)JHjjt1L{~V?NyQFHeE#FEKq@hSX0i0xU&zsC4;N$xU9uB=o5~w zPf2o?^sEcBXkr&*z2TOX%XH@;9`Z-#I5|07j*9}sIG0UXITP99AZyFRXZnYPKAe5# zt9zTJvc!CAbX4T00004$NklYD3@wQNB)1zEY+G!cz;U^W zgNMrfy5!3-CpLNYu*78Q}Hk-4YF9V>gPEzvMxd527|KUx-i?gi6@nPeqX zr!cFb2OZ=Qlryk>T3QE_KLnAwH(e6EYp=OC9fE^H!<2euJIzZX(MD=X-X<_wR3XVT z0S4DUAj@tMGR%f14_MEe$H1_-eDt^kksh%n@?22$3ch)PQ+?fVham4j+76eUxqRBy rzL@oJa)5lbrlXVRtIJ%S>DS{2#vll9jEsv000000NkvXXu0mjfZ@S&p literal 0 HcmV?d00001 diff --git a/gfx/trainers/twins.2bpp.lz b/gfx/trainers/twins.2bpp.lz.462fd733 similarity index 100% rename from gfx/trainers/twins.2bpp.lz rename to gfx/trainers/twins.2bpp.lz.462fd733 diff --git a/gfx/trainers/twins.pal b/gfx/trainers/twins.pal deleted file mode 100644 index 47792418b..000000000 --- a/gfx/trainers/twins.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 22, 08 - RGB 28, 03, 21 - diff --git a/gfx/trainers/twins.png b/gfx/trainers/twins.png new file mode 100644 index 0000000000000000000000000000000000000000..4726f95992eca97d95ca7c41875aad46b1d94911 GIT binary patch literal 526 zcmV+p0`dKcP)000054Nkl3|M>(~ z#U$EHpYEYd+D33;1=NcC_+f?`YOgpTpIam#G`9Y zK%@{j902=}n6NR=F1lSvH_G@*rdVWC4I&D@;3RZA;36i&hn+&YUgL>RjUPbUAj7VT z_O#zIouWo}n}A)GoM;*jKnM5?i?3Oj;qZp!f~2Lx&0-bUL8f}mP|IHwYytKR4IZhD zsdZa8A(64j3S4+t>7eA9!063K;9TS&8_UaKqa|W}N@moUXmidC(}8^xI@JPX?E*#R zg2>$IH23Uh4EmX@gtzt0;>`!T~gD9&&Tw?G>y@2X^FtY98liqmPH?ztgyRqm^{ z=mzJlBZj#LBU$cCJ_iiLd}7de;) Q^8f$<07*qoM6N<$f-p$--T(jq literal 0 HcmV?d00001 diff --git a/gfx/trainers/whitney.2bpp.lz b/gfx/trainers/whitney.2bpp.lz.dcb46ea6 similarity index 100% rename from gfx/trainers/whitney.2bpp.lz rename to gfx/trainers/whitney.2bpp.lz.dcb46ea6 diff --git a/gfx/trainers/whitney.pal b/gfx/trainers/whitney.pal deleted file mode 100644 index a51af5fda..000000000 --- a/gfx/trainers/whitney.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 28, 18, 09 - RGB 21, 07, 02 - diff --git a/gfx/trainers/whitney.png b/gfx/trainers/whitney.png new file mode 100644 index 0000000000000000000000000000000000000000..b9b4aa497946bdab7dd01023e775e07751774627 GIT binary patch literal 469 zcmV;`0V@89P)00004WNkl!AFZV%c`Qj%z!Aq_+{Ta&7!m{rbI!WtQ#g2Fs7=N(Lxfx;e0$%ZxY` zy-nZUw9N^eL{;hR{)Ir^7({2uFqu>qr{Q7}27WLr&X{@L77Ma`8EC8t0?E37>6po>%_*faRP5>sw;9=fFQ;|2nK+rP&3yRWB`_00000 LNkvXXu0mjf3_;K% literal 0 HcmV?d00001 diff --git a/gfx/trainers/will.2bpp.lz b/gfx/trainers/will.2bpp.lz.842af358 similarity index 100% rename from gfx/trainers/will.2bpp.lz rename to gfx/trainers/will.2bpp.lz.842af358 diff --git a/gfx/trainers/will.pal b/gfx/trainers/will.pal deleted file mode 100644 index d27fd8069..000000000 --- a/gfx/trainers/will.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 23, 15, 09 - RGB 26, 04, 02 - diff --git a/gfx/trainers/will.png b/gfx/trainers/will.png new file mode 100644 index 0000000000000000000000000000000000000000..599f7cce8d3b80a039cb80b88e31d4ec295ec3ff GIT binary patch literal 471 zcmV;|0Vw{7P)00004YNklu3kMBy$z*Vxq}K6pG9{qmY=v$khrU z*g+XBO9~??b>T`0Aj)!Lp{ z-P#)yJkmTt>s?4~N?)P{kZqI8=J58FQRFM9)=P5zV|vF`fNe1!d&&lu$iI)YJMRW+ zrICn~a93n8WhzoE;OrwQ#rsJG00004CNkl#edol|w@z8l zxZ+pN3&v6J)ok{<&(o|)gjY|K!S1rZhccz-_8F5KWDsyECo|%ELD*X}pWCUBJdp-! zIQEMwOkzpilHOo07#X4$5X>jZIJ{*M%hw!~Q%UFKT?Mn{K9LuB&=s`KEp^}9b4l_B z6h7wX4vd|O(e^CWjkQ%$P~vPUzf4s> z<==opeNc7~t=ue6J0Nn^CEpgbqC5lrp#|n1pKG}uBE|8z4a%I%0g2l|$_?(--*fuwA Date: Thu, 22 Jun 2017 23:53:57 -0400 Subject: [PATCH 24/46] pngs in gfx/unown_puzzle --- ...dactyl.2bpp.lz => aerodactyl.2bpp.lz.f546fb5e} | Bin gfx/unown_puzzle/aerodactyl.png | Bin 0 -> 324 bytes gfx/unown_puzzle/cursor.2bpp | Bin 64 -> 0 bytes gfx/unown_puzzle/cursor.png | Bin 0 -> 75 bytes .../{hooh.2bpp.lz => hooh.2bpp.lz.e440a572} | Bin gfx/unown_puzzle/hooh.png | Bin 0 -> 349 bytes .../{kabuto.2bpp.lz => kabuto.2bpp.lz.0ed9882d} | Bin gfx/unown_puzzle/kabuto.png | Bin 0 -> 276 bytes .../{omanyte.2bpp.lz => omanyte.2bpp.lz.27bfcbde} | Bin gfx/unown_puzzle/omanyte.png | Bin 0 -> 335 bytes ...ncel.2bpp.lz => start_cancel.2bpp.lz.e07fe7bd} | Bin gfx/unown_puzzle/start_cancel.png | Bin 0 -> 216 bytes gfx/unown_puzzle/tile_borders.2bpp | Bin 128 -> 0 bytes gfx/unown_puzzle/tile_borders.png | Bin 0 -> 118 bytes 14 files changed, 0 insertions(+), 0 deletions(-) rename gfx/unown_puzzle/{aerodactyl.2bpp.lz => aerodactyl.2bpp.lz.f546fb5e} (100%) create mode 100644 gfx/unown_puzzle/aerodactyl.png delete mode 100644 gfx/unown_puzzle/cursor.2bpp create mode 100644 gfx/unown_puzzle/cursor.png rename gfx/unown_puzzle/{hooh.2bpp.lz => hooh.2bpp.lz.e440a572} (100%) create mode 100644 gfx/unown_puzzle/hooh.png rename gfx/unown_puzzle/{kabuto.2bpp.lz => kabuto.2bpp.lz.0ed9882d} (100%) create mode 100644 gfx/unown_puzzle/kabuto.png rename gfx/unown_puzzle/{omanyte.2bpp.lz => omanyte.2bpp.lz.27bfcbde} (100%) create mode 100644 gfx/unown_puzzle/omanyte.png rename gfx/unown_puzzle/{start_cancel.2bpp.lz => start_cancel.2bpp.lz.e07fe7bd} (100%) create mode 100644 gfx/unown_puzzle/start_cancel.png delete mode 100644 gfx/unown_puzzle/tile_borders.2bpp create mode 100644 gfx/unown_puzzle/tile_borders.png diff --git a/gfx/unown_puzzle/aerodactyl.2bpp.lz b/gfx/unown_puzzle/aerodactyl.2bpp.lz.f546fb5e similarity index 100% rename from gfx/unown_puzzle/aerodactyl.2bpp.lz rename to gfx/unown_puzzle/aerodactyl.2bpp.lz.f546fb5e diff --git a/gfx/unown_puzzle/aerodactyl.png b/gfx/unown_puzzle/aerodactyl.png new file mode 100644 index 0000000000000000000000000000000000000000..c7b37bbbb8b15c61244440a5ad9a6d98a2f5c550 GIT binary patch literal 324 zcmV-K0lWT*P)%) z;tdCLO9koMUh_35@G5WPhFNmmC+92|QzT6+2-VEf^er7EeqnN!M5gUET-T*Qfz+|^ zEgd!b1={_2ZJQ= zQHsMb3`BiN8LIylqWf4-|4X1b<&GS>l-(HOyjU5JCLZ{@#vh2edMKep;~rxF!9weX z>1At{`66f*)`ab72w(}I2MQ%6FhWeAcyU=rM#DwWJ+cgSJy>f5(1$*r2<*{Sa|yqM z4pv1uobOs1UC9DUbMu6+2c_rOft>jwXpYVGE1wqy4p45^0dGh&_z2@YTdnjM-BR;5 zif%{f3HyNW@?Y4y&eTS+J@Pgx23->Dy`utbNwb+WFS^Q44QyZ8a-x2W4esBctgCG5;iJWp7rtWUHYhv`Zfsuh0U#mT!=PFov(TF+#g0Fr70|-L! z0wt`1oft5}M}$dOf*=%W9N@i{0MrO$0XqKW21G^V4sE_RsI>C~#~tR{33RsOl1V;) zK~QB^FHm~0{sFSRAuKB*2!RO(oI$Onqlj4#(dmPtCbOL`)Nw%x8?ppXC{fQ!SCmGk z4!E;{R`CU8l^6Pldl;ab`o*uC=|@KSS4U|OlUHn83TQUHAAx3GuQhr~+&cWd#J>T5-0^iP;^vI0l%;S9BvO$0)`I zi4uYl(T3~+&XXWpcp0HoNV^DRq zg1vG9X=yM9To|{ilyYIw@J>Stpvc#3Zuq*Z$}Ds+H_fK<^xi%QL7+VKW)=VO^mCO9 h&r>e^Jjefjq;HNsI6Gbt4G;hT002ovPDHLkV1h?_l5+q6 literal 0 HcmV?d00001 diff --git a/gfx/unown_puzzle/start_cancel.2bpp.lz b/gfx/unown_puzzle/start_cancel.2bpp.lz.e07fe7bd similarity index 100% rename from gfx/unown_puzzle/start_cancel.2bpp.lz rename to gfx/unown_puzzle/start_cancel.2bpp.lz.e07fe7bd diff --git a/gfx/unown_puzzle/start_cancel.png b/gfx/unown_puzzle/start_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..66455dccb0a6e69fd474cbeceb7bafa2cdfe8845 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^Gk}XyDjIK{I&@_3l_-lTmGW5dWD_Uw59*f zZiY8C2kT5g%<;hyQUXp00i_>zopr0Q=NevH$=8 literal 0 HcmV?d00001 diff --git a/gfx/unown_puzzle/tile_borders.2bpp b/gfx/unown_puzzle/tile_borders.2bpp deleted file mode 100644 index 570244c8268962d53f3ca33f7bc896af7ed3bfa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmYk!K?(pM2nErih1c$AAG(O0WGX80Z3NMQIi()Jy(D1Pw)!aCm%l&r+(oEM?vPT& I403A>SPncYnE(I) diff --git a/gfx/unown_puzzle/tile_borders.png b/gfx/unown_puzzle/tile_borders.png new file mode 100644 index 0000000000000000000000000000000000000000..8706905f76158f30d3f9b53165cc6f43214dac0f GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QnsEhjv*Ddk`ovhpV^=JFZtvD z|NrL``nwYtP8t8PXHc>`&}pA=Xr2etnqEm424Ch`KN;E QpBTtMPgg&ebxsLQ0OsT+X8-^I literal 0 HcmV?d00001 From 1f81d1851f5283eefa03e068a3925d2a960f67b4 Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 23 Jun 2017 19:56:24 -0400 Subject: [PATCH 25/46] pngs in gfx/ --- Makefile | 5 + gfx/{pc.2bpp.lz => pc.2bpp.lz.2201c1aa} | Bin gfx/pc.png | Bin 0 -> 115 bytes gfx/pc_mail.2bpp | Bin 64 -> 0 bytes gfx/pc_mail.png | Bin 0 -> 114 bytes ...rink1.2bpp.lz => shrink1.2bpp.lz.d4443930} | Bin gfx/shrink1.png | Bin 0 -> 188 bytes ...rink2.2bpp.lz => shrink2.2bpp.lz.3f58480a} | Bin gfx/shrink2.png | Bin 0 -> 156 bytes ...ots_1.2bpp.lz => slots_1.2bpp.lz.b22ddc13} | Bin gfx/slots_1.png | Bin 0 -> 446 bytes ...ots_2.2bpp.lz => slots_2.2bpp.lz.b28f76e3} | Bin gfx/slots_2.png | Bin 0 -> 664 bytes ...ots_3.2bpp.lz => slots_3.2bpp.lz.70c2984c} | Bin gfx/slots_3.png | Bin 0 -> 1916 bytes tools/gfx.c | 113 +++++++++++++++++- 16 files changed, 114 insertions(+), 4 deletions(-) rename gfx/{pc.2bpp.lz => pc.2bpp.lz.2201c1aa} (100%) create mode 100644 gfx/pc.png delete mode 100644 gfx/pc_mail.2bpp create mode 100644 gfx/pc_mail.png rename gfx/{shrink1.2bpp.lz => shrink1.2bpp.lz.d4443930} (100%) create mode 100644 gfx/shrink1.png rename gfx/{shrink2.2bpp.lz => shrink2.2bpp.lz.3f58480a} (100%) create mode 100644 gfx/shrink2.png rename gfx/{slots_1.2bpp.lz => slots_1.2bpp.lz.b22ddc13} (100%) create mode 100644 gfx/slots_1.png rename gfx/{slots_2.2bpp.lz => slots_2.2bpp.lz.b28f76e3} (100%) create mode 100644 gfx/slots_2.png rename gfx/{slots_3.2bpp.lz => slots_3.2bpp.lz.70c2984c} (100%) create mode 100755 gfx/slots_3.png diff --git a/Makefile b/Makefile index fb9e75a42..ed74afe5c 100644 --- a/Makefile +++ b/Makefile @@ -130,6 +130,11 @@ gfx/title/logo.2bpp: rgbgfx += -x 4 gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace +gfx/slots_2.2bpp: tools/gfx += --interleave --width=16 +gfx/slots_3.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip +gfx/slots_3a.2bpp: tools/gfx += --interleave --width=16 +gfx/slots_3b.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip + %.bin: ; %.blk: ; diff --git a/gfx/pc.2bpp.lz b/gfx/pc.2bpp.lz.2201c1aa similarity index 100% rename from gfx/pc.2bpp.lz rename to gfx/pc.2bpp.lz.2201c1aa diff --git a/gfx/pc.png b/gfx/pc.png new file mode 100644 index 0000000000000000000000000000000000000000..ce8fed73b3c3fc3ead5feb04f834ec4f1abf39d8 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QdXWWjv*DdYELP2A#DHv diff --git a/gfx/pc_mail.png b/gfx/pc_mail.png new file mode 100644 index 0000000000000000000000000000000000000000..fd4b2892f337e264b693dd2ac38e42203095fdd1 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJOHUWakcwN$2@H&DMHeaZ#Bew0 zEah7$#>UIbDApk{gQ5Aq!+{S6|MA-&X8*_U(Daj`hoRU}NI{k1SH0vL-D}7HfDH3= L^>bP0l+XkK)ZrjF literal 0 HcmV?d00001 diff --git a/gfx/shrink1.2bpp.lz b/gfx/shrink1.2bpp.lz.d4443930 similarity index 100% rename from gfx/shrink1.2bpp.lz rename to gfx/shrink1.2bpp.lz.d4443930 diff --git a/gfx/shrink1.png b/gfx/shrink1.png new file mode 100644 index 0000000000000000000000000000000000000000..6cf5b80771956af61967e99cdd19cc115fb148b6 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7U|W=|K#kcwM-FP-LWFyLVbILIh- zZ1sezt#Peuf=-wU{N5_xvtUK5T-+=(#gYkWyz-Nex3w));|NO;T;-v-NbvC2@QTl=2NQF|kAF?F2zFj3t&-RF ln9ot2>%|s@*Y@%ekNINnzUwftxBL%smZz(q%Q~loCIBi}NKF6$ literal 0 HcmV?d00001 diff --git a/gfx/shrink2.2bpp.lz b/gfx/shrink2.2bpp.lz.3f58480a similarity index 100% rename from gfx/shrink2.2bpp.lz rename to gfx/shrink2.2bpp.lz.3f58480a diff --git a/gfx/shrink2.png b/gfx/shrink2.png new file mode 100644 index 0000000000000000000000000000000000000000..276b4e7c709540d7ee76e65404d1cc199e3f500b GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7U|WKS2zkcwN$Kl+&@+;&Rb;s2u% z^N;_;9sB?PZz~r9$$B~S?=}%FHhOiF8}lByUpxJuF><}_jky*(>K)=X96!lAv**FT z=Rg17Z>R|WyV1SuYWg!~jV}B7?$7=`{GVW7GMS5^IsJ!mSYbmo$XZWVKbLh*2~7ZZ CJwYJ= literal 0 HcmV?d00001 diff --git a/gfx/slots_1.2bpp.lz b/gfx/slots_1.2bpp.lz.b22ddc13 similarity index 100% rename from gfx/slots_1.2bpp.lz rename to gfx/slots_1.2bpp.lz.b22ddc13 diff --git a/gfx/slots_1.png b/gfx/slots_1.png new file mode 100644 index 0000000000000000000000000000000000000000..a10340844165a9ba0aefac896741d99f5f0abcf1 GIT binary patch literal 446 zcmV;v0YUzWP)>m0004nNkl|%I0zP$H-m%BF!YX@{H_ob*c}LyE&;|NX>4>|2kyLAnR{Nzt;c$NRZySzBSRdn8D2Nd-!tXZE9mq#vFfg zY|dEp>G<^I$TsQ<)zMUxrmCok$1#nbiRFu@FZyrvZJteIF_VvkCNwN=Ml?3*PQb-= zDMeb0XOqq3{9bVmdudNRJyeb)pldH)=*$bOTfj;3NLH?^4c ztY0o>I$cb>8ELF5>QHw$bvSoYUA3S^*e1LseBi<1&f(0Vyh($ literal 0 HcmV?d00001 diff --git a/gfx/slots_2.2bpp.lz b/gfx/slots_2.2bpp.lz.b28f76e3 similarity index 100% rename from gfx/slots_2.2bpp.lz rename to gfx/slots_2.2bpp.lz.b28f76e3 diff --git a/gfx/slots_2.png b/gfx/slots_2.png new file mode 100644 index 0000000000000000000000000000000000000000..aa1292ccbcad5b10f133086d33e3b7cdbe0a455b GIT binary patch literal 664 zcmV;J0%!e+P))lv*$K;;k?R6(pC{=-?rh{0Yq^=Ll)eIknJJO}8!9f1+!Q z4J-vu`9H>80trkyeKV`Z)-?3gVfipW-g~^A`2h35$B{yDul))|A!gV=-vy7vF7QD3 zpiP4oMW4^1H5P`Z0e!hj=-?ZE0?(lUhD%4TLZ(s7***$w|<7`HpYpX24HwY+K zCOqiiWCJRbcQ7d@IL?H{BNro4Y+%ydYfw?qpp3L@a`|#SZ8}vwqMt(onGFQ}-Vwt5 zV~+64#{&fKdmg^`Kf84BmDB8#HX#~e$J0=p{Z>z!WwJ&GLU2qfb$1FOT&P--L#CSy zqs;vVMl0P0WOs!@<$Dyo(xtdslH!=0b*eZabO{rK({;MAhi@2yYSzOjTcy9uRw*Nw z<4~K&gsnp=)ujKOlm;#&S8TCATThM&DY{7&MI6ysjS(?9hO8wSPK8*tY)h?Kbsyy`$rq-Lt1Q z&Su29|LC6tsW*&47W<|*X+TmtrZe_8|1=y;&kg!;(&_e$T%Pgo$oR*Ne+R}t&-mvW z|M(sL-8}N3L`XNMCaOw(hIEt1)>;3oiL&2kxBGXugqz1CVJr;@>YtJWGdp4P*rX0000{y8xK literal 0 HcmV?d00001 diff --git a/gfx/slots_3.2bpp.lz b/gfx/slots_3.2bpp.lz.70c2984c similarity index 100% rename from gfx/slots_3.2bpp.lz rename to gfx/slots_3.2bpp.lz.70c2984c diff --git a/gfx/slots_3.png b/gfx/slots_3.png new file mode 100755 index 0000000000000000000000000000000000000000..456e9b6bffa01903e93efab1c5d281d789e6a42f GIT binary patch literal 1916 zcmaKtX*3&%7RM7IltigDk*Mt{Q=`PvpgM_)rL{-3R5dM?&>FR!+Nv}t5h7Eaiqb)h zC>mp#T1sOnGN`3dj;Yq(iG53@_DRp15AS_=@5BGz^Z)p}_x{gKcXP3aO2efA007j{ z!PZ06RYh8p0*fk~P@*Dgzz7d}8vwf>F)uRWM65Fw0H~(P>|K`-`6G86ydwYr**D(= ze0)+?4FHgoceKTNM*A%@WPTh+%h@gysz}FCX9K)wjA`X7Z)v7^0Z=}WYI@B3{cUp# z_1XQ=t`9QX>kY4|9|%3~v^X5j4=X-i3;raHDH@Fyo*94d-s45Cp4nPj+_a5uHf$Lp zch_C~>yk|&u{zW=2vXdTW|M7ACe>7ES?2#sZFgYiPuq!%=wur9LT#CTPxz^XgT3vB zTibhk@#DXDwqAziC~C?YmIJNB245K%1&MiaUiSYQ#(|a%sGC%-wjAew>gK~<^bz7( ze{~vThMhqstQvW(mRMM4#Fx{DtguH*Yo1Cp4%foQRNt0(((R}9H*mDTXQiKVotyUX zlba*ehCkOk$ImlpDpnvid`W9OZu75%Oz^8(sh9n8-r}fG%G9a;N{IOXMBX~QB>0vn3oQ3Z*}0ZG!UIc1Pa}u3EEh;xOSab=o`4LIApue zi(*m|KfE~CQobJ38`tO~{5%k~T2WDEpJLuUQskR5@J8iwE&t1X?!gl+Yi@ShNTPBI za&)KmA@YEEKrwR;@dS0>|N{EuY)iHXV8UvTR>N);!9M+;9N+DHLEv4PW4RcX8vr2|0_zFwFc zJaX9>r4K&#Sth^hNquodu{%VEd2m#!UG6Y;jiVaNP1Bf(&4H~Ac4AWPxgHlsG5r*~ z)B|s!wPN8@)0;gR46f9*(<^kBUV+pzFG+1NHrT#cSUwL+V-Yosij9mek$WKkP)#A2 z1yQZkBL?kbS6V8)*7fXjU?jYLC=t`4g805CXK-8XP{@Nu`J@|?*G)sJYK9!>PUA}k z6!is{vo%NU8qiBw(rEvZFA-r59Mq-EX1!w!n_!Iq#Zg>}k*W_2-bykzo`B&&n%cyh z{F*jzL+d5fzh@vgd-=r*&#Lim1Fi|o)NW@WRp#LuS!)#Zy&8X8Q*dMsS`XT^rOHqQ z9f>gDp|g|<6f$pUz=W%0umoS%nXz$07u7zR8CSwXSyNbE1l!j4lO%zk1tY2Kq5vYE zs+l5xVJniNvp{H#FpCa`2G~3z%nDXPMWnbzx4=SYC04w+>A3he%GC);sG;mDrdYpf z(7rF?9gKtwoZl#RyEgCx1V1YVGfvc#}bU(~k#fUswOS|!WZ zx8i_(z@`?vtltGO{D5}izECfwkg{&J=#Htz9`DmL861v{@dZMcL70psg?~`siORcF`p7_Mk+EEbou6X5 zlct#*in2KU9;ND+3#SIkZx$Gv0^Vx*>&oKE#FzyGpDFX)nr3cwp4Tn^MyHtsJ`zf2 zV_ngx54Y#xBuP==h;=Zv|K7RKw=X_)La`>a=b1AedtniDQ z1LGATK+}QdDqfEM$`w{O%l~U$*r~A#S<)&rPjc-L?M+cBpCQ0h{b}e(FWivwfEt={ z8xEU3wMFM`VV`Sx=qQ}F$_TCN?eYAN2$3Lf%IPXNExZFXnL6E6CI>!u5>G~FWh;#_RmHiQR%1N-@p?EnA( literal 0 HcmV?d00001 diff --git a/tools/gfx.c b/tools/gfx.c index bfad43c0e..8283d9e73 100644 --- a/tools/gfx.c +++ b/tools/gfx.c @@ -7,7 +7,7 @@ #include "common.h" static void usage(void) { - fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [-w width] [-d depth] [-h] [-o outfile] infile\n"); + fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [-w width] [-d depth] [-h] [-o outfile] infile\n"); } static void error(char *message) { @@ -23,6 +23,9 @@ struct Options { int depth; int interleave; int width; + int remove_duplicates; + int keep_whitespace; + int remove_xflip; }; struct Options Options = { @@ -34,6 +37,9 @@ void get_args(int argc, char *argv[]) { {"remove-whitespace", no_argument, &Options.remove_whitespace, 1}, {"trim-whitespace", no_argument, &Options.trim_whitespace, 1}, {"interleave", no_argument, &Options.interleave, 1}, + {"remove-duplicates", no_argument, &Options.remove_duplicates, 1}, + {"keep-whitespace", no_argument, &Options.keep_whitespace, 1}, + {"remove-xflip", no_argument, &Options.remove_xflip, 1}, {"width", required_argument, 0, 'w'}, {"depth", required_argument, 0, 'd'}, {"help", no_argument, 0, 'h'}, @@ -92,11 +98,15 @@ void trim_whitespace(struct Graphic *graphic) { void remove_whitespace(struct Graphic *graphic) { int tile_size = Options.depth * 8; + if (Options.interleave) tile_size *= 2; int i = 0; for (int j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { while (is_whitespace(&graphic->data[j], tile_size)) { j += tile_size; } + if (j >= graphic->size) { + break; + } if (j > i) { memcpy(&graphic->data[i], &graphic->data[j], tile_size); } @@ -104,6 +114,94 @@ void remove_whitespace(struct Graphic *graphic) { graphic->size = i; } +bool tile_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles) { + for (int i = 0; i < num_tiles; i++) { + bool match = true; + for (int j = 0; j < tile_size; j++) { + if (tile[j] != tiles[i * tile_size + j]) { + match = false; + } + } + if (match) { + return true; + } + } + return false; +} + +void remove_duplicates(struct Graphic *graphic) { + int tile_size = Options.depth * 8; + if (Options.interleave) tile_size *= 2; + int num_tiles = 0; + for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) { + if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) { + break; + } + j += tile_size; + } + if (j >= graphic->size) { + break; + } + if (j > i) { + memcpy(&graphic->data[i], &graphic->data[j], tile_size); + } + num_tiles++; + } + graphic->size = num_tiles * tile_size; +} + +bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) { + uint8_t *flip = calloc(tile_size, 1); + int half_size = tile_size / 2; + for (int i = 0; i < tile_size; i++) { + int byte = i; + if (yflip) { + byte = tile_size - 1 - i; + if (Options.interleave && i < half_size) { + byte = half_size - 1 - i; + } + } + if (flip) { + for (int bit = 0; bit < 8; bit++) { + flip[byte] |= ((tile[i] >> bit) & 1) << (7 - bit); + } + } else { + flip[byte] = tile[i]; + } + } + if (tile_exists(flip, tiles, tile_size, num_tiles)) { + return true; + } + return false; +} + +bool xflip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles) { + return flip_exists(tile, tiles, tile_size, num_tiles, true, false); +} + +void remove_xflip(struct Graphic *graphic) { + int tile_size = Options.depth * 8; + if (Options.interleave) tile_size *= 2; + int num_tiles = 0; + for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (xflip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) { + if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) { + break; + } + j += tile_size; + } + if (j >= graphic->size) { + break; + } + if (j > i) { + memcpy(&graphic->data[i], &graphic->data[j], tile_size); + } + num_tiles++; + } + graphic->size = num_tiles * tile_size; +} + void interleave(struct Graphic *graphic, int width) { int tile_size = Options.depth * 8; int width_tiles = width / 8; @@ -119,6 +217,7 @@ void interleave(struct Graphic *graphic, int width) { } memcpy(&interleaved[tile * tile_size], &graphic->data[i * tile_size], tile_size); } + graphic->size = num_tiles * tile_size; memcpy(graphic->data, interleaved, graphic->size); free(interleaved); } @@ -139,9 +238,6 @@ int main(int argc, char *argv[]) { char *infile = argv[0]; struct Graphic graphic; graphic.data = read_u8(infile, &graphic.size); - if (Options.remove_whitespace) { - remove_whitespace(&graphic); - } if (Options.trim_whitespace) { trim_whitespace(&graphic); } @@ -153,6 +249,15 @@ int main(int argc, char *argv[]) { } interleave(&graphic, Options.width); } + if (Options.remove_duplicates) { + remove_duplicates(&graphic); + } + if (Options.remove_xflip) { + remove_xflip(&graphic); + } + if (Options.remove_whitespace) { + remove_whitespace(&graphic); + } if (Options.outfile) { write_u8(Options.outfile, graphic.data, graphic.size); } From f42e731d766e3f979f5f437d255c159d0dd3c485 Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 23 Jun 2017 20:00:11 -0400 Subject: [PATCH 26/46] pngs in gfx/battle --- gfx/battle/balls.2bpp | Bin 64 -> 0 bytes gfx/battle/balls.png | Bin 0 -> 115 bytes gfx/battle/enemy_hp_bar_border.1bpp | Bin 32 -> 0 bytes gfx/battle/enemy_hp_bar_border.png | Bin 0 -> 111 bytes gfx/battle/expbar.2bpp | Bin 144 -> 0 bytes gfx/battle/expbar.png | Bin 0 -> 120 bytes gfx/battle/expbarend.2bpp | Bin 16 -> 0 bytes gfx/battle/expbarend.png | Bin 0 -> 85 bytes gfx/battle/expbarend_sgb.2bpp | Bin 16 -> 0 bytes gfx/battle/expbarend_sgb.png | Bin 0 -> 85 bytes gfx/battle/hp_exp_bar_border.1bpp | Bin 48 -> 0 bytes gfx/battle/hp_exp_bar_border.png | Bin 0 -> 116 bytes gfx/battle/minimize.2bpp | Bin 16 -> 0 bytes gfx/battle/minimize.png | Bin 0 -> 85 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gfx/battle/balls.2bpp create mode 100644 gfx/battle/balls.png delete mode 100644 gfx/battle/enemy_hp_bar_border.1bpp create mode 100644 gfx/battle/enemy_hp_bar_border.png delete mode 100644 gfx/battle/expbar.2bpp create mode 100644 gfx/battle/expbar.png delete mode 100644 gfx/battle/expbarend.2bpp create mode 100644 gfx/battle/expbarend.png delete mode 100644 gfx/battle/expbarend_sgb.2bpp create mode 100644 gfx/battle/expbarend_sgb.png delete mode 100644 gfx/battle/hp_exp_bar_border.1bpp create mode 100644 gfx/battle/hp_exp_bar_border.png delete mode 100644 gfx/battle/minimize.2bpp create mode 100644 gfx/battle/minimize.png diff --git a/gfx/battle/balls.2bpp b/gfx/battle/balls.2bpp deleted file mode 100644 index 626c4e3e354e5ab7d4d9b083274e8ba4afdf32b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmZQzkdaZc3(R+{uXnUll96Em^6l*E!NATA#CMFfQ?d)S^8{ig$5@~|gA#)y7%BnT E0L%sqy8r+H diff --git a/gfx/battle/balls.png b/gfx/battle/balls.png new file mode 100644 index 0000000000000000000000000000000000000000..21bb5e37250827a941a0ac2a3d2b6e26fab0cab1 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k1SA-~$L+cVq^vw$978H@CI8@O<*EPi|HJ&= zpWEj>O#ZWq($H OO!IX0b6Mw<&;$Tsiz;*g literal 0 HcmV?d00001 diff --git a/gfx/battle/enemy_hp_bar_border.1bpp b/gfx/battle/enemy_hp_bar_border.1bpp deleted file mode 100644 index 629b4770a8033c8a62a3de129fab2eaca62ed3ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 hcmZSh@Z-=#a#?_JCv9A|I!QrndIr} K=d#Wzp$P!aWGNp2 literal 0 HcmV?d00001 diff --git a/gfx/battle/expbar.2bpp b/gfx/battle/expbar.2bpp deleted file mode 100644 index cf869d98ba2661ccd1c9352d4d50eedf471437df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmZQz00Tw_Mh1re{~;V8$qah($ diff --git a/gfx/battle/expbar.png b/gfx/battle/expbar.png new file mode 100644 index 0000000000000000000000000000000000000000..9fa3a21288d26d923b3aa42650a1759aa8d8d556 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^9ze{&1SA+t^ZtbaDSJ;B$B>F!$v^s;{u%uLf4)Jl z=#!r@Sov%;lw`U?fJ!-DG%7W7BW`zJa%MYXn32o TjqR|~8jz8mu6{1-oD!MN=d#Wzp$P!(yc_ZW literal 0 HcmV?d00001 diff --git a/gfx/battle/expbarend_sgb.2bpp b/gfx/battle/expbarend_sgb.2bpp deleted file mode 100644 index dbeb3fdee28f958e19939c465f7d2617d5060f3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 VcmZQzkdRPOaRLGr6$uFj1^^Ju0r>y` diff --git a/gfx/battle/expbarend_sgb.png b/gfx/battle/expbarend_sgb.png new file mode 100644 index 0000000000000000000000000000000000000000..25eed4a6229d97d8ff398eb55f1bc2f3fec05788 GIT binary patch literal 85 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$#}XrhE&{2{_%hQ!+zVt&p-1# iw{I4h!1(0fe}0BVy}Z@W>~GkE)O))6xvXgMf;Pikdomc?J-e1SUbme+HoJzkh#zfH(&}{Q1uS0P+tFHvj+t diff --git a/gfx/battle/hp_exp_bar_border.png b/gfx/battle/hp_exp_bar_border.png new file mode 100644 index 0000000000000000000000000000000000000000..f0f5d31a6b012ef1cb5f9cfbecace2ef231a3d94 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^20+Zg1SA+Pe6Y3xQr4a>jv*Ddl7AeoIq=V3;7{Ve z|MMC3+vSfWCOl&=o{?+UY{8>&j-71-kG;UZ#DC0B3=9lzFdKR(^DrT6#x)Pp hEe`M~+0SS1Vqlm!iF>E4pME1qy{D_6%Q~loCIF%t7{vep literal 0 HcmV?d00001 From 41ae3610f6c601e7803d6bcd049cf690f111f29a Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 00:45:31 -0400 Subject: [PATCH 27/46] pngs in gfx/fx - gave up on wind.png - add --remove-yflip --- Makefile | 18 ++++++++++++ ...ast.2bpp.lz => aeroblast.2bpp.lz.2f07c4ea} | Bin gfx/fx/aeroblast.png | Bin 0 -> 187 bytes ...angels.2bpp.lz => angels.2bpp.lz.b026d81e} | Bin gfx/fx/angels.png | Bin 0 -> 363 bytes .../{beam.2bpp.lz => beam.2bpp.lz.80b6d613} | Bin gfx/fx/beam.png | Bin 0 -> 562 bytes ...bubble.2bpp.lz => bubble.2bpp.lz.03b8ac99} | Bin gfx/fx/bubble.png | Bin 0 -> 237 bytes ...charge.2bpp.lz => charge.2bpp.lz.95d3ea98} | Bin gfx/fx/charge.png | Bin 0 -> 188 bytes gfx/fx/{cut.2bpp.lz => cut.2bpp.lz.03d343ed} | Bin gfx/fx/cut.png | Bin 0 -> 170 bytes gfx/fx/{egg.2bpp.lz => egg.2bpp.lz.41dd1a53} | Bin gfx/fx/egg.png | Bin 0 -> 200 bytes ...ion.2bpp.lz => explosion.2bpp.lz.55fc334f} | Bin gfx/fx/explosion.png | Bin 0 -> 157 bytes .../{fire.2bpp.lz => fire.2bpp.lz.d7701cda} | Bin gfx/fx/fire.png | Bin 0 -> 153 bytes ...flower.2bpp.lz => flower.2bpp.lz.1bc2e9d2} | Bin gfx/fx/flower.png | Bin 0 -> 149 bytes .../{globe.2bpp.lz => globe.2bpp.lz.710dbb8e} | Bin gfx/fx/globe.png | Bin 0 -> 292 bytes .../{haze.2bpp.lz => haze.2bpp.lz.91424607} | Bin gfx/fx/haze.png | Bin 0 -> 173 bytes gfx/fx/{hit.2bpp.lz => hit.2bpp.lz.2b3c83f2} | Bin gfx/fx/hit.png | Bin 0 -> 306 bytes .../{horn.2bpp.lz => horn.2bpp.lz.48908aae} | Bin gfx/fx/horn.png | Bin 0 -> 179 bytes gfx/fx/{ice.2bpp.lz => ice.2bpp.lz.664d900f} | Bin gfx/fx/ice.png | Bin 0 -> 137 bytes ...ing.2bpp.lz => lightning.2bpp.lz.a88fc131} | Bin gfx/fx/lightning.png | Bin 0 -> 820 bytes .../{misc.2bpp.lz => misc.2bpp.lz.4b20c3d7} | Bin gfx/fx/misc.png | Bin 0 -> 1082 bytes .../{noise.2bpp.lz => noise.2bpp.lz.acb4a76e} | Bin gfx/fx/noise.png | Bin 0 -> 526 bytes ...jects.2bpp.lz => objects.2bpp.lz.83f812de} | Bin gfx/fx/objects.png | Bin 0 -> 705 bytes .../{plant.2bpp.lz => plant.2bpp.lz.4a00c417} | Bin gfx/fx/plant.png | Bin 0 -> 293 bytes ...poison.2bpp.lz => poison.2bpp.lz.fc7dc9c1} | Bin gfx/fx/poison.png | Bin 0 -> 166 bytes ...ball.2bpp.lz => pokeball.2bpp.lz.c58f7e01} | Bin gfx/fx/pokeball.png | Bin 0 -> 388 bytes ...powder.2bpp.lz => powder.2bpp.lz.bfd566bb} | Bin gfx/fx/powder.png | Bin 0 -> 100 bytes ...ychic.2bpp.lz => psychic.2bpp.lz.d80f285c} | Bin gfx/fx/psychic.png | Bin 0 -> 175 bytes ...flect.2bpp.lz => reflect.2bpp.lz.9a9c822d} | Bin gfx/fx/reflect.png | Bin 0 -> 211 bytes .../{rocks.2bpp.lz => rocks.2bpp.lz.73d0153e} | Bin gfx/fx/rocks.png | Bin 0 -> 669 bytes .../{rope.2bpp.lz => rope.2bpp.lz.209d63dd} | Bin gfx/fx/rope.png | Bin 0 -> 256 bytes .../{sand.2bpp.lz => sand.2bpp.lz.c87c0eaa} | Bin gfx/fx/sand.png | Bin 0 -> 384 bytes ...shapes.2bpp.lz => shapes.2bpp.lz.262d77f0} | Bin gfx/fx/shapes.png | Bin 0 -> 237 bytes .../{shine.2bpp.lz => shine.2bpp.lz.5fb79056} | Bin gfx/fx/shine.png | Bin 0 -> 273 bytes ...ack.2bpp.lz => skyattack.2bpp.lz.31738ab8} | Bin gfx/fx/skyattack.png | Bin 0 -> 393 bytes .../{smoke.2bpp.lz => smoke.2bpp.lz.aa05905e} | Bin gfx/fx/smoke.png | Bin 0 -> 191 bytes .../{speed.2bpp.lz => speed.2bpp.lz.1732b364} | Bin gfx/fx/speed.png | Bin 0 -> 136 bytes ...status.2bpp.lz => status.2bpp.lz.0c0aa13e} | Bin gfx/fx/status.png | Bin 0 -> 364 bytes .../{water.2bpp.lz => water.2bpp.lz.7b52ed12} | Bin gfx/fx/water.png | Bin 0 -> 277 bytes .../{wave.2bpp.lz => wave.2bpp.lz.bee99402} | Bin gfx/fx/wave.png | Bin 0 -> 205 bytes gfx/fx/{web.2bpp.lz => web.2bpp.lz.80e3d480} | Bin gfx/fx/web.png | Bin 0 -> 191 bytes .../{whip.2bpp.lz => whip.2bpp.lz.d80d8d6e} | Bin gfx/fx/whip.png | Bin 0 -> 210 bytes .../{wind.2bpp.lz => wind.2bpp.lz.5a785180} | Bin gfx/fx/wind.png | Bin 0 -> 286 bytes tools/gfx.c | 26 ++++++++++-------- 80 files changed, 33 insertions(+), 11 deletions(-) rename gfx/fx/{aeroblast.2bpp.lz => aeroblast.2bpp.lz.2f07c4ea} (100%) create mode 100644 gfx/fx/aeroblast.png rename gfx/fx/{angels.2bpp.lz => angels.2bpp.lz.b026d81e} (100%) create mode 100644 gfx/fx/angels.png rename gfx/fx/{beam.2bpp.lz => beam.2bpp.lz.80b6d613} (100%) create mode 100755 gfx/fx/beam.png rename gfx/fx/{bubble.2bpp.lz => bubble.2bpp.lz.03b8ac99} (100%) create mode 100644 gfx/fx/bubble.png rename gfx/fx/{charge.2bpp.lz => charge.2bpp.lz.95d3ea98} (100%) create mode 100644 gfx/fx/charge.png rename gfx/fx/{cut.2bpp.lz => cut.2bpp.lz.03d343ed} (100%) create mode 100644 gfx/fx/cut.png rename gfx/fx/{egg.2bpp.lz => egg.2bpp.lz.41dd1a53} (100%) create mode 100644 gfx/fx/egg.png rename gfx/fx/{explosion.2bpp.lz => explosion.2bpp.lz.55fc334f} (100%) create mode 100644 gfx/fx/explosion.png rename gfx/fx/{fire.2bpp.lz => fire.2bpp.lz.d7701cda} (100%) create mode 100644 gfx/fx/fire.png rename gfx/fx/{flower.2bpp.lz => flower.2bpp.lz.1bc2e9d2} (100%) create mode 100644 gfx/fx/flower.png rename gfx/fx/{globe.2bpp.lz => globe.2bpp.lz.710dbb8e} (100%) create mode 100644 gfx/fx/globe.png rename gfx/fx/{haze.2bpp.lz => haze.2bpp.lz.91424607} (100%) create mode 100644 gfx/fx/haze.png rename gfx/fx/{hit.2bpp.lz => hit.2bpp.lz.2b3c83f2} (100%) create mode 100644 gfx/fx/hit.png rename gfx/fx/{horn.2bpp.lz => horn.2bpp.lz.48908aae} (100%) create mode 100644 gfx/fx/horn.png rename gfx/fx/{ice.2bpp.lz => ice.2bpp.lz.664d900f} (100%) create mode 100644 gfx/fx/ice.png rename gfx/fx/{lightning.2bpp.lz => lightning.2bpp.lz.a88fc131} (100%) create mode 100755 gfx/fx/lightning.png rename gfx/fx/{misc.2bpp.lz => misc.2bpp.lz.4b20c3d7} (100%) create mode 100755 gfx/fx/misc.png rename gfx/fx/{noise.2bpp.lz => noise.2bpp.lz.acb4a76e} (100%) create mode 100755 gfx/fx/noise.png rename gfx/fx/{objects.2bpp.lz => objects.2bpp.lz.83f812de} (100%) create mode 100755 gfx/fx/objects.png rename gfx/fx/{plant.2bpp.lz => plant.2bpp.lz.4a00c417} (100%) create mode 100644 gfx/fx/plant.png rename gfx/fx/{poison.2bpp.lz => poison.2bpp.lz.fc7dc9c1} (100%) create mode 100755 gfx/fx/poison.png rename gfx/fx/{pokeball.2bpp.lz => pokeball.2bpp.lz.c58f7e01} (100%) create mode 100755 gfx/fx/pokeball.png rename gfx/fx/{powder.2bpp.lz => powder.2bpp.lz.bfd566bb} (100%) create mode 100644 gfx/fx/powder.png rename gfx/fx/{psychic.2bpp.lz => psychic.2bpp.lz.d80f285c} (100%) create mode 100644 gfx/fx/psychic.png rename gfx/fx/{reflect.2bpp.lz => reflect.2bpp.lz.9a9c822d} (100%) create mode 100644 gfx/fx/reflect.png rename gfx/fx/{rocks.2bpp.lz => rocks.2bpp.lz.73d0153e} (100%) create mode 100755 gfx/fx/rocks.png rename gfx/fx/{rope.2bpp.lz => rope.2bpp.lz.209d63dd} (100%) create mode 100644 gfx/fx/rope.png rename gfx/fx/{sand.2bpp.lz => sand.2bpp.lz.c87c0eaa} (100%) create mode 100755 gfx/fx/sand.png rename gfx/fx/{shapes.2bpp.lz => shapes.2bpp.lz.262d77f0} (100%) create mode 100644 gfx/fx/shapes.png rename gfx/fx/{shine.2bpp.lz => shine.2bpp.lz.5fb79056} (100%) create mode 100644 gfx/fx/shine.png rename gfx/fx/{skyattack.2bpp.lz => skyattack.2bpp.lz.31738ab8} (100%) create mode 100644 gfx/fx/skyattack.png rename gfx/fx/{smoke.2bpp.lz => smoke.2bpp.lz.aa05905e} (100%) create mode 100644 gfx/fx/smoke.png rename gfx/fx/{speed.2bpp.lz => speed.2bpp.lz.1732b364} (100%) create mode 100644 gfx/fx/speed.png rename gfx/fx/{status.2bpp.lz => status.2bpp.lz.0c0aa13e} (100%) create mode 100644 gfx/fx/status.png rename gfx/fx/{water.2bpp.lz => water.2bpp.lz.7b52ed12} (100%) create mode 100644 gfx/fx/water.png rename gfx/fx/{wave.2bpp.lz => wave.2bpp.lz.bee99402} (100%) create mode 100644 gfx/fx/wave.png rename gfx/fx/{web.2bpp.lz => web.2bpp.lz.80e3d480} (100%) create mode 100644 gfx/fx/web.png rename gfx/fx/{whip.2bpp.lz => whip.2bpp.lz.d80d8d6e} (100%) create mode 100644 gfx/fx/whip.png rename gfx/fx/{wind.2bpp.lz => wind.2bpp.lz.5a785180} (100%) create mode 100644 gfx/fx/wind.png diff --git a/Makefile b/Makefile index ed74afe5c..b60672e35 100644 --- a/Makefile +++ b/Makefile @@ -135,6 +135,24 @@ gfx/slots_3.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --kee gfx/slots_3a.2bpp: tools/gfx += --interleave --width=16 gfx/slots_3b.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip +gfx/fx/angels.2bpp: tools/gfx += --trim-whitespace +gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace +gfx/fx/bubble.2bpp: tools/gfx += --trim-whitespace +gfx/fx/charge.2bpp: tools/gfx += --trim-whitespace +gfx/fx/egg.2bpp: tools/gfx += --remove-whitespace +gfx/fx/explosion.2bpp: tools/gfx += --remove-whitespace +gfx/fx/hit.2bpp: tools/gfx += --remove-whitespace +gfx/fx/horn.2bpp: tools/gfx += --remove-whitespace +gfx/fx/lightning.2bpp: tools/gfx += --remove-whitespace +gfx/fx/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/fx/noise.2bpp: tools/gfx += --remove-whitespace +gfx/fx/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip +gfx/fx/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace +gfx/fx/reflect.2bpp: tools/gfx += --remove-whitespace +gfx/fx/rocks.2bpp: tools/gfx += --remove-whitespace +gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace +gfx/fx/status.2bpp: tools/gfx += --remove-whitespace + %.bin: ; %.blk: ; diff --git a/gfx/fx/aeroblast.2bpp.lz b/gfx/fx/aeroblast.2bpp.lz.2f07c4ea similarity index 100% rename from gfx/fx/aeroblast.2bpp.lz rename to gfx/fx/aeroblast.2bpp.lz.2f07c4ea diff --git a/gfx/fx/aeroblast.png b/gfx/fx/aeroblast.png new file mode 100644 index 0000000000000000000000000000000000000000..1fdc07c2ff0e8f8557993f5af53cb50e92501030 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^5F!t>-oh9yZ`{4t#IV z6`IlV#yP)%sl(&ONzLgoH~#STx3_4@2Dz{b7ON^B^ICKH;Hk%aTA%&Gj(vBz?>+bfpVx06*1a`({T$n4 g7f*6!zIbcP$m(Q2>#FPaRFJDYUHx3vIVCg!02S#^K>z>% literal 0 HcmV?d00001 diff --git a/gfx/fx/angels.2bpp.lz b/gfx/fx/angels.2bpp.lz.b026d81e similarity index 100% rename from gfx/fx/angels.2bpp.lz rename to gfx/fx/angels.2bpp.lz.b026d81e diff --git a/gfx/fx/angels.png b/gfx/fx/angels.png new file mode 100644 index 0000000000000000000000000000000000000000..ef38c61d296f727264c7f84792f0e352ab716044 GIT binary patch literal 363 zcmV-x0hIoUP)1vy3IROJW9O6ZG zK33)+r;gZ@c0VL%3Q}<6b!J`!aScobZf0^NcaviDccaHU4 zTNr%BLQBJ~;#g7*m5<^vmJ_?*kvjo8m@ZQ4UFmQ#Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0mn&1K~z{r-IjrF z!Y~X(+lgOPZlT$+dh#aRPDldtx@b0&_Sy^ja)=ktklq`+Kgpq(P9^0`4KVP{AL zFu7_Z5quOyOKci_0ze9hB}$@*>^yMeP4A&a&pj5G@!rB23|0|P4A6e^ZMfOG(xT@O z_kB>|50rAdUgoj^5-p!<5_v*A>a>9srVSz?2@O`lFoLX*W!(*`LIRZ-RE0f)W5QrS zR>E$8H;jxLSs_!`e;cbp(vw&fl4%QBA?XHHA(`HZSt03lP!*D8Gp+bf@5IOB(MB=e zoOA@y0)s&`iT979ldEPhKtpL0jPYTkdGu~1+C+D#w>ppr>?#(XJke!DQfteumqP8k$8>gh?dY^pXLgku^yhM3f835*i?6FR7Mk3luT? zt0V0OR>-oA3W!X9G_yi7{mIG-Nspi^{9)U^0idedvcuF+WdHyG07*qoM6N<$f`S<7 AkpKVy literal 0 HcmV?d00001 diff --git a/gfx/fx/bubble.2bpp.lz b/gfx/fx/bubble.2bpp.lz.03b8ac99 similarity index 100% rename from gfx/fx/bubble.2bpp.lz rename to gfx/fx/bubble.2bpp.lz.03b8ac99 diff --git a/gfx/fx/bubble.png b/gfx/fx/bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..b6febb0a8ba6be73ee396c958e874051fe3dcea6 GIT binary patch literal 237 zcmVyW+x#WApSd|AVx00000NkvXXu0mjfwZC71 literal 0 HcmV?d00001 diff --git a/gfx/fx/charge.2bpp.lz b/gfx/fx/charge.2bpp.lz.95d3ea98 similarity index 100% rename from gfx/fx/charge.2bpp.lz rename to gfx/fx/charge.2bpp.lz.95d3ea98 diff --git a/gfx/fx/charge.png b/gfx/fx/charge.png new file mode 100644 index 0000000000000000000000000000000000000000..90cb72f9fb85193cefc022ed4a067642c80144f1 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<61SA+{FxuV$Qq7(&jv*DdY|m`uZ4TgJxsbhL z<${JpiAIl!8WM_{5^5V*M0y;84yf>axEmewr*}c+rI+W}B!dDbv;W9uGmv)A*ex@` zoO5Pxsi9fBo1A8zP1Qr;I^MI7a!)suCMC6+ZM!@@)}wurk@Av{pM$lZ?7gD#{cZ81 mi`?@kh({e={F!t|vC~9x@Pcd#G;M z!0pyxyNT(n>AK7vsu7J^y1YS8qSah?nfNqXzgFKkVZy#gFB>df(G?yI=g_&Mz_Z T^$d=G0CI$cozt4!0Ft z>@Tpcek1u$K8nHQ6~Fxz8v!P(B2oLp^?EasHrxv?VA?NkSHjSF{+Pp~Gm;909-S8T w3aot69%fQ*H9X9M3pI|&TYQ`^x{f!Eiy=n*UA28taWu$@p00i_>zopr06G>yfB*mh literal 0 HcmV?d00001 diff --git a/gfx/fx/explosion.2bpp.lz b/gfx/fx/explosion.2bpp.lz.55fc334f similarity index 100% rename from gfx/fx/explosion.2bpp.lz rename to gfx/fx/explosion.2bpp.lz.55fc334f diff --git a/gfx/fx/explosion.png b/gfx/fx/explosion.png new file mode 100644 index 0000000000000000000000000000000000000000..0af9f1a0d98cf10396c24c3de4e014e7842400aa GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<61SA+{FxuV$QYoG;jv*Dda?c&)JfI-pa`9sV z_scUfItNR{_%#peW^xOtZDwzEV3F@Wk?yE$sA#i+cb@^erFZH5po6&sJsZGz@F!sizIO8Vm$nF4muP z;px~bzTt~VQl{!W4X&n&u8gf~ZYHSj$$Pe#`BH&Zj9_=jW2cLP-BVaq7W`7qa9TX^ z&ad~G>F13X$48>9QdY~J>jF@M4|1f7ljsTRYb)U6#q8=_u^e*q{ydb xF3XfsGOqs7ambgrwz~RGb)Pz~n?zbJlik;%tjmepTpobz^K|udS?83{1OP3|H)j9< literal 0 HcmV?d00001 diff --git a/gfx/fx/globe.2bpp.lz b/gfx/fx/globe.2bpp.lz.710dbb8e similarity index 100% rename from gfx/fx/globe.2bpp.lz rename to gfx/fx/globe.2bpp.lz.710dbb8e diff --git a/gfx/fx/globe.png b/gfx/fx/globe.png new file mode 100644 index 0000000000000000000000000000000000000000..8d3a35683064c2dc56153f83435739d670c41e6c GIT binary patch literal 292 zcmV+<0o(qGP)){#pXQ{6bWJLGv`)x3k5r!S|9)R$+) z*y{muKTd&5ye*to*(bbDU0`Qd==Hhr%?w{-GWaILZ;JD-#A&L~ZAwIKrO8@#J8bVq%m#?Y==ldEv6Isq{NcC&0000FS$kcwNWJqLLYDDW_E7G^fE z;1}ySqW18haLenqkX2FjNpp+D3^bV!tzOle`eaH+%F5-QT^w>od=EZnbx(RNr!STI zgHJ&0pY`|hf3KF#OG=xYdM&6UW%hFKPM|9O2cO@~zLb7pk>L-Lrnkx literal 0 HcmV?d00001 diff --git a/gfx/fx/hit.2bpp.lz b/gfx/fx/hit.2bpp.lz.2b3c83f2 similarity index 100% rename from gfx/fx/hit.2bpp.lz rename to gfx/fx/hit.2bpp.lz.2b3c83f2 diff --git a/gfx/fx/hit.png b/gfx/fx/hit.png new file mode 100644 index 0000000000000000000000000000000000000000..228066331ce55746666b48a73311bf59ae1ba52f GIT binary patch literal 306 zcmV-20nPr2P)ZrE5CzaLs)$^I64{0C!wt+OSW)=`QOeMTY(txlTcmIkO61-MA+0C>L%@j=Y4x;& zhChRVnFXv22!(jIGwfL8u>8rx&VFV1&HOAUS5Gp*q=F1D3!yl_GLP6Xe_NXGc|qle zUduP;GTi%u89v2zAVWriUl~Lud`ldKqr`bp{)^WP7vb>-mB$_zhX&^27B(`^deU@c zFXD{+2Cxt>L1-RHEDH#V96m^J{?k0@M)~jq}+DN&o-=07*qoM6N<$ Ef?|b;`v3p{ literal 0 HcmV?d00001 diff --git a/gfx/fx/horn.2bpp.lz b/gfx/fx/horn.2bpp.lz.48908aae similarity index 100% rename from gfx/fx/horn.2bpp.lz rename to gfx/fx/horn.2bpp.lz.48908aae diff --git a/gfx/fx/horn.png b/gfx/fx/horn.png new file mode 100644 index 0000000000000000000000000000000000000000..56e8ca2418239558d8f3f21a537720eb303655da GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^5+KY3BpCYFRJ8)BDo+>3kcwNnr#1>U8wj{u^e!yQ z-NDV8)xePS+~nZ_T?bA%w^xTPb7ye$Z)7@qpsMskbM?V_3rswBzTUbaGycQP$()X? zt55Hp?E5{!dEbor^WGE&c$`{TI3eErio(XPDy?ChX?{=6b}ng8z>% literal 0 HcmV?d00001 diff --git a/gfx/fx/ice.2bpp.lz b/gfx/fx/ice.2bpp.lz.664d900f similarity index 100% rename from gfx/fx/ice.2bpp.lz rename to gfx/fx/ice.2bpp.lz.664d900f diff --git a/gfx/fx/ice.png b/gfx/fx/ice.png new file mode 100644 index 0000000000000000000000000000000000000000..62a67641e82891b3133ddeb572818c8ed442380a GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq1SA-o|JIlRsQ^zG$B>F!$v=|Me|Twg_~m(? zs(Ohv{~J!q@>JzZY$-R$Slgg<(VoZM-nho*JVVHz|MnaUUp8qUTl(orI@?-%o<-Uc keR^p>ZtzcS^;YC$Vz`s$lPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0?A24K~!i%?U`GS zn?MjnjrV9T(zD13hxnqRsOtAmq#Ox>q5IyhN5d%Des>-L@Av!hdcBV8pP!${=kqzP zdwG7(7gmYG&0wWC+zb#z7%;+chGGOO2x}mgr)YKl;b>Fkd9^q^wQ4KAl5H10H=0bq z8qGv=*~vatV#X|dRmcb;vmTSMO%ad?f-`j~?gL>Ppf^QT1H=_YuQ;RzcGJO#I20pL z?lHp97QdDBgCl$-y{T#{G7Q&&2r~AS|L%gvd6d*(g*b#M@_C=3X&;Pqj|dGYq*@ea zOq#oBl=N+?8rVq0(tUuDJ$gxZvd_7Vs3(H1SH;LqE~aQ!98!Z7;t(3F5{J+LL4;S( z)TX|pdMI|0PZjj0>taw^>1a)E1`_fhJYsT7QIr;IIu(J4Ohj)Ds%>gl-zyHyT?D=9 zf$Bc+De5JSV8!a8xyU2pP)!kxio?JEvP%tCMbT7)8Bzn^rlSqRm z5QGM{gZ{Vat&9AsZ8w$LHXCzBz<@~HqA`A4gvLCx306E>xt-_d+uuiubR!eeeSZ!7 zwt}7`MRrm&*xs|k5!|=W!Y&#$u?rQ|HqBOQMeG=B&av$q>e8l}U@Jbl^skCl3>nyW zQ|)crWguan^O8yPyGS1)iQ6KVXf_ZCYt@`FEWOT~47P3iUi}4Oe=nnGfJjLQquR&l zEV3WSWTD)1&)&CWy>dig3#eli=YLRuR#*$$!~AT{Sp$UWjM~PDP}GshrO4ST6jhf0 z>^__ZrB&3xfFqj!)P^aoqJ_-lh`{HaK|1qHziVi**5pzH;9;wvrMM5kr)tEARWk>T zGb`+5&pzn#kK+t09h#%@mRpM8bl=%0+#=EQeSVr6QT*U2WKi*J3YCg5HDAIA1cM_% yOGzA>KACDckcf{i5{IFWzL0Sy4pRno9*;l2LvC3e@O&Hq0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1J6lBK~!i%?V5{j zDlrU1p}M~a9|<4XyJIntS1G;3wg|GGbYg8gF^GD$Xd}|)pkiWq&MY7~OwDHG5ipRbM-N0H z5ukCkM@t)mUY;wIXCdOb2KW1YsRaKXW%m&I!2PTwm_Mv1f%jWNzqf{IDQzFR0UBju zX(xXZXk<;w21FZC3=VJSX21&Ic}DdzjobqS_qtJ5FS}7!67F{^Ce!nv$_p4^92k#= z;{&sLyb$oxE)q>t{|-rfl)HHYgTvdo{O$}~?pJ6!r!mNkHIS#JbyQ?k`6(CwF^N68oaq=rKK~N zi9M5MP!+QzVo(*?61+eJ)y7fz4mo&~Wf4o#48W=wbOvBW3F zP=L=w8N-JxfF3n8@rK(B7;eU)uYJJFg&0(Nk64NT*eJe^^bXq3!gji3>NV#&kIe=gFI-JCh z!N&j`Hb~C{9&gzua}6l8ct*nzAZA0J)&S2u<7Q9^mv!1m45E-TsA&;oJzI3!^EO6z z7C3ei{V>-ItY8KW4@ZD=P5!6Cf@j-U<%;UTFpU+4Xk AH~;_u literal 0 HcmV?d00001 diff --git a/gfx/fx/noise.2bpp.lz b/gfx/fx/noise.2bpp.lz.acb4a76e similarity index 100% rename from gfx/fx/noise.2bpp.lz rename to gfx/fx/noise.2bpp.lz.acb4a76e diff --git a/gfx/fx/noise.png b/gfx/fx/noise.png new file mode 100755 index 0000000000000000000000000000000000000000..17540a5e8a24dbe52a3ffa07082b9e374be21223 GIT binary patch literal 526 zcmV+p0`dKcP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0i#JoK~z{r?Us#h zgD?z)VebeJ$xCiKR7Z}n^M@U=uAfwurQnOtmv-y-FH0a_ulFkJx~5kTW(TE0Jx!+$ z_ztb&BW@;v(!=;{q&UbdqMgfPvZEfc%M3Jo_$~OnM?g&x3h>t*nqxZ3a|GbMHlG?v zpj2R_FmVdpDNv)yBA%q)RHbu3UEGbOj?;0Xot{Rvkq)AMVH+a(C=NAAIe+qil$ii QNdN!<07*qoM6N<$f{lRNP5=M^ literal 0 HcmV?d00001 diff --git a/gfx/fx/objects.2bpp.lz b/gfx/fx/objects.2bpp.lz.83f812de similarity index 100% rename from gfx/fx/objects.2bpp.lz rename to gfx/fx/objects.2bpp.lz.83f812de diff --git a/gfx/fx/objects.png b/gfx/fx/objects.png new file mode 100755 index 0000000000000000000000000000000000000000..91ea435b8096a749a934fe1d2ec613d5d260233d GIT binary patch literal 705 zcmV;y0zUnTP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0#->xK~z{r<(CVN z!Y~X(3)(BfA>oj0$1suO*iOtxLc33@+9sKa<9rH-+s@{2KA#^?+jhNPx1iZ}eB3)A zKAlc-0o)IVgIpHZfS_k`xm@J3M#B(L$(}W~j6>`qfEc~l#*rAb2q?~=kcJrI4<0hH z?#&w-vT@U5EdZW~WoRn~^7gvu#FM&OA-v_gj?%@b#IN7{-Qk?2uN1kZ}WbTbi842~#_5=0^~kRfCynHaQL@Jwc6 zVQaUm;wHPO;0d62Yn%Gz0XCt4do)*lD<`Cc_Y_CTz9)!u;|X|K>7>!f0ueq2}hvULD319nzGRNfir z1}o2?CDC)w;Hv$?Bvxq#dMD1%ZMz6oOl+HB2$_jj=jOm`7#W92)PgLkzqlK#qy{+V zW?!e!077IRS7!2=A+UFnMIr0JRz?fQ9y(Y;%^(s*zzha51UyuZG>SpDlsS~y5R{}( zqOORrZQeVLHkk-n=f<5*sd$_f$VlcF*h(Xt?Dh93PGh!gE npB01dyRbjXy~2y*Gba^pPd&JMB8;nLL|QEwX;U$V zO|^!!m;SD|{n`(uuX*;v(90Z${=mqK+L!E_2s@b)Z1mVP79ReRosUxGKYhm-EFiN+ rZ#w@|JU~k2=vCB5G0is00000NkvXXu0mjfB1SA-i^n9KLq;fr7978H@rS@FpJZ!+j%Kv9_ ze^dBNwz$|UB3>s9q#PF5nPz6JuxPm#X_U!gF~fNAF3o!r=1ZHMaH}dkYkYEr#CI#f zU03&M3CSP5Ray3?Iq4be`#n)_|Iczyez?N;-La^d_4Rg~ymuu7YxdVN-+blsA@^NR P9moNmu6{1-oD!M-t literal 0 HcmV?d00001 diff --git a/gfx/fx/pokeball.2bpp.lz b/gfx/fx/pokeball.2bpp.lz.c58f7e01 similarity index 100% rename from gfx/fx/pokeball.2bpp.lz rename to gfx/fx/pokeball.2bpp.lz.c58f7e01 diff --git a/gfx/fx/pokeball.png b/gfx/fx/pokeball.png new file mode 100755 index 0000000000000000000000000000000000000000..47edf2190a2e63e7d2ac4364ea89052a8209890f GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoR!3HG1@Kjg74#{#cd|z zk)RWXM;Vecg~FNl?rQH*Dw7s$6nA}FJ?)Uq`P-+(E}Kl%e86hAWkQm`{mvYfxqOR* zFMBgPDJS`C=B?^{+iZN~J<|(ag%dm)SKembWqn}K5W!{n?H!XqFwnT;OQlzC^Vr@f zx-gqTuwLw@-WENPTJeS(eksad@3ATvE0`#mDz03%fb~{DkjsISyFOj3)W}k3m8pKN zm?!?_m7Gym^{)e6OTtd9vs0M5(j4eFw<4Dd+H6I6)0p@smM_V^-z{Rp{NbOy#?F}L g>klfM6MryGkY@aN@_Bj%Fyt6KUHx3vIVCg!07D^|g#Z8m literal 0 HcmV?d00001 diff --git a/gfx/fx/powder.2bpp.lz b/gfx/fx/powder.2bpp.lz.bfd566bb similarity index 100% rename from gfx/fx/powder.2bpp.lz rename to gfx/fx/powder.2bpp.lz.bfd566bb diff --git a/gfx/fx/powder.png b/gfx/fx/powder.png new file mode 100644 index 0000000000000000000000000000000000000000..b2cb4d459cc037f33190fec7599cf5feb04d3064 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3wx^3@NX4yWi~sW-e;ObDDa`ZV w-uTb|^BymfusAuV9W@z{=Es%P33O7ifr>mdKI;Vst0O$A}7ytkO literal 0 HcmV?d00001 diff --git a/gfx/fx/psychic.2bpp.lz b/gfx/fx/psychic.2bpp.lz.d80f285c similarity index 100% rename from gfx/fx/psychic.2bpp.lz rename to gfx/fx/psychic.2bpp.lz.d80f285c diff --git a/gfx/fx/psychic.png b/gfx/fx/psychic.png new file mode 100644 index 0000000000000000000000000000000000000000..a6d22db2ff0192ba112f442d9a442d8e84767c1b GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^96+4G1SA+1D|}l6q{=*9978H@<(}Kf+n^xO`Y=4$ zx?yRevbuub!rs>4jI$a%35Uemn!JjfS{f2QnajlMu@@-`1Ap@?!rO XKOR`&X)Vdc0&SqPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0y0TNK~z{r&6W#t z!ypVqlio2oWOB%sN3&Fx#mA}K>6_7rV60t;!M=VLE&1`yUvd*WoSXRktAfu88uCO&4%9_36ERH^%{ zXTn4O{eG|Qj4fIX*qM#QLE``;zctYefEQK2u;P$mV0R8kRI6aaif6(KFpX&@iisMu zGpJP}v6%^S2CYgYHZqaLrjm+VF)K=B6TXh4LnauOLNnk+&l2=h1BjQUesz7rw)+bc z^<5Bwp{(#8J<3+Q=|Ja7F z_7d4f4;et5ht;C5BY4Nm)PS9_7x%nlCNywFw8!d0yfY9j^HFq;tgOgp8~#SzA7W%` z(I(qfwKM|~$F+*BVnusdCcKeqK;jxmCRVT_D<)(_v=#6J$@V{tu=lKHU$YtT12I9H z8zLi7@mVHzunT}@5p6FbpLKmSW|X<#hS(UG6g z^@*OS&mQ_i_zQq$8MMoa-t}3wL7zhWv3;Od4>V&>txzM?pCV#U40000@wjD?@TH=*Vo;WA2MyB$e^`+K~rwNz3&5 zBa$X)Z)j<_ooRUSuJx0`OfI9y>q?n>Gt4$fS?)RI%NADlVXwXLCZYTzS*$uYg(p3; z{c%{+K}9;#@XnFRjFVdQ&MBb@0FVZeqyPW_ literal 0 HcmV?d00001 diff --git a/gfx/fx/shapes.2bpp.lz b/gfx/fx/shapes.2bpp.lz.262d77f0 similarity index 100% rename from gfx/fx/shapes.2bpp.lz rename to gfx/fx/shapes.2bpp.lz.262d77f0 diff --git a/gfx/fx/shapes.png b/gfx/fx/shapes.png new file mode 100644 index 0000000000000000000000000000000000000000..b99fc601a091bd8d183b4ce185c622c6211b0587 GIT binary patch literal 237 zcmVST5QSluJdoU^CquB$bKwy@g);;_O(aO}-Wf}zauM8o65{*|ZusyFl}+?K?xgj0 zNs2y&XOV8<>}|+~0Lgj)U->`R|M>AjHI8>9E&J!CRx&duq>E(@`TI?#Hr$X)<@Goo*kJwsZ0dI`DxnU=;7K#lq-l00000NkvXXu0mjf&F^VO literal 0 HcmV?d00001 diff --git a/gfx/fx/shine.2bpp.lz b/gfx/fx/shine.2bpp.lz.5fb79056 similarity index 100% rename from gfx/fx/shine.2bpp.lz rename to gfx/fx/shine.2bpp.lz.5fb79056 diff --git a/gfx/fx/shine.png b/gfx/fx/shine.png new file mode 100644 index 0000000000000000000000000000000000000000..1b7e9834b34985e227bc2809c8f31c217dab5cfe GIT binary patch literal 273 zcmV+s0q*{ZP)@gxik23*2hl&Cd|*V;c7K?W{hZq;%GA5WYc9^`^``%Xb;f0#PzPF2W_Ru3? zR;V<}>`XItIn>NlGf*GV7#vF{xR6aCk!Cs+lEIml0`@k#@AzvKtKOrJ7r4;#gVcHh X{N*DMkVqkW00000NkvXXu0mjfZe4Pf literal 0 HcmV?d00001 diff --git a/gfx/fx/skyattack.2bpp.lz b/gfx/fx/skyattack.2bpp.lz.31738ab8 similarity index 100% rename from gfx/fx/skyattack.2bpp.lz rename to gfx/fx/skyattack.2bpp.lz.31738ab8 diff --git a/gfx/fx/skyattack.png b/gfx/fx/skyattack.png new file mode 100644 index 0000000000000000000000000000000000000000..e731c691c49ce5cff853cd95c2d6237bd14fd478 GIT binary patch literal 393 zcmV;40e1e0P)l>yzWg zj#KoN2fxG^DhOJm0%3)M99m!mutKx69%V{^7buQYLo6_2NV-NYF_|a5AdQF#1*|#H zl1@m9r)U=Wg7zw#4-1Yh%@DYGKAAPRpr^Y=XGT23v`cXt(UPSicQh+g?K?mVMmM4D z$d+q)Muu2n#6tx)FYuZQ#Ql{wEuY(fx;a$v4cHsXd>FprXb^eAPvpp6rwNfQ9^d!r z({V(__V(ZnF_K|ItQmK&sUZPD^Mv@(d?9yf$9-yuw~>#jYj$|HD@PCLGxlN~R-X{{ zN<2j%Y0syjqC8TDG17Uw9jS<>0Si+Y(K9Dh>Oygkj!k1@6HByEmYpnaoHiu7x`s@{ nev0v~VlP}l4S)R!{15&BWPdZXe7b$600000NkvXXu0mjfwWy;4 literal 0 HcmV?d00001 diff --git a/gfx/fx/smoke.2bpp.lz b/gfx/fx/smoke.2bpp.lz.aa05905e similarity index 100% rename from gfx/fx/smoke.2bpp.lz rename to gfx/fx/smoke.2bpp.lz.aa05905e diff --git a/gfx/fx/smoke.png b/gfx/fx/smoke.png new file mode 100644 index 0000000000000000000000000000000000000000..1b09874ba99822aaa76dea46c2fa31ff9ddb42ef GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ1SA;BTlQ)JsWwj+$B>F!rRO*D9#P<74bab2 zjD7s7YXeKLfm6|;-xECE2(H_-0-~mWuhp>dYq5v!%)0u2#r5l+%NyGM{I8Suh;0uDKX_&P`i}{(-UkVkzJ9Nz j@YVcvz1ReNlVMn!3Tiepg=s`zkN67b&ow3}(m&lL`;%{IWwMDABmIMDDT*xk%MTYnRQs zwrCKoHXE9b$3$N33pC~TONW@oLX^Z2e4>ESPlMHY62cR0&D3+oT6L|_j=JSAZ7@LM z1B`7AK4LXF{*tX?sTivBBe8uyMDgrTVX1AyaEMOgK1rYMY#*nk+;Sp+b4T6y&0>51 zY`bclV>gH4Qe?`daQk7kp!nii_r|l8$O4&&J3~B+XhjU~K==WXfnK)+xZK@Lg}(3F8qXk#W)x!UF*hGQc&VEnJLww3x&huLT=83 zhX@m=uFh^rRJ3x?D={^9+CH} bBmd1ejpp(Asq5Tm00000NkvXXu0mjf%^rX3 literal 0 HcmV?d00001 diff --git a/gfx/fx/wave.2bpp.lz b/gfx/fx/wave.2bpp.lz.bee99402 similarity index 100% rename from gfx/fx/wave.2bpp.lz rename to gfx/fx/wave.2bpp.lz.bee99402 diff --git a/gfx/fx/wave.png b/gfx/fx/wave.png new file mode 100644 index 0000000000000000000000000000000000000000..55d4faa5f274bc662b2bdc1a00abb5f1744daa79 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^50n(~qCNAaRzqu-d4)}jo6f$>I5_7;=aYQ%Su5CEV|wB< z8l5@zYQ{8dzczE3!L}Tenr^FY*Vei0@rrl!iTNS>>|O|Sb5o<00N<~cjd?77${L9s zn@-t<3jJYb&9<#{ohSJEWNBqy+G@vnKkd$cj@Um>o?-v#+DQizn?UaLboFyt=akR{ E05OJ8o&W#< literal 0 HcmV?d00001 diff --git a/gfx/fx/web.2bpp.lz b/gfx/fx/web.2bpp.lz.80e3d480 similarity index 100% rename from gfx/fx/web.2bpp.lz rename to gfx/fx/web.2bpp.lz.80e3d480 diff --git a/gfx/fx/web.png b/gfx/fx/web.png new file mode 100644 index 0000000000000000000000000000000000000000..2aeffef0ef5fbfe784f76d3adb15f30122cf2c7c GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoR1SA+{U$=J$Qf;0tjv*DddixdmoE&*vo==ii zad%Mk>~C7uWP51dqto->Uk~}KFe^7xTtz@DPHpD0xsAsY0vv+h9&ad5^LflI;jP*7 z>*CY4z!L}U`Tlg@jy@ZblwPrw_nOJ1s#2LtORpErKCisPQ^VKeP33LwGuL%03a>nD p`Pac!WZI}Bb;D2U1?NunFPsNYo&Eh^ZvijJWuC5nF6*2UngBK>OuPU9 literal 0 HcmV?d00001 diff --git a/gfx/fx/whip.2bpp.lz b/gfx/fx/whip.2bpp.lz.d80d8d6e similarity index 100% rename from gfx/fx/whip.2bpp.lz rename to gfx/fx/whip.2bpp.lz.d80d8d6e diff --git a/gfx/fx/whip.png b/gfx/fx/whip.png new file mode 100644 index 0000000000000000000000000000000000000000..92d7ded6fd25557a10af0128b3dca862b5a9810b GIT binary patch literal 210 zcmV;@04@KCP)EoPxs2ehWQ?LcoU2_m2t9%k2Ew$$(Qq zkdqhDtyNGjI#JM4W6CUeUB!G`d9|7=^)0W7ka-)Z5JaCqK)_)f62c{xk@#pr#HJiz0}eof> bit) & 1) << (7 - bit); } @@ -176,16 +178,12 @@ bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bo return false; } -bool xflip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles) { - return flip_exists(tile, tiles, tile_size, num_tiles, true, false); -} - -void remove_xflip(struct Graphic *graphic) { +void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) { int tile_size = Options.depth * 8; if (Options.interleave) tile_size *= 2; int num_tiles = 0; for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { - while (xflip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) { + while (flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) { if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) { break; } @@ -253,7 +251,13 @@ int main(int argc, char *argv[]) { remove_duplicates(&graphic); } if (Options.remove_xflip) { - remove_xflip(&graphic); + remove_flip(&graphic, true, false); + } + if (Options.remove_yflip) { + remove_flip(&graphic, false, true); + } + if (Options.remove_xflip && Options.remove_yflip) { + remove_flip(&graphic, true, true); } if (Options.remove_whitespace) { remove_whitespace(&graphic); From 65809032bf93affdb3c18015cf58fb91e9b4b32c Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 00:49:37 -0400 Subject: [PATCH 28/46] forgot to remove 2bpp from gfx/intro --- gfx/intro/gender_screen.2bpp | Bin 16 -> 0 bytes gfx/intro/grass1.2bpp | Bin 64 -> 0 bytes gfx/intro/grass2.2bpp | Bin 64 -> 0 bytes gfx/intro/grass3.2bpp | Bin 64 -> 0 bytes gfx/intro/grass4.2bpp | Bin 16 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gfx/intro/gender_screen.2bpp delete mode 100644 gfx/intro/grass1.2bpp delete mode 100644 gfx/intro/grass2.2bpp delete mode 100644 gfx/intro/grass3.2bpp delete mode 100644 gfx/intro/grass4.2bpp diff --git a/gfx/intro/gender_screen.2bpp b/gfx/intro/gender_screen.2bpp deleted file mode 100644 index 5cc990f1d28728a6825e75d8ef840aa43415e1e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 Mcmey*@E-*N07u9N`2YX_ diff --git a/gfx/intro/grass1.2bpp b/gfx/intro/grass1.2bpp deleted file mode 100644 index 7e371f23e0afdf263a95295cea8950476c85bcf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmV-G0KfkL01yx$FbO$beOrHr@3Z#-0TB@b6CpDdH$i6tZnFQP_etMH-zC4QzwZBk W|NsAx-2`1^|0KVvzwiIQzyJRViyx~1 diff --git a/gfx/intro/grass2.2bpp b/gfx/intro/grass2.2bpp deleted file mode 100644 index 3068eb080eafc569c4c03782d2329226181ab9c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmZQzU|?`@={VzbF8qGj{e`=MTm}{v1{Mz=SKkXa58Mv?t@2*!z0mzt|KI(u|NsBL T$GfI=oBmG%^4|k_|NjF3cg-WX diff --git a/gfx/intro/grass3.2bpp b/gfx/intro/grass3.2bpp deleted file mode 100644 index 47f3330d8ad09223318c02ed7a03d5b7d2557499..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmZQzU|>*Ea!FH6U;W Date: Sat, 24 Jun 2017 00:50:33 -0400 Subject: [PATCH 29/46] forgot to remove 2bpp from gfx/tilesets --- gfx/tilesets/water.2bpp | Bin 64 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gfx/tilesets/water.2bpp diff --git a/gfx/tilesets/water.2bpp b/gfx/tilesets/water.2bpp deleted file mode 100644 index a6e9f6ac9984edbb86a7b6a32ad6ce51b69ae31a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 ncmZSh$MBosKM=kL;`=~c&+r}02a)^17$ox_tg0SJqsapRvOXO+ From 89cb46a64d96a7c92dda62e1572b6a8e5d09ba37 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 00:53:38 -0400 Subject: [PATCH 30/46] pngs in gfx/mobile --- gfx/mobile/havewant.2bpp | Bin 2304 -> 0 bytes gfx/mobile/havewant.png | Bin 0 -> 957 bytes gfx/mobile/hp.1bpp | Bin 8 -> 0 bytes gfx/mobile/hp.png | Bin 0 -> 84 bytes gfx/mobile/lv.1bpp | Bin 8 -> 0 bytes gfx/mobile/lv.png | Bin 0 -> 79 bytes gfx/mobile/overworld_phone_icon.2bpp | 1 - gfx/mobile/overworld_phone_icon.png | Bin 0 -> 82 bytes gfx/mobile/phone_tiles.2bpp | Bin 304 -> 0 bytes gfx/mobile/phone_tiles.png | Bin 0 -> 264 bytes gfx/mobile/pokemon_news.2bpp | Bin 1152 -> 0 bytes gfx/mobile/pokemon_news.png | Bin 0 -> 571 bytes gfx/mobile/select.2bpp | Bin 512 -> 0 bytes gfx/mobile/select.png | Bin 0 -> 162 bytes 14 files changed, 1 deletion(-) delete mode 100644 gfx/mobile/havewant.2bpp create mode 100644 gfx/mobile/havewant.png delete mode 100644 gfx/mobile/hp.1bpp create mode 100644 gfx/mobile/hp.png delete mode 100644 gfx/mobile/lv.1bpp create mode 100644 gfx/mobile/lv.png delete mode 100644 gfx/mobile/overworld_phone_icon.2bpp create mode 100644 gfx/mobile/overworld_phone_icon.png delete mode 100644 gfx/mobile/phone_tiles.2bpp create mode 100644 gfx/mobile/phone_tiles.png delete mode 100644 gfx/mobile/pokemon_news.2bpp create mode 100644 gfx/mobile/pokemon_news.png delete mode 100644 gfx/mobile/select.2bpp create mode 100644 gfx/mobile/select.png diff --git a/gfx/mobile/havewant.2bpp b/gfx/mobile/havewant.2bpp deleted file mode 100644 index 02cb8bb2c888112d05b3256c96377ce0771687e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2304 zcmZWqO=ufe5T4bl^_mE;L}a3aKbX-uK?@oB8I=?gC_` z*?f5W@0Vex6W)Hr?A;F2Ps_*Kp_daaVu*uOa4KCVq;Y|a0>vY5x%8Nc2-J<Vmz4) z24`oM)$gya3e4hpy`E)h1W>ISB>TubG;6(%R1Ls=)Ojw5oiz{fhi}rV@?S0xmZZa( z&8p0d_DRXjoA>WOe|~s)?;c0;m0Z8hxL5=z6s}%fTVveqK701`X}P?)$+%Q9jCT9h zt-U?Qo@Yr}Sz#Xmxdj_oNFx53lwPETHMIb(?W zp+=`&oDy3lM2hM|>#94rK7cx&stX2oV1ozVk+Nc5{^UM%UJ>R~3nR>d()HZOG{z9H zB^8y`@%~itH2zCrk)PQx8}Jc6zH0n?eCJN5)9-gWj~+dFa&WM>=P21AIXEa3ayj4M zA@P0Djg^Y%vM$N`dYNQ%le;WF74EY5RJhCHQ>nhIzJp=;jrB+Q4GgIk`{{lO6+_)W zvpy>ud#3sPuIouW%$Ye8e1vUmHMU&Gb+pyz@IBQvsb48%pwKpTy0Ade-%FL35B7%$ zU)UElQpV@DeQsY0Wqe`Vv@TTOb5ePsL0}JU!!x|0vcy(WQM6{!{v7tb=BKUZG5IIB zA$iKYbGZB@|F+DZ`S`@gPvArR6%QpYVF|w`9n-%=dwijEN_Lg-wI%Bu*YPvLSCn2# z3pB^NlorrbieyFoG*7nRaXtn;E@DK_hdDCcf?E)MC|CIm}}Z@1jFTn30rlS?fgj@(A181R=X55qf0y`o6S$2bJ+r(nc(thC)BMudp?K-_ zvFwg`?uaTCBfu9a1o%q^pJed2862ROm|4LeDM!73wpV~EN#D;%Cv*bIex#Mn_d5I0k diff --git a/gfx/mobile/havewant.png b/gfx/mobile/havewant.png new file mode 100644 index 0000000000000000000000000000000000000000..7aa0a054400cafd653421ebdc94845169c768f2e GIT binary patch literal 957 zcmV;u148_XP){X#hAVF>!kuHIZmstpTj~sLJ$@f6;vUI@x3JW0z zhh64X#5QAyXw#{x?y<&_mNltHvfaO_e|<_ABAIh*9j=`iip2;qZuJ4U&fuS`wq?+Y zS!;jE;G3WO0026V^FI(7bn4+6z%x)kC9o#-jQ~U#68QT^YZ+`v{q02pK4k?U9;ANu zCIbzzXC?6U-4&w6Ct!_z;5A(h1#D~|godtOC67+(wMYes%}@)_T;AOkD74^1^s$M0 z3t_z0+z|F4(1h4*L4(#YtTnf=1Mey2CeEUO5@2w5RX-2_*bbWzqNcYkrQ+PJzSR^5 z;IA3U#o31#*sBM=3k1fqMhj@$dwrk4tH3IuX?)b$_rM45eH{9x8OQfw?2x43>2V->ZB2IFE}%3vE6Bq$Mb;ehduBKq~TtE6yOF}>!Igi<>A)fOD)u+dbah!(@Lh{UVaqN z;>~X6XWr{>xV$_9&UQ4^anRjxQ;XpoS?p6SRT_)kIRuY~01a~YX?FmsCqU&(yC9&f zD_LqjS&mA;claCr&MyYN7y`b|pdSOjH66e{z#edtwL=jze2iJWG(Uhd=V;9d&AQVS&(l=`Mx?~hPy}3c zpAY_IXV9gq@U+2F98Z9igfho~uasJ;3af%I$`qY~1B|d-mIV~FWK;nRN~oy16e6ck z4${wpD#y=d^+ix&?&~2airm*dkTeaaU~;PL3b-sP$;?Q4%j`d=d2n`oQSjSJ1S%eF z3QQ6e>ljs3$`oC2QNuxMNh&je)TU<^sBnLt2MV0h4lAXWDz8BXkDrGL52B>MMo_?H z{=_3ayOM_fkKm`PpnoQw0eC3~CqT)EN_owPz+^F+ET#pPN_@&G?d4QGdQ|)6?mUj- feh$pF literal 0 HcmV?d00001 diff --git a/gfx/mobile/lv.1bpp b/gfx/mobile/lv.1bpp deleted file mode 100644 index 467a12dea2ed7795d16d92f05b5474ba8481442b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmZQzXz1$ddcptz3rGV4 diff --git a/gfx/mobile/lv.png b/gfx/mobile/lv.png new file mode 100644 index 0000000000000000000000000000000000000000..5176fc58556c4a07366cdcdd72fa58e78ec4e364 GIT binary patch literal 79 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}ehE&{2{_%f4W5=7u6B1oB b&NI6*)VOda7DVv|f>e6C`njxgN@xNA{|**3 literal 0 HcmV?d00001 diff --git a/gfx/mobile/overworld_phone_icon.2bpp b/gfx/mobile/overworld_phone_icon.2bpp deleted file mode 100644 index d19ae7f12..000000000 --- a/gfx/mobile/overworld_phone_icon.2bpp +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gfx/mobile/overworld_phone_icon.png b/gfx/mobile/overworld_phone_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9e13a121b338c3dbf5c70b8b33c525dd5a8118a6 GIT binary patch literal 82 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e-< literal 0 HcmV?d00001 diff --git a/gfx/mobile/phone_tiles.2bpp b/gfx/mobile/phone_tiles.2bpp deleted file mode 100644 index 93b085ee4a5e8ff0042e8d750cda3885602d42eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmezW9|9QQK)|Br-#<8yk(r5!nTd^^i<6(5pNF4^p#cOweBk);;>Qn(9}?XBT)Z4G z%+1dJ;>U^z4mkes0d5eG;ozX40OKbl2ncw1XlQ`=1_m5FDJeoiUS1GB1A{_AK|oAR z)4pBDb{%W_x9S=M*VKSi%iAm1>)YqoI=GwKcVc@(nb;@5Jevqk{f6!NJH*`D5#c(4#@@ac{oHWI!csW0t7{hNESDVW2ZyI#TC~-C-)F84zFR-uC5RK6&${9L%VH>;|C+hBC zl%X*{mJ?1n*OGkt@Ww@aiSvNjnwNKHv}PRTVQ~8|6d45^6Q@XgHqV4C zg_PY5o4vWD=+&7yRb95G@s_eoo7t{68{YHVk)Hh7>G(g(m7~~n-}wi|%Fc)ndO4i{ O0000Uii0YL8Oe%|VZDg0qN=n@h#kO9|K$0ugSo;OXMx z;7|~*9ZHkXA&b)f0fH$RoC>L30$%fc@5_Dd^%h6pk1yeu-^=fN`F%k=Re&p~p^DIg z_wX7%z(+um5PlJ!z$aQUM`*)YcmZ#g+=55&ke1X3~d`?PBX)CiE#rAa%q8c;W}iSyvJRuYurtrDIpqp(ipp*tLG(`s3J{k<=3#2TnUb|Mo- ze5oWbffJnN&J&E@H^Pt4N7T*z7q4V4Fg7l;Ds|VgEe&mHLaEeRfy&{;{nL3v|Dz}( zoe({AA~!SxBRKHlbV1F;53gN&d>*CC)o*e9aHnvJmZ&!r6F^GGE~Zy^1brT-TS3# zktdCl5^)hZqF)>$FY3G+55`foxQ=nOj%snI_<-ElldL&%VI)E&w{i3~xu4^P)8nu5CGsa9Cc`iEKyK+$`E((P)!-4AvOwhX%-eBZ6HgROn!{l+~@S^keON)OF*^ zrYueS%lG*4)0(oWOJf@ko4TpEhvgygEOe@Z;8pD2Gv~VhKy6wZLEE(015^DQ(i*EK zT3HEGyBLCL-LrTp@NtrLmnU>Um+;1!$}EOiR}2XXc(0XKGJt$NT`T#HU;@xX z_==4jW!-Y9=Bqiv2ro(IStnB*s~3>dNQQ(?VgjcOrwCEe99ECZL%c7$1i<={3@L$x z9*<D~@+>7K#Bt?n^sR|fe z(OC}=21_{{(S literal 0 HcmV?d00001 diff --git a/gfx/mobile/select.2bpp b/gfx/mobile/select.2bpp deleted file mode 100644 index 53144abf9a47e3fe7b4660be32f9e73f81768af1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmcJLF%G~m2m>u1!rGx@hmP-)CkPxbB tZVxOAU#;q4=Y5%(>J0CALidP%YJP&yB@;yM1=ck`!R!_PFwl4Y?H(z;DFFZg diff --git a/gfx/mobile/select.png b/gfx/mobile/select.png new file mode 100644 index 0000000000000000000000000000000000000000..040205150504771da767898c03d2f34a0b7f7099 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@1SA+lLX9p1sZ387$B>F!$v^m6dDtZy8h&2Y zYWuA4?)mrsp2-K!MsCfz`fByUg$orX-v92Xw8Ti^SxcL< Date: Sat, 24 Jun 2017 02:50:42 -0400 Subject: [PATCH 31/46] pngs in gfx/misc --- Makefile | 10 ++++++++++ gfx/misc/boulderdust.2bpp | Bin 32 -> 0 bytes gfx/misc/boulderdust.png | Bin 0 -> 106 bytes gfx/misc/card_right_corner.2bpp | Bin 16 -> 0 bytes gfx/misc/card_right_corner.png | Bin 0 -> 90 bytes gfx/misc/card_status.2bpp | Bin 96 -> 0 bytes gfx/misc/card_status.png | Bin 0 -> 121 bytes gfx/misc/chris.7x7.2bpp | Bin 784 -> 0 bytes gfx/misc/chris.png | Bin 0 -> 417 bytes gfx/misc/chris_card.5x7.2bpp | Bin 560 -> 0 bytes gfx/misc/chris_card.png | Bin 0 -> 412 bytes gfx/misc/copyright.2bpp | Bin 464 -> 0 bytes gfx/misc/copyright.png | Bin 0 -> 262 bytes gfx/misc/cut_grass.2bpp | Bin 64 -> 0 bytes gfx/misc/cut_grass.png | Bin 0 -> 134 bytes gfx/misc/cut_tree.2bpp | Bin 64 -> 0 bytes gfx/misc/cut_tree.png | Bin 0 -> 140 bytes .../{dude.6x6.2bpp.lz => dude.2bpp.lz.d13fb490} | Bin gfx/misc/dude.png | Bin 0 -> 375 bytes gfx/misc/fast_ship.2bpp | Bin 128 -> 0 bytes gfx/misc/fast_ship.png | Bin 0 -> 154 bytes gfx/misc/fishing2.2bpp | Bin 32 -> 0 bytes gfx/misc/fishing2.png | Bin 0 -> 103 bytes gfx/misc/fishing4.2bpp | 1 - gfx/misc/fishing4.png | Bin 0 -> 88 bytes ...y.w112.2bpp.lz => gbc_only.2bpp.lz.4a5bba0e} | Bin gfx/misc/gbc_only.png | Bin 0 -> 896 bytes gfx/misc/kris.7x7.2bpp | Bin 784 -> 0 bytes gfx/misc/kris.png | Bin 0 -> 418 bytes gfx/misc/kris_back.6x6.2bpp | Bin 576 -> 0 bytes gfx/misc/kris_back.png | Bin 0 -> 484 bytes gfx/misc/kris_card.5x7.2bpp | Bin 560 -> 0 bytes gfx/misc/kris_card.png | Bin 0 -> 414 bytes gfx/misc/leaders.png | Bin 0 -> 958 bytes gfx/misc/leaders.w24.2bpp | Bin 1376 -> 0 bytes gfx/misc/mobile_adapter.2bpp | Bin 3232 -> 0 bytes gfx/misc/mobile_adapter.png | Bin 0 -> 1633 bytes gfx/misc/mystery_gift.2bpp | Bin 1072 -> 0 bytes gfx/misc/mystery_gift.png | Bin 0 -> 747 bytes gfx/misc/mystery_gift_jp.2bpp | Bin 1152 -> 0 bytes gfx/misc/mystery_gift_jp.png | Bin 0 -> 686 bytes gfx/misc/pack.png | Bin 373 -> 282 bytes gfx/misc/pack_menu.2bpp | Bin 1280 -> 0 bytes gfx/misc/pack_menu.png | Bin 0 -> 360 bytes ...ayer.6x6.2bpp.lz => player.2bpp.lz.0312ddce} | Bin gfx/misc/player.png | Bin 0 -> 458 bytes ...kegear.2bpp.lz => pokegear.2bpp.lz.42315ab4} | Bin gfx/misc/pokegear.png | Bin 0 -> 388 bytes ...bpp.lz => pokegear_sprites.2bpp.lz.7a3cc91f} | Bin gfx/misc/pokegear_sprites.png | Bin 0 -> 133 bytes gfx/misc/sgb_border.2bpp | Bin 928 -> 0 bytes gfx/misc/sgb_border.png | Bin 0 -> 632 bytes gfx/misc/shadow.2bpp | 1 - gfx/misc/shadow.png | Bin 0 -> 84 bytes ...wn_map.2bpp.lz => town_map.2bpp.lz.c0587c86} | Bin gfx/misc/town_map.png | Bin 0 -> 464 bytes gfx/misc/trainer_card.2bpp | Bin 96 -> 0 bytes gfx/misc/trainer_card.png | Bin 0 -> 135 bytes ...5x5.2bpp.lz => unknown_egg.2bpp.lz.a5b6cbfa} | Bin gfx/misc/unknown_egg.png | Bin 0 -> 219 bytes gfx/misc/unown_font.2bpp | Bin 432 -> 0 bytes gfx/misc/unown_font.png | Bin 0 -> 294 bytes 62 files changed, 10 insertions(+), 2 deletions(-) delete mode 100644 gfx/misc/boulderdust.2bpp create mode 100644 gfx/misc/boulderdust.png delete mode 100644 gfx/misc/card_right_corner.2bpp create mode 100644 gfx/misc/card_right_corner.png delete mode 100644 gfx/misc/card_status.2bpp create mode 100644 gfx/misc/card_status.png delete mode 100644 gfx/misc/chris.7x7.2bpp create mode 100644 gfx/misc/chris.png delete mode 100644 gfx/misc/chris_card.5x7.2bpp create mode 100644 gfx/misc/chris_card.png delete mode 100644 gfx/misc/copyright.2bpp create mode 100644 gfx/misc/copyright.png delete mode 100644 gfx/misc/cut_grass.2bpp create mode 100644 gfx/misc/cut_grass.png delete mode 100644 gfx/misc/cut_tree.2bpp create mode 100644 gfx/misc/cut_tree.png rename gfx/misc/{dude.6x6.2bpp.lz => dude.2bpp.lz.d13fb490} (100%) create mode 100644 gfx/misc/dude.png delete mode 100644 gfx/misc/fast_ship.2bpp create mode 100644 gfx/misc/fast_ship.png delete mode 100644 gfx/misc/fishing2.2bpp create mode 100644 gfx/misc/fishing2.png delete mode 100644 gfx/misc/fishing4.2bpp create mode 100644 gfx/misc/fishing4.png rename gfx/misc/{gbc_only.w112.2bpp.lz => gbc_only.2bpp.lz.4a5bba0e} (100%) create mode 100644 gfx/misc/gbc_only.png delete mode 100644 gfx/misc/kris.7x7.2bpp create mode 100644 gfx/misc/kris.png delete mode 100644 gfx/misc/kris_back.6x6.2bpp create mode 100644 gfx/misc/kris_back.png delete mode 100644 gfx/misc/kris_card.5x7.2bpp create mode 100644 gfx/misc/kris_card.png create mode 100644 gfx/misc/leaders.png delete mode 100644 gfx/misc/leaders.w24.2bpp delete mode 100644 gfx/misc/mobile_adapter.2bpp create mode 100644 gfx/misc/mobile_adapter.png delete mode 100644 gfx/misc/mystery_gift.2bpp create mode 100644 gfx/misc/mystery_gift.png delete mode 100644 gfx/misc/mystery_gift_jp.2bpp create mode 100644 gfx/misc/mystery_gift_jp.png delete mode 100644 gfx/misc/pack_menu.2bpp create mode 100644 gfx/misc/pack_menu.png rename gfx/misc/{player.6x6.2bpp.lz => player.2bpp.lz.0312ddce} (100%) create mode 100644 gfx/misc/player.png rename gfx/misc/{pokegear.2bpp.lz => pokegear.2bpp.lz.42315ab4} (100%) create mode 100644 gfx/misc/pokegear.png rename gfx/misc/{pokegear_sprites.2bpp.lz => pokegear_sprites.2bpp.lz.7a3cc91f} (100%) create mode 100644 gfx/misc/pokegear_sprites.png delete mode 100644 gfx/misc/sgb_border.2bpp create mode 100644 gfx/misc/sgb_border.png delete mode 100644 gfx/misc/shadow.2bpp create mode 100644 gfx/misc/shadow.png rename gfx/misc/{town_map.2bpp.lz => town_map.2bpp.lz.c0587c86} (100%) create mode 100644 gfx/misc/town_map.png delete mode 100644 gfx/misc/trainer_card.2bpp create mode 100644 gfx/misc/trainer_card.png rename gfx/misc/{unknown_egg.5x5.2bpp.lz => unknown_egg.2bpp.lz.a5b6cbfa} (100%) create mode 100644 gfx/misc/unknown_egg.png delete mode 100644 gfx/misc/unown_font.2bpp create mode 100644 gfx/misc/unown_font.png diff --git a/Makefile b/Makefile index b60672e35..c4d9370d3 100644 --- a/Makefile +++ b/Makefile @@ -153,6 +153,16 @@ gfx/fx/rocks.2bpp: tools/gfx += --remove-whitespace gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace gfx/fx/status.2bpp: tools/gfx += --remove-whitespace +gfx/misc/chris.2bpp: rgbgfx += -h +gfx/misc/chris_card.2bpp: rgbgfx += -h +gfx/misc/kris.2bpp: rgbgfx += -h +gfx/misc/kris_card.2bpp: rgbgfx += -h +gfx/misc/kris_back.2bpp: rgbgfx += -h +gfx/misc/dude.2bpp: rgbgfx += -h +gfx/misc/player.2bpp: rgbgfx += -h +gfx/misc/pokegear.2bpp: tools/gfx += --trim-whitespace +gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace + %.bin: ; %.blk: ; diff --git a/gfx/misc/boulderdust.2bpp b/gfx/misc/boulderdust.2bpp deleted file mode 100644 index f8b9f0180ddb6ef31d7886879813d26742e75241..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ncmZROkV<25;%*GAJOLva*YoEea`dM zTH=$DcfBS!~gd)w1)7s7WAIZ0BQ1c^>bP0l+XkKee@pI literal 0 HcmV?d00001 diff --git a/gfx/misc/card_status.2bpp b/gfx/misc/card_status.2bpp deleted file mode 100644 index 3234368a9381e17a6885cf00bb539b5f7d45576e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmZSh&j18+ataD|c1%n*HVk0?&!0*_pscK<1mT}Q58^+11miDS1mY_x$;d$DD=Hcq Re*ECz`0xQ_ngkHQNB~Oe7J2{x diff --git a/gfx/misc/card_status.png b/gfx/misc/card_status.png new file mode 100644 index 0000000000000000000000000000000000000000..b33bb20296833ae7103cf3e2d84276cca8d0b53d GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^20+Zg1SA+Pe6Y3xQVyOjjv*Ddk~vzN|Noc#r_88w zPQJR${tS=VAD(0L`EM{=&i`M}##}vN6aN_jK4uR#4aR5x*$eGHG#~l@q1lItK|sq* TMzfjcAIMBkS3j3^P6rtkIZ#sht?u*cfMTAGz$gohEVH*D}a6w3L%8U(P(r6 zLmbvX3;?!B%JZ1!wdbn58jO1C;rX(&xsmm<+Y3txJC|$UWZTK7iy<49M&;r0sB~Ls zGS-j{378lt#WjpGraN`3t}0&b-_Hw&J01tMTFnatJZJ%c%T?b_$L6LqmSs`uUaRU} zwSHdjPj>B2%Hxejr4pw}x22GJ$@f@xwlmL^^`=pLK!uGevtmM|31P MB}9mE^S5C`xLHTJkYG#62N@C6EDPr~+6K@hf@<|sXQQC~n1A?Oo$@?22p$0K+PT9i_3 zsEFWGbWMUF6UPe4?j)D+Ba=U~GYP}O#j<cI)Qa-XeA@CPL z-c>S$HlZ7-1Jh(s-LPARRp-cS$(-OhhgXhExYr9hIhE(^4r51T9CvE-)5Oc^bZRj0 z@?v;*1zLuQTfv2$Cr7EQV4&x$l6@ZoeT3NCvAWA8W}Mi9F-t$4^iqx&GUt~Bj$K_0 z0%|DU$Z$k~u>b_JBfmg};QyN8L>LJ$RDLAphTk_)a7K#z97cw-J4^>A`L&ODVmMy* z@0jB4bA*qXW_=5x?wXZJ1h%3Xa)j_w^MCam43{wr^NEHc`(ge7L~MWB-6LhI00000 LNkvXXu0mjfP%XBb literal 0 HcmV?d00001 diff --git a/gfx/misc/chris_card.5x7.2bpp b/gfx/misc/chris_card.5x7.2bpp deleted file mode 100644 index 747bd0da5a57e29c8973c59c5c68a5973e606f02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 560 zcmbV|KTCo^9LMi@?(8(B=R&AK=^mVejDi}h=MmpPdrL#m5(!NW(Q}WIG&lr7G?}y0 zLvNrHEE^hp2VD)(AbFD*sMkHUM77js_)XtGKfVC`7eiy3CNv;M7(vr8{+{%a0RfC) z2*3JuGBn`?j#-2fYCCz)SLTtqj?$5}*xTJeF6NuQuiX%8UHApi2cZZ;I2w<~CosfO z4a5Loi)3AwXh-!C3V7H80GF$SbS^PBrLioFQs-LL_G*pu zMt`!K?qppa1l4MiW}KEn>c#7?JSMl!Bo!*>6usR;gu27!Dr%J~rAoMupS5C`xLHTJkYG#62N@C6EDPr~+6K@hf@<|sXQQC~n1A?Oo$@?22p$0K+PT9hI- zR7CJ8x+X!8iDULFIfNf!GCT862$mO7_qJ=9VwV}tF{OqK^J+<~7*-rh=n^DUvrTeR zQ52+_8fFfu5vKUGdVOnNTdq%9o2J9-L+jWc{5!FH{ubY+Jm=QWH}4kFtRF;e5C!H&}}!Ynv*86l2(IveB^FSz742a0`F01O() z-pxX+WXb@+WEPeb2;rYzD8Yn*rU(Y6{@gKBztuk}NuaB%VRioi00000Lg8e>jdG-|=yNm-Uyk`FuHJeZPxD-$%!BUE6jaq!5bRgv9Y= z61TyZA4-ctQ7%v5;JMih4BHNTFh7toegJRZzn~YeuJ?L3B3%btR;%Tdfi=zZ2noY* z0Y)f_2*H>Tu%dY5OyrHL`JP&$Jq4Q`t<3CHbAC+I^?H+3HjGD+X@V&|ol?F)YPI5`a3^#%$nkyn1J5d+_tUDL>fA;-@dh#Cw zu1_5AJv_>>s|Pkyw=7uBNPnZpRo4=eL3&NL|sAgCtX+Oi?1Si7iC?b!(x1mT6eG&ckxPXt52&6&;q! zv~86{IlXFl9Uo=a)l+&UsiOJdhCEtaY1B1LfCGgEePN(~{ILHVAC2}qd_8|G=Kufz M07*qoM6N<$f|w;|!~g&Q literal 0 HcmV?d00001 diff --git a/gfx/misc/cut_grass.2bpp b/gfx/misc/cut_grass.2bpp deleted file mode 100644 index 1c8a3f9a884bccc8f6b132d5a98c2cf13453b647..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmZQzu(7FgdOY|3Lc2qMdOmz$WMpP$W8>qJ6S7gMs5o$d0SK6x`S|RN{v5He0P!H; M|NlBC8yf}&0G1jN#Q*>R diff --git a/gfx/misc/cut_grass.png b/gfx/misc/cut_grass.png new file mode 100644 index 0000000000000000000000000000000000000000..b10e0cf8c4c96c17b9eed47b9fcc58e28173778d GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJUr!gukcwN$KmPy!FW<)h=fAzd zoTxwl4Vu%A)Tgp-6|EODcG3NJ<@|!9^#|rPKD7T|&$hry;v=Jr0dpsRx1@x`j$i(| gX+IMFH_Gd9GyEvlnUsEi2FQE{Pgg&ebxsLQ08cD0=l}o! literal 0 HcmV?d00001 diff --git a/gfx/misc/cut_tree.2bpp b/gfx/misc/cut_tree.2bpp deleted file mode 100644 index aa8078f3171d5e48ed4258601d0344bcbb34b908..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmZQzU|`VD2&rlM7heDVe{4O7z35-)|6l(?{=BK%5yQjJ#Lff+tUOXYZ2XMu3J)9( R9B??`kYI4ZBI85D0{|oo80!E4 diff --git a/gfx/misc/cut_tree.png b/gfx/misc/cut_tree.png new file mode 100644 index 0000000000000000000000000000000000000000..c1f1bc97d4ae549e4c344c5bd3d0bcfc52f51116 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|v!U{4pvkcwN$KmPyUYF< zcDK3NjAcHS7bXhurU|53JbLix{DBh}PMj-fNo}(^Tz~Dsf1dyPznDAE|1~)D{$YJv n{Uz^LlK-r&-lhMjcl~3};C)18@+uacERZ#xu6{1-oD!Mn(}g0z7aoPY6++YZhS^&hl_p2oe6UDsPLvj81v9x-a~n5s;7@Y5Ew zkYS3lUDY5`9pbT4rd?uwuGEUdfY%$TWk9jn6UsTYNmXxkn&^i<)Z}r zQW@i-oD()`&3}%|`4;d}z2FC8GGeL{S(jy(fE5VEteGcx{T z`*qIb55or_e30;4D3wIjEoEnAl)o~IDRlZa5&J=z`y_i D{7o@O diff --git a/gfx/misc/fast_ship.png b/gfx/misc/fast_ship.png new file mode 100644 index 0000000000000000000000000000000000000000..e92f00f555fe323d60ebd8e388073e6f782164bc GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&Qi+}}jv*Ddl7H~C@cg&`z}y+! z-Ppo(yuOWp4dWjkbtmVkl70pT8pd;81!SdJY{?2WK0J{%<`9p3B=aB1f9-Am+J(Xo zHy&|JSNM2*p3Gvqwzgl!e>i!!wo84zD4!+*v~TtqA3gpVmNpd0H96^?EnA( diff --git a/gfx/misc/fishing2.png b/gfx/misc/fishing2.png new file mode 100644 index 0000000000000000000000000000000000000000..32d277269941e34d85322a30bdc63f36bfc485f7 GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3o~MgrNX4z>2mj9>_%Qz=vpsXi zzXKos+w;_>{itVZc@ruzBUGYdmL$&`NxuK=3_^27_Rn;8H34b$boFyt=akR{0HoX? A2><{9 literal 0 HcmV?d00001 diff --git a/gfx/misc/fishing4.2bpp b/gfx/misc/fishing4.2bpp deleted file mode 100644 index 987a4ad34..000000000 --- a/gfx/misc/fishing4.2bpp +++ /dev/null @@ -1 +0,0 @@ -@ 2 d 6  \ No newline at end of file diff --git a/gfx/misc/fishing4.png b/gfx/misc/fishing4.png new file mode 100644 index 0000000000000000000000000000000000000000..0b2d73e2c45b64cf404791c520dcdbc20e047207 GIT binary patch literal 88 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$$PpuhE&{2uJ}FwVY=<%^%-qD kGTO2?OYZYa{=x0ClA-4*cZ#no<0g<6Pgg&ebxsLQ03Oa8o&W#< literal 0 HcmV?d00001 diff --git a/gfx/misc/gbc_only.w112.2bpp.lz b/gfx/misc/gbc_only.2bpp.lz.4a5bba0e similarity index 100% rename from gfx/misc/gbc_only.w112.2bpp.lz rename to gfx/misc/gbc_only.2bpp.lz.4a5bba0e diff --git a/gfx/misc/gbc_only.png b/gfx/misc/gbc_only.png new file mode 100644 index 0000000000000000000000000000000000000000..72bcf01317560c72b3a21cff383d07a435f9bcbe GIT binary patch literal 896 zcmV-`1AqL9P)B?z z_Ef@bpbMdw8p+!}As6j-4NJ_)63U7z$V*MYv~TkDd$YUAtkmzYJM(_;``-Wmy>9@M zh#$NT;xb|@z*ImNmRmu5H;R6GFZ^Zw@|AuVyA(lEHllb3CQC_XvaKH`#Vo}B&|E=B zhAq3lAFL1!9H3($l_?2w+QPFVb`wumGtlwC{slpQhNYntBv1=v6?jEZ)8j#~Ho>1c zLR&=y)nd9Xv(_pMb^CVq4{uLrTI>v<$+^BlSIK z3Q+_fN=}<32&8oYL4_a@=7iy$PvGVKqh$$9ayiCL!9r^umFHcX&3!R@*t-Fe{j;3S zEm|mKmWu0*Fq}XC!L3?Y27TeX)3UJGULx5mS!$~}=Xrh$4*eFiK(^sDbYUdNNS))l zvIzq1w0hVHbL2(9%;HI$CscMDh#Nf z)eA$KV4V~Z+;L|d-+=PwaQ9@;E%fjD?3ZMYcO{&obNzM4JXUsGL)>u6uI-S zyVDjvadmgpb|wJSIxv<%->#_{*@fIyG&dt`vgy`T7i!)c(wHEOu?fThMH`cm?M<*| zwkbkg0yy4-eE%!!%z&cXTxV`QHBHY68s3?6VFWAD^Q{$nUBxM^_r6a$hla_*UC5)v z&DXd!_tKCK7I?d{Wdx50QRd@5C_z3d!szn#scjQ%7yHVR z_BYZIpWYDpttVn_>m7)19%nzh_)X>rWv-4Mz^_F1;b6@iL(0eqJxP)i7;Mqc51GMO z{EbE2E|MTJzm~wg;caScqk%EqR~=(8Bxn`aW)LQZ<9wVE_*c+{xJj8*wsC}RC9fyx z4dcTW?tP5rBRccx3H*cRs6h&-4%M~LjG!UEST~8Y2Ck0AB2V4z%8paEWk);yU;GDo WeV^o&roE^D0000CkF>RJ4l?J-@u^8;rkE8|H=Qq&-~w5*SOb7 zZlV3c?F-u*`c6hZ+qRQmUS0j@d2WB+^{dv|+11t6)&KurUmsWBFaZP|1PmlNI9Paq zpy&7R>fb*(e{lY2`O~teWk<)34u%RAmXs$yew;W_P{7atc1MFlf`Gt@6ADj6N(4SB z{d%l3DQ^t2y$IN*=~ z0tyBK1_A;G1s^_qxbTAm2s?JP$h5?`#JITBFg5Mkwu=a^+R=h8#dC2h+~(j?yGYx`e<7tk z1c#o36$^!1RS>S6pu?3YVqe}3W(hy?@$&K#A|s9b^@fG%%R9{b+YpnKDOU{h#e%0e z-rRk36`i%i;wNIVnXjP9<<<&fcy-gLaK)3>^SL>t$R0O`4d9ZIdKq36rgTdDtuJP@5HVBe-&{wt8xyoJ#oFq1o-sWu^n zRV}?J<1lJ4KkiW=*%xt_L0o+#V!;6D9uTtZ1dvfxkgNv`y1f|JTu6a4sR>IJg-H|F zh(#(GzRND=mldJp;|R@<2q~_9Xwe5uq7zI*pTlft+vurG+6+@B>&Xc1OdT;}pV^qa z|3AZl<(T-)t`(qXmUH#AVvlf#Dl*E2rpSftqP0JF><0L!NdI^8HziJl>1Tvir~m)} M07*qoM6N<$g6TQGk^lez literal 0 HcmV?d00001 diff --git a/gfx/misc/kris_back.6x6.2bpp b/gfx/misc/kris_back.6x6.2bpp deleted file mode 100644 index e1c25d12cf4491fa41c1a658ffb700ff4324cc00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 576 zcma)2J!lj`6n?XF-mZALT|AKW(CjvHr1HQfg=DAGP7#7yxnO4zg4Kc{JEEA*v=+i% z7qC!ULAVhM8-KvUG|?M9P$J?DB$|or?sGP{pkR^jo8iH{_kFx?0R9K^2Y>envF)S5 z)pQjz9Aat^MaKi%u4f3LmSyc-N~uK;G`s$Z{$7{Rrt1V=6hX)SVtu$L}a3rrBVQ`R`+nwaoY#occaaj&6zK2i|3QGwfBDOKr(^YE|2AjmQrh_ Ygs8Pb3_=-7*;n3UUqAi!{q4eq-%L@_cK`qY diff --git a/gfx/misc/kris_back.png b/gfx/misc/kris_back.png new file mode 100644 index 0000000000000000000000000000000000000000..eb0c1e941dd69ebc4c20dfa48e36154689f5cc70 GIT binary patch literal 484 zcmVWha27Y+9NNX%L0rV)q#$h&92_0) zYEjfh(5(m+CvniT;-V?fm!wt$Io?Mu@7{X{_-}!F1YLh<_LjQZxD%qpelaeDm~BB) zELK}+P+WFxgPO*o!42VPJ7+Mi!C4#o4$mm)WNU-*Hp-=iPFv%Zt{g5D^c}e+#PW6v zI4t%=e9kqgC;6Jo=XVYIUqslMxHXtLDwCAe{sxQeU3VR>=-QBHHWK{TMfME zLY(59O^AYULxd!Q0MgTuV|p)V(RadD0PE1nlfb9~Y$O-`P!>QB{-PWUD6g#t&z7nL zOSe$P<_7g)`Wf-__rJeU9x#*?=^-}mv5DkUmEdEC4sKDpr|N{-%G2&BsuSv-(RQdD z489TT4Es`91sX+@$>Q`T;hiS7qL8CPFW>Mp$l#biXoH;c@S$Sk74{V2{q+qu{0!c( a>*5bJ4|23F$p?7=0000b%m@UPmF@2x>Knc%)Jw>-vs+lixb#ll)^}q~#m|p_H*R(C zajaBRlaK(p6{H#!Ffbzg0Fq&1W@YE#8uvQM zEwo>_ePMe;-^s{l+jjEHtE(S9&+X5*MMhCV-%WfPn-D2MZ4n z^!)x^{re~956&Mge_Hmm?C99h!BD}%lJexoj}s>f3K$x|?r3mG5D++VLg9%>iNGhN zUypV@va%1?3)TsLBmc$zLj1k^yH_TbnHdVl$WP?sDmVxyNO2Jk7tu~fyGUusNv-Qy+AbovYDWvY6wk%2aGQfm?ILX#zd}lT z2o605D;5g3svulBL5Gysz9hGpA^do}gvUQYJX#2L(^d@lqvF#8Q$!Vw2(m({=nGDE z4_-V$ck86|BbjU!sh;u9>O#(RFc7w@g0Ui`6+3 zLw)-$57lmY|E69BvV?KE9D`$=PEl$H?hQytyRX23qwNJBKwS4%#)rU6?qZ?Vf^jzW z^eT@-)x<&E*MR7V#yt%88e;Qe$!Zj3ePGz@$B6F1I0SQ@+9D{-EtMIL zl4M`Jr}%3}2ZP z&~_~~gJ*~G33Hy27VIP9YJylJR2L+a_hj!Z120rRiU+fXKRM2&x_uW^=l}o!07*qo IM6N<$g6{LQZU6uP literal 0 HcmV?d00001 diff --git a/gfx/misc/leaders.png b/gfx/misc/leaders.png new file mode 100644 index 0000000000000000000000000000000000000000..6e7eb0f8dfe1d80cdeee019140abd7d5415dc44e GIT binary patch literal 958 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 literal 0 HcmV?d00001 diff --git a/gfx/misc/mystery_gift.2bpp b/gfx/misc/mystery_gift.2bpp deleted file mode 100644 index 04aff20488303038058ae0e2728e632299e5ca00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmaiyOH30%7{~wHE!hf2YB2$WX`4oy$i<{4;z4b}O3EV^y?FwW6g&~*rRrfT7Sf0b zjnQa0l*E{bXT2e`X^D|bYdCSTO-SSbi3@FD``8(0+HFNIe!s)a|C{+9^8f{hKt&N$ ztW*_+1OY{*wIbF$0u^fe=%>KR>BTK|tK)xzbFo}cRJPz$!@YMKcDCL?-b zTduZJkE`dAL)`NxFJ`fTg-5e@WBQH`+{fh4({Cnq-HSAmO{JAyUAN%@TrVE(w(0sh zCNS}qq3e1GY4=oXU7*oZf?^6!u={Umm{VjrFzY+{6wg^k}R zKf72mR1wQi>7}kNhr`ju+1i1Ljt&nG4SBsjW|<7Ichc$X?~g1+mcpN(eZm#>SUBwU zuB{o3re@^;CxV0D<|1>E=Nz>JgWTiyv&i`nGxiv8+nvrpAkg=f+43^581?!3`W%k4 z%(k~-Qd`XJ_6wd74)0Ma7je2*jN*@ViCsRfRC}h&b6iiWI7g$Mx*U! zhH?nWy5V}~(7CpX#(%H>Cb7alv{>Q4h|hEG9McK6VpD86cY@6u5NIfKbtYw45duiz zDcJSa3CW(gJ&ObEV$=Sev1#5l9k3mLnR&|8ZR|9*7+cVZZcG`=22CLK9Bc&3nhFIx UE0UWS=i)ovAJs&fdtMwNT!Hknv zO6#2c&840M%ubjET<&w;TIyHVG`DD8V_x$9V{U%TG$FpGJK%DVn;$cqD(77#pZb2p zL(6lg-W;c}YEtq#50_inHC%dh3s#qyCT8azq~5{-{X>Rxh7)X=3(Lg?iKAGc-A_5| zczSxAxT5rf(wx#HMb_TNk%3+3O`G)&?G1V{&LKZLR90Y8XHro_A3@nFlUrS$L)F({ z#VYHk%-hV*m|H#D@rY`PPKkbrUSDa;{FqTCjk%y)$!^4L)rX#mBKtn7Qtn`Vgie8u zWGr}}k14kmHB(K=`!5wJIenJ)68ulsFoq~@qt(N%XF<-_MJ!@;K*Q~cO_EtlsFjAkk!p)S(@GT>)TDl$P zka}P1j;!=4Mi4QMa9Cg16jd--mNyCi!!PjXBwpAm_(hiUk)#P5k@i5L(Y?`G`nvi&L58{RWwF literal 0 HcmV?d00001 diff --git a/gfx/misc/mystery_gift_jp.2bpp b/gfx/misc/mystery_gift_jp.2bpp deleted file mode 100644 index 2439f25e1601844fe3ae5a6255ae8f5bcd54069e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1152 zcmai!%WD%+6vod?Qf6YS3ANaimPr=D7hUv)Z9z?xicQo_sZd;$x-g~PbS0#;cqeKr zxUy1Od=RWc1^)sU)+hn{T14xn2&Pn!CJDoPs0ZTWwoyV~$p6hPCYB#?OrB;26BoJ};hpI{o%J{)yeJUQqJN zER~RRrin6+jF_%U+jFEr6K=uPGq)!vCnhQ?Vh>Y2sUE$BMr(6NljoB&L*>XgPAo46 zgOQM_?$DJBgBQJCK~NOZ_rdJ!bWK~$QJ?-xs+Ll4PL9j6ev9X^Or-HVzsrBC%8Kdu zGd#Z7)z#b8d$~KnY7!_N2p}*{LDHFK}ThA`Yea0f*V`-Yl~51uFk&z8dtBN15OWj~ayYQik)ZGPZUo{oDx2cp z$-wVNXb6p>5uyP^j)H`bhz6;ntYeKxk82(cKvC6k^)!)jMd&6PMl}2g{M3CFzcOlz R)%#i1`n1=YYKZ*jz+aa3N09&k diff --git a/gfx/misc/mystery_gift_jp.png b/gfx/misc/mystery_gift_jp.png new file mode 100644 index 0000000000000000000000000000000000000000..692cf8732a75753faa64d3e214dfb3c4eddb510a GIT binary patch literal 686 zcmV;f0#W^mP)BjE6ae6tYAJ@|6q?zq@Zu5^yc|&r?GGsU^>C1@DTZ_k2_{Q}`~w1>;y|WQA#k*J zD@1NLCqZ2lErtyJ1EE6LgVoo&lkG^MPe?kx(|aeLI04GoLH8|!I8dD`pa_ryP9ZjN zL&1gwo6;4?z+-VNQxu^0SVh5(=Pu!m0y(iJ?@5#-N9pRxCZti4PQx5b@7vR(L<|4y!gZW#C zhYOgp;N*K?5RZdenZd)X%&z@e(9?K1*p_e=u$ba&in+n&K^=72${#Zp*8(;%UL0ib zMVn}T86rP1L6={Rrxw{$3T@=Tv_caRj9FNOtG`A;U|xeF#KF7>;)PgL59+sv*#v;b zHN5p-zc8~@AmS-@i4wU@@RM8ol-O-Of#|LX+)9ejw$mbr;u0dFJH%b0R<=#KB^Eu! zmYwcq(6))h_@gCML5oC)$+HNHu-jH3lSN8b{1Lt>kjbLxss$jHIwOj5{aA#rwjxyE zAsg8KI~5gBGtYXJ(MuWY6&Stx@E%GRl~s!W6h@1bUwK#;PbAr@HjKozDPXz$KPL^_ Uyd^)b-v9sr07*qoM6N<$f@?xNI{*Lx literal 0 HcmV?d00001 diff --git a/gfx/misc/pack.png b/gfx/misc/pack.png index 738a9dd94565c652adba8b9057187486eb6518fd..b85fc0990f7a672acece97354c0294d6cf139609 100644 GIT binary patch literal 282 zcmV+#0p0zR+juPuZ zXOR(TL|z`3nyBnooKHj--iJ_x;?gO$y~jBO*kS>=fT%1$^lh$(i5lrw9Lz(ZgHh$@>tB!NW~4cqrBYTbu!o9ww0~cqkNOK-b}{n+8N0 zJ8bcXdjWsrp;Nqv|DfpDqOR_&hgmTObRCy<(}4G2hyA68cJsh&G5HSzQ58KX^5%iF gZWk07*qoM6N<$f@&Fg_y7O^ literal 373 zcmV-*0gC>KP)ZSY0h&dwq#!$i z4fMnw44#Ni3fYD47fXjoWg;eWS11?DuKrZ`Li!ltUj-sEmkuQihZ<9ZQAo!d!4vy5 zxWE$|3?kOl!7WEIFj1^Po5)7>#GuJ6{D@;;U8Npk7Kxl27Tgs)vDyQJPLYXhC-oBp@^6+K7m~dh3e+yCgcT#3@*h7sEam} zxJa`~z($EwRH7EKHpO^*f7L)Jv`{FtL%&0A&X;rVA@?R8;vs@7Jk(dN_^O7vh|fUH zy&kzFbvo^Khf*v$>sqZspq$`fqpzcne_Xk(S(Be&lKbj z6!@4j95M{<@S0Ln4g`!f1^qtm*Dy>ImudETnEy)QI8Ea?hJk}-QK77W2H>>(ZPcCcLtL~a7NGGO*5P)4%7cC-m5w;VDcus_c{ z`46Mi0CeLB3~<0#PzvRwETDpGL7joqSOQCA4aY0g>fRKP>d^)UFusD;>;ybV%be)} z7b6RV6pgH@gHcfnSO_5c2Xu_7gr+{RbbPF#vZ2Cp7Xe;ja5Ev0F@nUf7>IUI3ru1? z*N#-d5@ow|sAWXaHj)}h+2Z-g-Fox_``zIO(7u7b?Vz^9orZn~wXWA(>j{@j1GoEG z$NeSay@B&x_LBdMxYx?gygt8{w;fCj@CzjE3uy8O-~wAm8NqR+grbD9$1jWKc_z1i z9>52h%z80<=LLf8*XtRXO9$!w^VJdg-43A~j-mhc$LkYuv#so&#FD}Q00005NsSo^<8Q^$n3nL$5**|jcWjB)51^8QQNc-9 zYXV(Yd|UcDk%17;1}sOa0p?>*O?_+8VXRHI!t)Q>3X#Z06e_#}%=)9smxxv#ogo0$ zILNo-%&O?Rp)w^O9JyH8(_mU8X2FY?<0t*PtlYH-A3p@5Y)J8zD69y82|tP07*qoM6N<$f{qu? AX#fBK literal 0 HcmV?d00001 diff --git a/gfx/misc/pokegear.2bpp.lz b/gfx/misc/pokegear.2bpp.lz.42315ab4 similarity index 100% rename from gfx/misc/pokegear.2bpp.lz rename to gfx/misc/pokegear.2bpp.lz.42315ab4 diff --git a/gfx/misc/pokegear.png b/gfx/misc/pokegear.png new file mode 100644 index 0000000000000000000000000000000000000000..78774a260c8505344328b3d8135396dfb81f9e4c GIT binary patch literal 388 zcmV-~0ek+5P)IYbB)kLoOFh~Y#IAmg(LNVFMiLKR<9>KG?Q4&9}< z>;wb>p5S?CF2y+@P{t46CCE5M-sfq-IEMJ!wMGKOK*; z*VM;%dseLeLO9riwQtrk_~cLHX0V?CXRR4GgWU`$xHraawyHa@BY>@PcF}>gH5Z@^ zSIQNfQd}E{TQvjrssxmK|1l*NGYPw2RfZ0@^~?_C{)H26R2sn`oE6Gv1`n$fXi@o= zs!H_W^@$TkAXE$*?jF!LC-fuGfo1dMhY@!$=@t@}#8z literal 0 HcmV?d00001 diff --git a/gfx/misc/pokegear_sprites.2bpp.lz b/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f similarity index 100% rename from gfx/misc/pokegear_sprites.2bpp.lz rename to gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f diff --git a/gfx/misc/pokegear_sprites.png b/gfx/misc/pokegear_sprites.png new file mode 100644 index 0000000000000000000000000000000000000000..746d4b4862ea90742c6294c6f4de259ac92ff1d1 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<61SA+{FxuV$Qa+w8jv*Ddl7IX^{?DGd<;N9% zWk20E!6@woN9KpFexrC~dFbk2l6D5BACzA+2+RNYZ){*7pU@!i=l}ou173gFnK&AQ hIS)iMs0nx^amsK@ZR~1XAKnp$dlDU`ONbOM3xBmRS|LDY%qY zE?Hy~>;pJPhAgz`A_|6%QjPTW&5RV=rSpM?_oFxO``$B*?E_;2CM;z&V8aLg+^4r> zyP(6f$7eDX4D2r80eWaEP|Vn64l}V-)O0~_OVMES(RSv)M4!2+T6;`qES}fXp&@tRATJRy)lXZMMBnm zj*FJgIQm8G;Vqo1|08sWU-uurHo|v0U+ISswH|iiz%5L;OC6t5Z&OU84<}@QZEr*M zY-5*L@0EMPA7aS#Z<}8!jYR}qx?LJMAjE1p8C!K?U)|9J zhAANUqr`b~-5w<)7$sYEK=UbUKE9f#t?kQZ`3wqW^HSBwi+F)WT;%sVy5`l4D#q8i zdP;UON}R;8ghf92HnBba_G;Yz{3c>*e`r1Rg6ciZ{Omv+h>7~3Oi`e<$`Qf-dChe)eEy!NzP@XJFd(irH PJbSTv`Q`PzDZPII!LTAj diff --git a/gfx/misc/sgb_border.png b/gfx/misc/sgb_border.png new file mode 100644 index 0000000000000000000000000000000000000000..867c36b1093864eabbb8ea56646a7ad0598e74f4 GIT binary patch literal 632 zcmV-;0*C#HP)9|UK)eY5LQ2S z*cJtB&Th6(xI-YXko9YHi8K<9h^w%iQUio8gw1RQ%L}$)V-BA-u=dHeTAD_Nox&FO z6|A>y;kUk}NQ!lG*pBPVuTS}2Ml2DjN=dQW9Jb@+x!{Bmk@7~eO^Ui5=qfh zbB7@QI8|6;w4PCC8)BWT?|QbO*WV=-Tb>417wpE; zI$70TW|xRU!iQC<#6ZZm`k^M?c4)}X2?}6ig64<^!ikhLcXCF=7(`640Dd`ziNg&H zo_dV&i}O<89(0GjINMctj;cVFAuAVY-l<8X>X7&;ycOOL>Go{6-)|r;9^(a)y!ca1$w9jjCu$0a%n&Uhinxr;rcz8b!0f9^ z--J0G%yd8$L!Q%O@7Z-^=(*5S`js#>>TDc`Oybdfrt_%HZt)XgP~kQk1MLGH0Y(`B zvrBgNlr@Jt`0WbcEP)Fg>vwn(AeuV~3CIOTr?id(~Z zcWIi`Bk=Mi_wFU{9bnw=2N^A&pA!O%W-~9PC8ApbDsWVqR`rkR;y{ZJy}$nldh4W7)WLn!NlUu$yJ-U5Gg&zMMP}Kv_)K6IU=?36 zKQI>x*#KtA{1wQQ7AZaj%&*Lqpu$}X-LnH&qB$@_bCibWkPXf88!~MSq#CKVOoK|B z32A94w9ORFkLkk$cJ6wsNcF!p{F+THaLhd1+W?X zTy4>iJwbc@e$_e0W7iq>J!0T6bL*P!z_63srYfWH(1RP!{JbR!Q+eXJ;+L$cPixh_ ib31d|%U!dI&OT+FkZ;}F*x3F9WP_)xpUXO@geCwwS}r{R literal 0 HcmV?d00001 diff --git a/gfx/misc/unknown_egg.5x5.2bpp.lz b/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa similarity index 100% rename from gfx/misc/unknown_egg.5x5.2bpp.lz rename to gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa diff --git a/gfx/misc/unknown_egg.png b/gfx/misc/unknown_egg.png new file mode 100644 index 0000000000000000000000000000000000000000..0642c28cfb18c4a57212c96eacd1861ab2b3a28e GIT binary patch literal 219 zcmV<103`p3P)5_j3RM002ovPDHLkV1gjQUbX-L literal 0 HcmV?d00001 diff --git a/gfx/misc/unown_font.2bpp b/gfx/misc/unown_font.2bpp deleted file mode 100644 index 4ec0bbea6873363f6d841334b91e9967fc180a1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 432 zcmY*WA&$c^5L^WnRMDz9z@Q*F$f^ns7@Z2O;yj=rDu@gg6b4iU0ewSdP+aW;{D6Y0 zucmnYnN=KKBeP+nC{^F5(yilV9j%2Jg3 zy-dpzpzAJ|7|-XfGv@sUsO#+CwxV~AIi=StC1&T~H(wJG|K=mMEr2n7KMc3qF!a4K z|L5u_8^#IaD1HFXCv%L<*Q+o|SDyQ5zYxAA$iC`+Jg!#D4uXAVV=e@A3PibZ;i9Tz^*O>V~5El!*57FmCWG&(k7JzyI diff --git a/gfx/misc/unown_font.png b/gfx/misc/unown_font.png new file mode 100644 index 0000000000000000000000000000000000000000..5ac70b8079b6bc06d7aa2945d4c44ec803be33c5 GIT binary patch literal 294 zcmV+>0oneEP)o zL8`_u2!w@h3tlDQw&2wR*#^8yz-_=cn%DAY(O{iVCrVL=b}U^=OUS-YS|T(Lr&A#jy?d4@YwuvW)bzi+ly<0_emXG6+QkO6Q%t6_0vzaI63_) z>e{^{7u$_-1>5HnIn0SPc0k!Q2V3(@6Ebti0Vj{sg0BDg+`)r7&s4gt^RRC#KUFm6 s1kPWs=2^>032N59&i)Xkpt#T-e=hqfv}xyTf&c&j07*qoM6N<$g4=F`CjbBd literal 0 HcmV?d00001 From 803c5154f43a76a2a217c53a6fc21e89918e4603 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 16:27:52 -0400 Subject: [PATCH 32/46] pngs in gfx/unknown --- Makefile | 9 +++++++++ engine/timeset.asm | 6 +++--- gfx/font.asm | 2 +- gfx/unknown/011cb7.2bpp | Bin 16 -> 0 bytes gfx/unknown/011cb7.png | Bin 0 -> 82 bytes gfx/unknown/011cc7.2bpp | Bin 32 -> 0 bytes gfx/unknown/011cc7.png | Bin 0 -> 78 bytes gfx/unknown/011e5d.1bpp | 1 - gfx/unknown/011e5d.png | Bin 0 -> 82 bytes gfx/unknown/011e65.1bpp | Bin 8 -> 0 bytes gfx/unknown/011e65.png | Bin 0 -> 76 bytes gfx/unknown/011e6d.1bpp | Bin 8 -> 0 bytes gfx/unknown/011e6d.png | Bin 0 -> 74 bytes gfx/unknown/0123fc.2bpp | Bin 32 -> 0 bytes gfx/unknown/0123fc.png | Bin 0 -> 93 bytes gfx/unknown/016d9c.1bpp | Bin 8 -> 0 bytes gfx/unknown/016d9c.png | Bin 0 -> 85 bytes gfx/unknown/016da4.1bpp | Bin 8 -> 0 bytes gfx/unknown/016da4.png | Bin 0 -> 77 bytes gfx/unknown/017393.2bpp | 1 - gfx/unknown/017393.png | Bin 0 -> 107 bytes gfx/unknown/029f54.2bpp | Bin 144 -> 0 bytes gfx/unknown/029f54.png | Bin 0 -> 175 bytes gfx/unknown/0488c3.2bpp | Bin 8 -> 0 bytes gfx/unknown/0488c3.png | Bin 0 -> 77 bytes gfx/unknown/0488cb.2bpp | Bin 8 -> 0 bytes gfx/unknown/0488cb.png | Bin 0 -> 77 bytes gfx/unknown/049c0c.2bpp | Bin 208 -> 0 bytes gfx/unknown/049c0c.png | Bin 0 -> 177 bytes gfx/unknown/08940b.2bpp | Bin 32 -> 0 bytes gfx/unknown/08940b.png | Bin 0 -> 78 bytes gfx/unknown/08c893.2bpp | Bin 128 -> 0 bytes gfx/unknown/08c893.png | Bin 0 -> 197 bytes gfx/unknown/0908fb.2bpp | 1 - gfx/unknown/0908fb.png | Bin 0 -> 68 bytes gfx/unknown/090903.2bpp | Bin 8 -> 0 bytes gfx/unknown/090903.png | Bin 0 -> 82 bytes gfx/unknown/09090b.2bpp | Bin 8 -> 0 bytes gfx/unknown/09090b.png | Bin 0 -> 82 bytes .../{0e0cdb.2bpp.lz => 0e0cdb.2bpp.lz.53679db7} | Bin gfx/unknown/0e0cdb.png | Bin 0 -> 99 bytes gfx/unknown/0e0cf6.2bpp | 1 - gfx/unknown/0e0cf6.png | Bin 0 -> 79 bytes gfx/unknown/0e0d06.2bpp | 1 - gfx/unknown/0e0d06.png | Bin 0 -> 79 bytes .../{0e0d16.2bpp.lz => 0e0d16.2bpp.lz.86f267e8} | Bin gfx/unknown/0e0d16.png | Bin 0 -> 494 bytes .../{0e0ea8.2bpp.lz => 0e0ea8.2bpp.lz.6a6c671d} | Bin gfx/unknown/0e0ea8.png | Bin 0 -> 1304 bytes .../{0e2221.2bpp.lz => 0e2221.2bpp.lz.821ba441} | Bin gfx/unknown/0e2221.png | Bin 0 -> 445 bytes gfx/unknown/0f89b0.2bpp | Bin 224 -> 0 bytes gfx/unknown/0f89b0.png | Bin 0 -> 195 bytes gfx/unknown/0f8aa0.2bpp | Bin 32 -> 0 bytes gfx/unknown/0f8aa0.png | Bin 0 -> 76 bytes gfx/unknown/0f8ea4.2bpp | Bin 128 -> 0 bytes gfx/unknown/0f8ea4.png | Bin 0 -> 142 bytes gfx/unknown/0f8f34.png | Bin 0 -> 575 bytes gfx/unknown/0f8f34.w64.1bpp | Bin 720 -> 0 bytes gfx/unknown/0f9424.2bpp | Bin 16 -> 0 bytes gfx/unknown/0f9424.png | Bin 0 -> 86 bytes gfx/unknown/0fbbbb.2bpp | Bin 32 -> 0 bytes gfx/unknown/0fbbbb.png | Bin 0 -> 89 bytes gfx/unknown/1032a2.2bpp | Bin 64 -> 0 bytes gfx/unknown/1032a2.png | Bin 0 -> 94 bytes gfx/unknown/106514.2bpp | Bin 128 -> 0 bytes gfx/unknown/106514.png | Bin 0 -> 149 bytes gfx/unknown/1065ad.2bpp | Bin 2064 -> 0 bytes gfx/unknown/1065ad.png | Bin 0 -> 752 bytes gfx/unknown/106dad.png | Bin 0 -> 71 bytes .../{108d27.2bpp.lz => 108d27.2bpp.lz.eef1e11d} | Bin gfx/unknown/108d27.png | Bin 0 -> 205 bytes .../{108da7.2bpp.lz => 108da7.2bpp.lz.aad8592b} | Bin gfx/unknown/108da7.png | Bin 0 -> 648 bytes gfx/unknown/108fe7.tilemap | Bin 0 -> 1024 bytes ...fe7.tilemap.lz => 108fe7.tilemap.lz.12882d37} | Bin gfx/unknown/1090a7.tilemap | Bin 0 -> 1024 bytes ...0a7.tilemap.lz => 1090a7.tilemap.lz.ea4f2cbe} | Bin gfx/unknown/1091c7.2bpp | Bin 256 -> 0 bytes gfx/unknown/1091c7.png | Bin 0 -> 181 bytes gfx/unknown/1092c7.2bpp | Bin 256 -> 0 bytes gfx/unknown/1092c7.png | Bin 0 -> 196 bytes gfx/unknown/11601a.2bpp | Bin 320 -> 0 bytes gfx/unknown/11601a.png | Bin 0 -> 262 bytes gfx/unknown/16c173.2bpp | Bin 1216 -> 0 bytes gfx/unknown/16c173.png | Bin 0 -> 1681 bytes gfx/unknown/16cca3.2bpp | Bin 768 -> 0 bytes gfx/unknown/16cca3.png | Bin 0 -> 453 bytes gfx/unknown/16cfc1.2bpp | Bin 1120 -> 0 bytes gfx/unknown/16cfc1.png | Bin 0 -> 542 bytes .../{170d16.2bpp.lz => 170d16.2bpp.lz.5d6d2ad4} | Bin gfx/unknown/170d16.png | Bin 0 -> 1939 bytes .../{1715a4.2bpp.lz => 1715a4.2bpp.lz.3eaf004f} | Bin gfx/unknown/1715a4.png | Bin 0 -> 692 bytes gfx/unknown/1715a4_nonmatching.png | Bin 0 -> 1422 bytes gfx/unknown/171848.2bpp | Bin 384 -> 0 bytes gfx/unknown/171848.png | Bin 0 -> 266 bytes gfx/unknown/171db1.2bpp | Bin 1760 -> 0 bytes gfx/unknown/171db1.png | Bin 0 -> 762 bytes gfx/unknown/172f1f.2bpp | Bin 1168 -> 0 bytes gfx/unknown/172f1f.png | Bin 0 -> 787 bytes gfx/unknown/17afa5.2bpp | Bin 2048 -> 0 bytes gfx/unknown/17afa5.png | Bin 0 -> 896 bytes gfx/unknown/17eb7e.2bpp | Bin 16 -> 0 bytes gfx/unknown/17eb7e.png | Bin 0 -> 78 bytes .../{1dd805.2bpp.lz => 1dd805.2bpp.lz.7b56f7e5} | Bin gfx/unknown/1dd805.png | Bin 0 -> 938 bytes misc/mobile_41.asm | 12 +++++++----- 108 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 gfx/unknown/011cb7.2bpp create mode 100644 gfx/unknown/011cb7.png delete mode 100644 gfx/unknown/011cc7.2bpp create mode 100644 gfx/unknown/011cc7.png delete mode 100644 gfx/unknown/011e5d.1bpp create mode 100644 gfx/unknown/011e5d.png delete mode 100644 gfx/unknown/011e65.1bpp create mode 100644 gfx/unknown/011e65.png delete mode 100644 gfx/unknown/011e6d.1bpp create mode 100644 gfx/unknown/011e6d.png delete mode 100644 gfx/unknown/0123fc.2bpp create mode 100644 gfx/unknown/0123fc.png delete mode 100644 gfx/unknown/016d9c.1bpp create mode 100644 gfx/unknown/016d9c.png delete mode 100644 gfx/unknown/016da4.1bpp create mode 100644 gfx/unknown/016da4.png delete mode 100644 gfx/unknown/017393.2bpp create mode 100644 gfx/unknown/017393.png delete mode 100644 gfx/unknown/029f54.2bpp create mode 100644 gfx/unknown/029f54.png delete mode 100644 gfx/unknown/0488c3.2bpp create mode 100644 gfx/unknown/0488c3.png delete mode 100644 gfx/unknown/0488cb.2bpp create mode 100644 gfx/unknown/0488cb.png delete mode 100644 gfx/unknown/049c0c.2bpp create mode 100644 gfx/unknown/049c0c.png delete mode 100644 gfx/unknown/08940b.2bpp create mode 100644 gfx/unknown/08940b.png delete mode 100644 gfx/unknown/08c893.2bpp create mode 100644 gfx/unknown/08c893.png delete mode 100644 gfx/unknown/0908fb.2bpp create mode 100644 gfx/unknown/0908fb.png delete mode 100644 gfx/unknown/090903.2bpp create mode 100644 gfx/unknown/090903.png delete mode 100644 gfx/unknown/09090b.2bpp create mode 100644 gfx/unknown/09090b.png rename gfx/unknown/{0e0cdb.2bpp.lz => 0e0cdb.2bpp.lz.53679db7} (100%) create mode 100644 gfx/unknown/0e0cdb.png delete mode 100644 gfx/unknown/0e0cf6.2bpp create mode 100644 gfx/unknown/0e0cf6.png delete mode 100644 gfx/unknown/0e0d06.2bpp create mode 100644 gfx/unknown/0e0d06.png rename gfx/unknown/{0e0d16.2bpp.lz => 0e0d16.2bpp.lz.86f267e8} (100%) create mode 100644 gfx/unknown/0e0d16.png rename gfx/unknown/{0e0ea8.2bpp.lz => 0e0ea8.2bpp.lz.6a6c671d} (100%) create mode 100755 gfx/unknown/0e0ea8.png rename gfx/unknown/{0e2221.2bpp.lz => 0e2221.2bpp.lz.821ba441} (100%) create mode 100644 gfx/unknown/0e2221.png delete mode 100644 gfx/unknown/0f89b0.2bpp create mode 100644 gfx/unknown/0f89b0.png delete mode 100644 gfx/unknown/0f8aa0.2bpp create mode 100644 gfx/unknown/0f8aa0.png delete mode 100644 gfx/unknown/0f8ea4.2bpp create mode 100644 gfx/unknown/0f8ea4.png create mode 100644 gfx/unknown/0f8f34.png delete mode 100644 gfx/unknown/0f8f34.w64.1bpp delete mode 100644 gfx/unknown/0f9424.2bpp create mode 100644 gfx/unknown/0f9424.png delete mode 100644 gfx/unknown/0fbbbb.2bpp create mode 100644 gfx/unknown/0fbbbb.png delete mode 100644 gfx/unknown/1032a2.2bpp create mode 100644 gfx/unknown/1032a2.png delete mode 100644 gfx/unknown/106514.2bpp create mode 100644 gfx/unknown/106514.png delete mode 100644 gfx/unknown/1065ad.2bpp create mode 100644 gfx/unknown/1065ad.png create mode 100644 gfx/unknown/106dad.png rename gfx/unknown/{108d27.2bpp.lz => 108d27.2bpp.lz.eef1e11d} (100%) create mode 100644 gfx/unknown/108d27.png rename gfx/unknown/{108da7.2bpp.lz => 108da7.2bpp.lz.aad8592b} (100%) create mode 100644 gfx/unknown/108da7.png create mode 100644 gfx/unknown/108fe7.tilemap rename gfx/unknown/{108fe7.tilemap.lz => 108fe7.tilemap.lz.12882d37} (100%) create mode 100644 gfx/unknown/1090a7.tilemap rename gfx/unknown/{1090a7.tilemap.lz => 1090a7.tilemap.lz.ea4f2cbe} (100%) delete mode 100644 gfx/unknown/1091c7.2bpp create mode 100644 gfx/unknown/1091c7.png delete mode 100644 gfx/unknown/1092c7.2bpp create mode 100644 gfx/unknown/1092c7.png delete mode 100644 gfx/unknown/11601a.2bpp create mode 100644 gfx/unknown/11601a.png delete mode 100644 gfx/unknown/16c173.2bpp create mode 100755 gfx/unknown/16c173.png delete mode 100644 gfx/unknown/16cca3.2bpp create mode 100644 gfx/unknown/16cca3.png delete mode 100644 gfx/unknown/16cfc1.2bpp create mode 100644 gfx/unknown/16cfc1.png rename gfx/unknown/{170d16.2bpp.lz => 170d16.2bpp.lz.5d6d2ad4} (100%) create mode 100644 gfx/unknown/170d16.png rename gfx/unknown/{1715a4.2bpp.lz => 1715a4.2bpp.lz.3eaf004f} (100%) create mode 100644 gfx/unknown/1715a4.png create mode 100755 gfx/unknown/1715a4_nonmatching.png delete mode 100644 gfx/unknown/171848.2bpp create mode 100644 gfx/unknown/171848.png delete mode 100644 gfx/unknown/171db1.2bpp create mode 100644 gfx/unknown/171db1.png delete mode 100644 gfx/unknown/172f1f.2bpp create mode 100644 gfx/unknown/172f1f.png delete mode 100644 gfx/unknown/17afa5.2bpp create mode 100644 gfx/unknown/17afa5.png delete mode 100644 gfx/unknown/17eb7e.2bpp create mode 100644 gfx/unknown/17eb7e.png rename gfx/unknown/{1dd805.2bpp.lz => 1dd805.2bpp.lz.7b56f7e5} (100%) create mode 100644 gfx/unknown/1dd805.png diff --git a/Makefile b/Makefile index c4d9370d3..d01fb9236 100644 --- a/Makefile +++ b/Makefile @@ -163,6 +163,15 @@ gfx/misc/player.2bpp: rgbgfx += -h gfx/misc/pokegear.2bpp: tools/gfx += --trim-whitespace gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace +gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace +gfx/unknown/16c173.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/1715a4.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/1715a4_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/unknown/171db1.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/172f1f.2bpp: tools/gfx += --trim-whitespace + %.bin: ; %.blk: ; diff --git a/engine/timeset.asm b/engine/timeset.asm index f828b0ff8..d560ae817 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -397,11 +397,11 @@ OakText_ResponseToSetTime: ; 0x908b8 ; 0x908fb GFX_908fb: ; 908fb -INCBIN "gfx/unknown/0908fb.2bpp" +INCBIN "gfx/unknown/0908fb.1bpp" GFX_90903: ; 90903 -INCBIN "gfx/unknown/090903.2bpp" +INCBIN "gfx/unknown/090903.1bpp" GFX_9090b: ; 9090b -INCBIN "gfx/unknown/09090b.2bpp" +INCBIN "gfx/unknown/09090b.1bpp" ; 90913 Special_SetDayOfWeek: ; 90913 diff --git a/gfx/font.asm b/gfx/font.asm index 92bc25f25..b758717ee 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -59,7 +59,7 @@ INCBIN "gfx/mobile/overworld_phone_icon.2bpp" ; f8f34 GFX_f8f34: ; unused bold letters + unown chars -INCBIN "gfx/unknown/0f8f34.w64.1bpp" +INCBIN "gfx/unknown/0f8f34.1bpp" ; f9204 TextBoxSpaceGFX: ; f9204 diff --git a/gfx/unknown/011cb7.2bpp b/gfx/unknown/011cb7.2bpp deleted file mode 100644 index 5046cc61afe1b83264c788af711adc65105d42ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 VcmZQzU?|`LLIXYnJ_bGp1^^QJ0rLO= diff --git a/gfx/unknown/011cb7.png b/gfx/unknown/011cb7.png new file mode 100644 index 0000000000000000000000000000000000000000..36935ab8263f0fa5076fc1ca32d0e6129f97f3a0 GIT binary patch literal 82 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e6-# literal 0 HcmV?d00001 diff --git a/gfx/unknown/011cc7.2bpp b/gfx/unknown/011cc7.2bpp deleted file mode 100644 index 852606f9831571df1df6e3be5dc0191e4d4f3c44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 QcmezWzX1jO|IdH|00L18{Qv*} diff --git a/gfx/unknown/011cc7.png b/gfx/unknown/011cc7.png new file mode 100644 index 0000000000000000000000000000000000000000..a0429a3ad9b29ded3daf1dfd7625466482f5e2aa GIT binary patch literal 78 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3sHcl#NX4z>goK0*|NB`P5B~o@ ZgM(oYr`XcJU4@rb6Mw<&;$TUhZmCo literal 0 HcmV?d00001 diff --git a/gfx/unknown/011e65.1bpp b/gfx/unknown/011e65.1bpp deleted file mode 100644 index 9713c883a1efe1867b4bb28d76ea0b8c095dd564..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmZQzV5qNWU|;|M1b+bk diff --git a/gfx/unknown/011e65.png b/gfx/unknown/011e65.png new file mode 100644 index 0000000000000000000000000000000000000000..a34e82bf12bd49ec1042c0cc60bf3752405a5259 GIT binary patch literal 76 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<346LYhE&{2{_%f4V-uf2gFp{A Y!y*sf(l3k8Yy&CtboFyt=akR{0HS6UJpcdz literal 0 HcmV?d00001 diff --git a/gfx/unknown/011e6d.1bpp b/gfx/unknown/011e6d.1bpp deleted file mode 100644 index 3da14ecbee03656f2299280863709ae0318da721..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 McmZQz0D<~?00D&n{{R30 diff --git a/gfx/unknown/011e6d.png b/gfx/unknown/011e6d.png new file mode 100644 index 0000000000000000000000000000000000000000..e92cd4d6a57cbcb5cba23f1d85656ec052532667 GIT binary patch literal 74 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<33|FXhE&{2{_%f4Bd=@%gA&7z WCA_6K7cE>0Qsn9C=d#Wzp$PzO?GzdS literal 0 HcmV?d00001 diff --git a/gfx/unknown/0123fc.2bpp b/gfx/unknown/0123fc.2bpp deleted file mode 100644 index 1314e8c425612c1ee28cf209aebfedfab59eb375..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 acmZQz0D(FnL;xNhAvr~RV_i8R9v%Q8I08)o diff --git a/gfx/unknown/0123fc.png b/gfx/unknown/0123fc.png new file mode 100644 index 0000000000000000000000000000000000000000..dbf513487a7612b4569b576ad0bf1445b50d5ef2 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3il>WXNX4z>AOGhwHpQ)FQ?wB8 p`XTv`#khti@rTI459x*zxEXflOKmy)BvS&U!PC{xWt~$(69DVQ8dLxP literal 0 HcmV?d00001 diff --git a/gfx/unknown/016d9c.1bpp b/gfx/unknown/016d9c.1bpp deleted file mode 100644 index e24d140c44a7a3bedc78551dcbab769860758477..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmZROGfPYRckCDd3jhPF diff --git a/gfx/unknown/016d9c.png b/gfx/unknown/016d9c.png new file mode 100644 index 0000000000000000000000000000000000000000..56252c4233586d77bc18a02c467eac66f530363f GIT binary patch literal 85 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$#}XrhE&{2{_%hQLw@7K?T2~V h4|X)pZ2WH^z{t>gku$}y_@X69y{D_6%Q~loCIG|E8bJU6 literal 0 HcmV?d00001 diff --git a/gfx/unknown/016da4.1bpp b/gfx/unknown/016da4.1bpp deleted file mode 100644 index fc6de6973f1a80e49774d1d733f1b995d0e2bcda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 NcmZShapnvN0RR|i1{nYV diff --git a/gfx/unknown/016da4.png b/gfx/unknown/016da4.png new file mode 100644 index 0000000000000000000000000000000000000000..8ce07a03c4d61d9bfd79495779748ad17da69ee7 GIT binary patch literal 77 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}eAAjaQ?6*Dq|1-~j z`(_UXX^oaR$Kd*dG15Zx^ou*v-XQIsu6{1-oD!M< D;twC= literal 0 HcmV?d00001 diff --git a/gfx/unknown/029f54.2bpp b/gfx/unknown/029f54.2bpp deleted file mode 100644 index 4baf488894452228b585a1ace1d029614180d481..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmZQz0E7Pw436tqek;VX2r-B=i86>Yh%${7VjRLbyx;km;Kh8GGRP(A|# uPzMM=`Roi&A?g`cD4b}>V0gjs0-_$uf6nj##r)?CtWZA0{PzrBA$$N)@+vO? diff --git a/gfx/unknown/029f54.png b/gfx/unknown/029f54.png new file mode 100644 index 0000000000000000000000000000000000000000..d3ac169fcc74601b3c4acc108b4f4e11f5ca38aa GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^5+KY3BpCYFRJ8)BGEW!BkcwNXy$3lDJMge<_jHv} zJHLR7&px!ZFjd^5X`WgrN2HZ;e`?}%$Cm%Q6_QO>%{b07k-snN81tu3>os0H7T11u z`|a`GF^g`RUb-VTMFFRfS>eELL4w=N1m)e)Ym#p8x Y_)R$`aN_g-$sm__y85}Sb4q9e0JX0};{X5v literal 0 HcmV?d00001 diff --git a/gfx/unknown/0488c3.2bpp b/gfx/unknown/0488c3.2bpp deleted file mode 100644 index 6b869ba80c41701ee19267b204b8da3aad7208e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmZROkg&0-t78BF1=0bf diff --git a/gfx/unknown/0488c3.png b/gfx/unknown/0488c3.png new file mode 100644 index 0000000000000000000000000000000000000000..e8b43de992e7eb52a61919265e7b6bc02c449f09 GIT binary patch literal 77 zcmeAS@N?(olHy`uVBq!ia0vp^96-#%1SA;lh*|amDG^T>$B>F!$v>jce{h}mkjeV+ a>Z=U$tSo;7mY>`NQs?RF=d#Wzp$Pzyr4=mz literal 0 HcmV?d00001 diff --git a/gfx/unknown/0488cb.2bpp b/gfx/unknown/0488cb.2bpp deleted file mode 100644 index c48668de6ab96b838ed5e406c52786d858933f2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmZRmtFy6@kYE4+2?7D7 diff --git a/gfx/unknown/0488cb.png b/gfx/unknown/0488cb.png new file mode 100644 index 0000000000000000000000000000000000000000..9eaaadd2dc1ad5b065857e61c348637029af1aa8 GIT binary patch literal 77 zcmeAS@N?(olHy`uVBq!ia0vp^96-#%1SA;lh*|amDG^T>$B>F!$vdRZeQ22du-)$P a{=W<|rYwJ6ZE78w7xD@D{P-h2hA(plOA}CJU)lES970ENh#1MeGQE@>FR_7@7=txFF!0WM*_(mNS)s2 P)o7dV6E>_!yaz1SA-$jQ_R)sR~aQ$B>F!uIKl1HW&!7J`jmK zsF^3*yyR5Iv?ixHZY=5o!N(6htF#x2pQ(RmZ?WMMN!|2SC29+V9_;BiEPglBSc~_7 zo2jW)i`voy3v+*P?2t(heC6~a^Zwkor*6u%ya~R2l(nR1La*La^;o@>)^$(S*XpFC b+q~vJr&1ewTISsxkXt-m{an^LB{Ts5p%+8A literal 0 HcmV?d00001 diff --git a/gfx/unknown/08940b.2bpp b/gfx/unknown/08940b.2bpp deleted file mode 100644 index 215a5536e0dca0f958ddd6638d11ac4cb136105b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 QcmezWp8*B@|KETD0Fpuq{Qv*} diff --git a/gfx/unknown/08940b.png b/gfx/unknown/08940b.png new file mode 100644 index 0000000000000000000000000000000000000000..108be31b9e36f1adda50d144b12b5d9bd0c2f357 GIT binary patch literal 78 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3sHcl#NX4z>goK12|K+)vn127C Z!NFi9A-1&ri%C96g{P~Z%Q~loCID4q67B#1 literal 0 HcmV?d00001 diff --git a/gfx/unknown/08c893.2bpp b/gfx/unknown/08c893.2bpp deleted file mode 100644 index 9aeb905ce58cf1a1377f280f012367d992bbd873..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZQ%WC8+q7I|4+Z7X{_^@fH64hI|*9$5Sk`4jW!$)6MdgX+!f?Pcp(>Nu>~_!*i1 zd;NR!$L2@fg1QMlA3iWZ03#ziJ3kj6zr3)7L`BAj2`4Ph)w%wk{=ev-ioK@2w7fkZ ROh4m))&FJx=KO)_2LKcjFH-;j diff --git a/gfx/unknown/08c893.png b/gfx/unknown/08c893.png new file mode 100644 index 0000000000000000000000000000000000000000..4cbb595f7e00e5921e0fea0d60a7e8a034554644 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&Qazq7jv*Ddl7IX^{?GpK|MPzh z9)*0UZ?l(S{Khjs)aj3;9mlQ@#x+?fU(ypqd3h5ogkET!`EYRJ#Q6`|-5cxPWaPqu)1*S%!l}sS6d(2FYaJIJfD^C xAdh^kv$KR<7t1b#KY|4XX+Mst9O^%7!*El;Jul_g6+4joJYD@<);T3K0RSoCQ566H literal 0 HcmV?d00001 diff --git a/gfx/unknown/0908fb.2bpp b/gfx/unknown/0908fb.2bpp deleted file mode 100644 index 8663f7de5..000000000 --- a/gfx/unknown/0908fb.2bpp +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gfx/unknown/0908fb.png b/gfx/unknown/0908fb.png new file mode 100644 index 0000000000000000000000000000000000000000..e2bd6299c5234d2b1e221f37d9b46777a7d83e6e GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}eFVdQ&MBb@0DUPM6#xJL literal 0 HcmV?d00001 diff --git a/gfx/unknown/0e0cf6.2bpp b/gfx/unknown/0e0cf6.2bpp deleted file mode 100644 index 0e7c66a32..000000000 --- a/gfx/unknown/0e0cf6.2bpp +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gfx/unknown/0e0cf6.png b/gfx/unknown/0e0cf6.png new file mode 100644 index 0000000000000000000000000000000000000000..ac5885644dc0a53fc3921fe9d86d4b143ff6c416 GIT binary patch literal 79 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}ehE&{2PDn_&5Or|Dfkp=h bJ!WPGsb5U4DwE{ifK+hE&{2PDn_&5Or|Df9A%9 a7&bNrPYyQ6MTy01AeEl3elF{r5}E+Y_7rCT literal 0 HcmV?d00001 diff --git a/gfx/unknown/0e0d16.2bpp.lz b/gfx/unknown/0e0d16.2bpp.lz.86f267e8 similarity index 100% rename from gfx/unknown/0e0d16.2bpp.lz rename to gfx/unknown/0e0d16.2bpp.lz.86f267e8 diff --git a/gfx/unknown/0e0d16.png b/gfx/unknown/0e0d16.png new file mode 100644 index 0000000000000000000000000000000000000000..ab3c6594fe4d10d1c3725d5d0dce9c0dea481d79 GIT binary patch literal 494 zcmV2L?e^Eo`EM-!7sD0_W6AcY4}^$23X5Oy3!g_3nyC($I zK@b3mVKQ0goLV^pGD=+9A{^nJniPkDtD635)Y?~ybVAzMWUJFcYnUWbVm>C`(-Ew! zdw@-fM?@@ELaddLQCL}S2rP%r_!PdLC3NqjyB_jK-AjnC kXNrsYMsyxocRk;T9}iEQ*?CgIpa1{>07*qoM6N<$f&~lK_y7O^ literal 0 HcmV?d00001 diff --git a/gfx/unknown/0e0ea8.2bpp.lz b/gfx/unknown/0e0ea8.2bpp.lz.6a6c671d similarity index 100% rename from gfx/unknown/0e0ea8.2bpp.lz rename to gfx/unknown/0e0ea8.2bpp.lz.6a6c671d diff --git a/gfx/unknown/0e0ea8.png b/gfx/unknown/0e0ea8.png new file mode 100755 index 0000000000000000000000000000000000000000..531417385ca6f0535d72e7c98515fbf62c019c83 GIT binary patch literal 1304 zcmV+z1?T#SP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1g%L#K~!i%?U)O0 z+%OD8lcHzbL*|mLM(Z&~6e-ePJ8gnIfUqR~B#QQ?egD&VyOH-MrxR56))Rbud^~53 z$K$b$W~^N~0S4ANn}cd~VTDulryZ|!6`GwN$P=rt@T(c#&a^wb(@0mrJ%Q~cJ3orM zJ5Q{>!hVA0yp7gW?Z{A~tQ2QT^?6+c(Hdh+@$`@i)5op_=}#?(w+5R3Hj26bYl>rR z<6HQ5zXz4I>fxtO(Yd$AafN0#CaB2a1nQKD+Etj|JqN&J+uvOqnMxHgOtztJ$MdB^rCI;$*BZaU-IxC z=&n67eFV1gb>C#*?jCCtPlsoPW;Z9O&MPcS)Bq~>nat#!S6wn(+Miv-bFnDYRo#HA@g5$%1U6bK7s%71U4|&JpF#jZK1cJJ{7ho z*KHeHJ;2(K;4EHnfc3qLbVo;sf|ES~4WdL?x4Knu>TY=tbR+!^q8&uXCK@QJfO`iF zj;D3dHQj)>2HX0oF?4PCn!b_*zTOF@Hocmjz&o0SI?racxkDvl zaL+E<+@+W7@zR@|1qbenR-tM?+yPi!_(~TsCAgZG?x4c$2`(*>wz}RE5)6L{91-is zF`xUVf*CPZFjrAHhp*LfZMXxQ#5w`1(^3GNY`SFYup+aCz9-PE-mW9mN0Vv1;RG7o zIuUgSItG~Q+VAbTqd}R34jfyXjG@(Z%()$VHab_CE*W@b&^fR+5pDvYWr(QQgbA)< z>Z0rdD>h31*kwixShZ972`aVJ;IOBVC`M0Uoh{zZv6h_(gulrd+z9NW-Gd=PHMp`0 z4%}a~qo-JrmdFOl^cMF7SMs@U@*Vtt32@0r+ZmVKr8$N_91zv5>{O-`pzXXJVy)8m z7PmxEk~4&Nph?c|9t;W2?i@Z8kKt09(KPqgGM&gU>5@5lfmMudR8rK)OQ3TVM>k9c zp)sC1RvU`isDxkBX1tAjY(qp{mj2*mot3q3`YrN;YtZbZQ-aI^RBT9k0)QQ_O0h~f zCGY|r*)dT2ApsPSqe*B_8_YR&OSB4RS(Oe9|Af-aV0Dr#urj=P6=_MPw^rvmKJ<4H zcTXy(D7C3awM0LE*`<7)1n4l^Wnj8w8rhc)=$dws^-E@seT92FJX2kzM4R0f`qlg1&B>+MOsX z9npkF?063V O0000}g`$5EzV2mgQ3A#-O=%}AOu9QR-NW;E*_h3uz!I9jDGu;0odesZML>KF} zDS6Rq=z)*sI^g%6IdG#V!B@XoIhDxe_aySUjD&4P6HLoBfnEf>IOTZ^-L)rY3vxiC)oXY59e06{%^j}q6x;0glejtMqY>xY#}_jM$b&fjc|Jg z?RI=iSfM%jyZ{wjAu)JKp7eaK5XAKaq6OVHF>ge_gfH$=3S(x>0b|?0aFp_sJtBB! zB;&T}d8xKc2I>|}*sV*t%PyVQ76rQQ$2ZCgO0(xVskV=;c4`Tg#&{X!#`px~qj^FI nqIq_LN>eOjOSG2a;=g&H+#YIU&;win00000NkvXXu0mjfgAmFk literal 0 HcmV?d00001 diff --git a/gfx/unknown/0f89b0.2bpp b/gfx/unknown/0f89b0.2bpp deleted file mode 100644 index b53cb72348b19440850901e5f43b71139d96f7b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmajWp$>yE5XSK@O$CB~^zzOIP?rOFa0ie*u%s(^LfHe()=F?pV4_>;ACV{J-wlhXAb hf9MFzfkWEt8vUouH&1 t$`*a;*0e7Ntq->B75Q^vcHR}KpNulor}Zk|)!7bmou{jx%Q~loCIIzopr07l~x=>Px# literal 0 HcmV?d00001 diff --git a/gfx/unknown/0f8ea4.2bpp b/gfx/unknown/0f8ea4.2bpp deleted file mode 100644 index 93e0572a7c291c52d8c591238825f8b84e998a75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmXxaArb%~2nA4%@S{gC8a)8f$We@(%;sr~8w^Bt(b+!(%mav2`ODwwI26?y5g;c( n&dlN7Q!1ra5g@Dzgsy949wW9Qs&T&`ceZ3 z^Gn0NdCV<)luAU`cuiMp&hTma#mLY*&9ujwyG2T`OD$Elc)`w1S3fU`OcDuSvru=V q{NwL));J=d#Wzp$P!Vkuiz@ literal 0 HcmV?d00001 diff --git a/gfx/unknown/0f8f34.png b/gfx/unknown/0f8f34.png new file mode 100644 index 0000000000000000000000000000000000000000..e02b91ce266b7356f7212f90b0c1e574d65e34e1 GIT binary patch literal 575 zcmV-F0>J%=P)D3x`%c2HGNu)o_V=%=zjyastb&UhJ^aC3CPj=(qRuERzMC%-n=FNGeour z5EHOF2}6f0fQ`Gu;)yT_*vx|=UCX7U0wASX(`K0S0CL)`z^On}!S1^x9Jt6)WCKwR zD@#H%gs&XjfXsm=de>d&XfqM^Bo+nSWmZ9BR-q^@G3Z6PLco0~%rGB7{IdNIKo%8d zXcK3ANMZSy*8UD?nBFuT45bQ?|Bx4okfI*<* z#$6dL^TP#Dgq?Aaz(zjgmu2j$f)SwGz&S3_tyaEw+_gq}3M~Ey+R~>^yM_SASzB*r z5cxXzUNEiM-Yc5n-C_hr74sO(nnW&t9rdX7z|9>_EIM=ab)5A;|7FDXO3U^Ez*4El z>87>re)8RjW19-tnoX@g0CZpn$Yr#e;tgZRK?R7uqXx&BOV10m0DA5aovHI+4hBBq z5%2zXI!3P=z`y&{G2$bMI5bxkc39@vQ7HCU1sJWt-&o0c{H?^I;16pvKMVz4JHh|} N002ovPDHLkV1gkD0($@e literal 0 HcmV?d00001 diff --git a/gfx/unknown/0f8f34.w64.1bpp b/gfx/unknown/0f8f34.w64.1bpp deleted file mode 100644 index 7209b2608c97bda25c93a22228520f98dd86c1a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmb7AA&cBl7#vQ7im-&L6``!CI2lfqM+wV{r;f^{I_jy2P_aZjLa91YDo*q_loi!S z)Ki}dD=I?8QBJKYE6a-I(fN}50qw`aWF|B7eOZ`VB#Pi7qCfa!2;t~)9z+k8nLyZ2H8ZQ} IJF*vl0qMZw>i_@% diff --git a/gfx/unknown/0f9424.2bpp b/gfx/unknown/0f9424.2bpp deleted file mode 100644 index de5e586094222da412d98e1640f99f9a054677a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 VcmZQzU|Tg=|2+A j7c|UoY?N&I_n)0%!gkJI&NEIlf;4!#`njxgN@xNACV(A_ literal 0 HcmV?d00001 diff --git a/gfx/unknown/0fbbbb.2bpp b/gfx/unknown/0fbbbb.2bpp deleted file mode 100644 index fba5d65c7f30c90dae8661aefc4bbef29ffc9001..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 Zcmb1;Ffed%V1NS&31ee7Hx3S%001rn0z&`* diff --git a/gfx/unknown/0fbbbb.png b/gfx/unknown/0fbbbb.png new file mode 100644 index 0000000000000000000000000000000000000000..60f319eb3e8f2bad4f5b3f328cfea09cc2ad1ea3 GIT binary patch literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3f~SjPNX4z>AIaxGJhVUj^FPo3 mKtYc`%!hv-=K242;!(ym_A-|qWz}_q6nnb*xvXA;P3zr92@|Aj}w6a diff --git a/gfx/unknown/1032a2.png b/gfx/unknown/1032a2.png new file mode 100644 index 0000000000000000000000000000000000000000..cdf1bd11816ca8db9b3172893098d6454b9bad94 GIT binary patch literal 94 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJRZkbkkcwN$KloXA{{P?4F1Wf- rFd=fmuHXO9|4--mf4*lf!$~HFuMDP|bvHKL25Izk^>bP0l+XkKXNMiL literal 0 HcmV?d00001 diff --git a/gfx/unknown/106514.2bpp b/gfx/unknown/106514.2bpp deleted file mode 100644 index ee0c829d2cb60e2b299547407c7623233415d499..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZSh@4vzRy}|vA9Vr_UfRN$;e=uTzf&ZU)|9t29EhekR%LarXHOLSoh73V+DH}3& j7~Hpi?+-K$W(?3!pvesXL2A`_#bkMY|M~ujm*GDEe;6+{ diff --git a/gfx/unknown/106514.png b/gfx/unknown/106514.png new file mode 100644 index 0000000000000000000000000000000000000000..faadc6f9c45806e81ced39f4144929c4fa938e36 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QZb$`jv*Dda?fq#Wl-c{cF;d8 z6TiInq|g+Ro(X4ha$@h(+vz)gj>sVL4KWSXdlZDJ(23QU+O;5Dqy~$qANM zTqRfe7aZY`U?J9)>1_N1t_b`2eKY&^me^S27+&6dJM-qpdovTnXp<78n35t~~Asu7%lY3N2nX$B96&N z7;@JQNoPnLp+Wk0*H`H@xdJt*H!4v~UgvZNTYTHZ;_uOKkD2yK%2#w?-+Csm@g{2I zBv-y7)ksDi;W~EdAuGIu^R8W^MYlhuH<9GJr4XU;jxEozWBP|UVy;IxtZ4cPxBrLl z?c}(NM+F5e|6YIk60%b)!XX=FCj0^~=`To?Uyn=COB!=`?|KiB=aNvTiuJ0Frxx8s zk#B@=_Tp{J=jMEuuQ0X~8My{uJS)z-mD~AMl-2%kmmT5#(q60YHe;&Ri?H55+^_KZ zecVpuo3VPu$fsomM4U4NP8_d3RpOj){~1pTa{LK_?-<1@b1L)@|YpY!}>aeljy zpIbHVS!Hh~>djdRb0Sz=a@sCAJ!kCXyQE+EVzYP`4{)Eo9rXUUHZ%OjPn%Fary8u5 zF0p2o&#hpwgATuS@Rsxxuki!#4bQEzU diff --git a/gfx/unknown/1065ad.png b/gfx/unknown/1065ad.png new file mode 100644 index 0000000000000000000000000000000000000000..106c712dd4cde403a0d0dab5f70e1f108fc6e527 GIT binary patch literal 752 zcmVaXmo?U^ruL#8zGQ`c)6Oj1GmVg6atu?2WVpfC$FeV4wEExC!;PAt8y03iNy6>{x*&QO=Z+2ELi3)Tv`s;xKy zhAZ%grf9LwATkGjAmiiIEgkeU#0Y*^86TtVQ|_S@>=xL5Dz@2x1>FFtCxA~= z?!PxfM&(9$)|aLWrzj{Ol+)n|Qrq%-CKGUL{G$b|vyz3Z_86WaVmk&F0s(D}hl?4# zL6gnm4)~bWaIy2q`E#B2_q`M5CS34fUBVNfRPrdh9+Uu+i4C1~s?4v!R3#!`gDf@mRTsqo0000 literal 0 HcmV?d00001 diff --git a/gfx/unknown/106dad.png b/gfx/unknown/106dad.png new file mode 100644 index 0000000000000000000000000000000000000000..7261781325d46f223be54456856093e53fb476fd GIT binary patch literal 71 zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<@p-y9hE&{2j@a78D9yxBKZ9%G Sp4^)PAQhgjelF{r5}E)N^bx)Q literal 0 HcmV?d00001 diff --git a/gfx/unknown/108d27.2bpp.lz b/gfx/unknown/108d27.2bpp.lz.eef1e11d similarity index 100% rename from gfx/unknown/108d27.2bpp.lz rename to gfx/unknown/108d27.2bpp.lz.eef1e11d diff --git a/gfx/unknown/108d27.png b/gfx/unknown/108d27.png new file mode 100644 index 0000000000000000000000000000000000000000..db774bf282a24953839a4488d9cb1a53e0344d87 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9k|DV{ElAr-e`&+g_uq9DL>Vd9)v zC(m%!A`i_k&CJsij!(bLB50KDmVL!js6ZS zrN{f$2!=Mlkjk^3dGS?)`G?Kh*D$aB%4-*xutfQ4n0rP>V)(^ZOO>XoMjLAAtxeK8 z#QOY@*@k%$6-kSe+4Vaf{?JpqEu8%QNbN8Fbn6eyFUxlIclk)}0J+oC)z4*}Q$iB} DNQX}} literal 0 HcmV?d00001 diff --git a/gfx/unknown/108da7.2bpp.lz b/gfx/unknown/108da7.2bpp.lz.aad8592b similarity index 100% rename from gfx/unknown/108da7.2bpp.lz rename to gfx/unknown/108da7.2bpp.lz.aad8592b diff --git a/gfx/unknown/108da7.png b/gfx/unknown/108da7.png new file mode 100644 index 0000000000000000000000000000000000000000..da41217d8a3bda683e5c4ca52c70a718078698bb GIT binary patch literal 648 zcmV;30(bq1P)8nu5CGt_1qX;08Ga1Egp;vZ>O}!+AaIrr(Vj7gP}PGo1!&_MUP_=)VBJ%w8ang= zn%7VUcXGhq9Z6YI+`m0U2s^w0ahsa=BDmm*ysH zBcRs-FrVM39O!!)Naxcgonr>iz5Jdb@=@7@UsEw+cy)2&JhKnT}r_i_!q_k*FyoG&da2NUJaxeK@H^Z zb)qp@1i%&lm3&e#0XUB9R4@=-K3{SZ;3UCbWysV1B{c^fFt734! zx_-Jk0xFe@!Eg?62<}k&>sV?;z~c?zJtkEh33w$zp`_phoQ#1FSBJcdNdF#cK(Bip z)PYOrX?sO}7RiJ0Q;>I|i!4ga0GRxBkR3jQGK+#g!?rgbHGtofg^A?$-i_Rrz1s4}h@F%IVX)WBH%IEhC+?#a`RL}zS+K{wC{SBgL i@TCP>zrYLp7JdQN(1*}s+i3a#0000VRbDG-MQ?)Hg|39lW?l7A#mMAeA zPo~fZL+rgi_D&ajs|~$YZ#2>Wq*58OR48JvRG~kfuQv)@uD3h#!|`-RzS-{f$iMv* zN`_IX=`qqzqh(p0p6eD literal 0 HcmV?d00001 diff --git a/gfx/unknown/108fe7.tilemap.lz b/gfx/unknown/108fe7.tilemap.lz.12882d37 similarity index 100% rename from gfx/unknown/108fe7.tilemap.lz rename to gfx/unknown/108fe7.tilemap.lz.12882d37 diff --git a/gfx/unknown/1090a7.tilemap b/gfx/unknown/1090a7.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..6f4843dde5649c500c4ca1cd13c120d8dff01e27 GIT binary patch literal 1024 zcmdUqF%AGA2m`x{BLDxb$gE{B#&{z~0|ov^gm(~!ZAd9!d(_J6;nX*W9k}hG3Rtjy XBYbyk=T(jPnMysmANj|A-8`KR`*{Va literal 0 HcmV?d00001 diff --git a/gfx/unknown/1090a7.tilemap.lz b/gfx/unknown/1090a7.tilemap.lz.ea4f2cbe similarity index 100% rename from gfx/unknown/1090a7.tilemap.lz rename to gfx/unknown/1090a7.tilemap.lz.ea4f2cbe diff --git a/gfx/unknown/1091c7.2bpp b/gfx/unknown/1091c7.2bpp deleted file mode 100644 index bc36edc73afacaffc9617a410c6ece346344b254..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZQzKn4E})+K_VouQqfj66SoeREwK2-ft}^jQ4(@BvjdChyPTe+QAF{o(p%WQeH) zRU|&)-otwj&wqG#@!8GKXMP<2#a7*3-Ts-sygPmNd1Lv a0Q8IFhYx>j{_*`|`_KHJ8R(ZLbR7U5JWF8! diff --git a/gfx/unknown/1091c7.png b/gfx/unknown/1091c7.png new file mode 100644 index 0000000000000000000000000000000000000000..8def47f767e758fab0d63c081e452a4350acf100 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9k|8c!F;kcwN$KmO0pPQBLj|G(tF z|MpvqR!g!!K72~2F65Z}HHK<~$M(!K7-nrY;Y#AWkbF*Bz!B&MV}NyG$tFMQ_18{P0~1Ah#+LZ01*EK%bl@vFle{~X<#b(P74?TqB| eur%F&|K%ATaqRx->9zj~$UUB}elF{r5}E+Y9!4?% literal 0 HcmV?d00001 diff --git a/gfx/unknown/1092c7.2bpp b/gfx/unknown/1092c7.2bpp deleted file mode 100644 index 05db6cf132135c8d69ce2aea3cfc8a6fbc3b3bb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmY+9%?ZLl5QQ@gWN)ScA#Df-(@N|>kAmzE0lis*wQNpl!o!LUq#vTc4|aQ5b6+)0(?}RIg$19LxE?S9wCQ3c0_6`zu0|2;!0sVshjW zv@`b5J&*k^l%q0My9n3za{Fx6SpGWRCr2~ykPBv0U7HhmvSeikWz!Tlgaib#gO=HH If&A|M7vRliNdN!< diff --git a/gfx/unknown/1092c7.png b/gfx/unknown/1092c7.png new file mode 100644 index 0000000000000000000000000000000000000000..d48a5ee51097c0fac220dd2144fb01d074a1747a GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9k|Zci7-kcwNq=Qr{m3gBT0=q}0p zCt{*=P{dI~`HqOk8HZOU6N~0O(iZ;9IDuyyE3Zgl;@(r`V%c69h8xS2!j4}qEcrL+kzhQk@vCeKrQELv!d7iF*F6*2UngATHODg~X literal 0 HcmV?d00001 diff --git a/gfx/unknown/11601a.2bpp b/gfx/unknown/11601a.2bpp deleted file mode 100644 index 02dafd2f7ad315d73b2784190abcc1e5887495dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmYk1Jr05}9K|1kk+8_f*wG_6nA9Wm1jf-gHBL@^Y>s*hE@0w9;0TP2BrI%p?Dn_C z@bO+=n_tuB-{&|h*V@~x2Lq{*QoinWAN7$vpX0i|&hK-S!a`@Ti6nenup4*}4>tt3 z8fHvLAy08e1r=SZ>IaE!}7f?F#bOcW{v_Fw~(Wo&^RlY}DlUe^eQaF(hC9zSmM7f+rw& zlp8|2x)k`Ga{Ul%=YMI^v%nAfH8~kDI0*=j%UNq4vN(d#C(;LF1#Onf(B>Bjju^`q zOwE*O${I~gOt*vpY$V_oi=vhknIVNGMwgv33E{mq!h0*lMp!%PmVHq)$ M07*qoM6N<$g0QV>2LJ#7 literal 0 HcmV?d00001 diff --git a/gfx/unknown/16c173.2bpp b/gfx/unknown/16c173.2bpp deleted file mode 100644 index eba6e28f363ad7e62faf78c61c9675596b39a0fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1216 zcmZ{kPfXKL9LImJEn2q0CW%QGm9E&}G#oe}YNA`W7{d|{9K3i?AP~72K@XsW(C3^i zn)r__afT=%@kopzBpy6CodFNvym2vsWd|^lu!TfAD68+Slui@hH)(&L_xrW)`+I#U z!2btAEMsOF*3Dn*9v;)G0cvWm_N)nS`rgjWF62FPrFR1WsgzY$`L>i{R3gAXjN@^> zN3E#^U|Cwo>AU5-`4B=t)_1x@PtZ3S(xWA&Sf!z*mU!Ef=b{t{7awS-z^^w!Qt$BaZ7U&zs02Erf{Ljp6$h!GayO>O zPob28E11k;1II7UUu1Dwxv#9stHduLvac1RSVdNk217xg=yAFbqoLx1K)Bxbbx9VwjFGkx3)`XlKS27XqQ8EGE)2(h^#IL7D!gsh^53_Z@nmWJ#?H*uw>{_=d z5EFZ2cH!;JbpKE9)gF4T00fa<>G^y&Fjpes{+Flo08-YxTi31?8qxDuQ`@5glux}7 z`fTMfrqMTf;&AN9q{H>fng<9ro@*3+HqWJ9$ z&0hIJ_^#XL-Rl#*25<9ZXjyt(;eLyoZ%K1@Ui*6XYrdlXXhUn{W_?9IrbqR0RT+$& zi3B6oye925W}27IT3nJ0`9p7D%HrR|^H6d~u$Z`3^6k1}@o4zy?ek$_zt6rz;l*a6 yFmB}+(W0~{Jq}rH@ZYNE&TWzZiaB)dhpZ7<+%KrEKnX7L}ZR!=qn diff --git a/gfx/unknown/16c173.png b/gfx/unknown/16c173.png new file mode 100755 index 0000000000000000000000000000000000000000..d54b68cdf4b8a6f10975dd5cb81f1c4a4dcca8b1 GIT binary patch literal 1681 zcmV;C25$L@P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1|~^FK~#8N?V1a2 z961a`?Y*OYNav8deoiVV5G2L^%?CRV7|e7_B8x1k$4>nI?>BFEhGp*v$^xwoliuQs*ML)V>EACy}Wd=?Q(~f>NBQxFi zF!OW+DdOwv>(AA1Vi777;@oHB^YioPJ*&@+1m>P?TxfX5n*= za>&3v#%&ePdWbouWVv)|_L9Zy>b%m(-3B5md;Iyy;r zJ?Yt2HXAtEO_@-MWDKgbRs17(tg{RhSzW98v-+wHv0{^fnK1BO78?}DAd3N2{G&uY zXCrfBeXCwX6G5@2{PX91N!45uZV_BH@GA4jE68yLs+rpOten*2^~N#RCb+*v=ja4h z&0Xy%?rCSrye!TZ^QsMy!CWsd)95fii$Bq(xUtr(HjP20NxfUKH1Mc-zCIH*HBZf* z6jf0*OH@spXzc3E)}Li!`v~oXBLJ8aldI8jeH7EhcU0`Em=&FQa5O%63^Y?C_tYobw7hJwtynyQH~(dl?Bt*!c087x-0O9Kg9EzS%QnfQz@ zzH^p&JdReNDZZ-5+Z11$nWXWmPR7wuQ5sl@UKynEm^6y7;yaV3PayXyALBGJz9u?} z?~l${t9lXdgU8Rtq0=z_H6l{&3Kh~NW$mglu_=2wYZG)-jTfr5s;4_)D|Vm2Y`iPP z#jnhRRZ}Q>@|xs2LblPmjhEFWjaAKE4ZBa^)pWa+Qaw@vh z$J(he#OY$4#Vs~UMQPybIA`NsA@|y)oWzxh`bjgsrr)2;_4>M6nH!P5Yz#X6yHDWi z3whPFThM(MOhSSZ?xRLWVm`&sbWC)1 zwU!2wv|6ZLnT@-MF7b+PxAIt=(ml@Lh{g#Xzca8p>5O+9tbK%5#UX^o5I9Sm87%SL z#&9sHYksv`#U#fH@~`qhY_hMBj;v2w*X3E&(HdA81f3y_Wd?VKWKwNZOz5Nq@#sd8w2$LRk936v%A1lb&2YfPdkXv<>|)TFA|NX%VP892@3MnJ3; zVh$gxdJ*GRjQ^yfO4OO?A~dG?aqgL9d9OnCfO^#BpP1({SKRe)V&dGhPy;HxXAv8{ zs&BHfV$2nr3y8K^AkuW&_1)2X#e6 zs-m{y<^gffG;q@7nA6u(dZO+v>^2ap#z)aU$HyYfg*`@QF_rr$#D=a_U7eFY?d6bx zVj?iksZQfFLTx%hUCqMh9OV=P1%e?y4q{QDqV_&I9tAccP#<*0Y3_+FKi5DfDOIMC}-D~3A;|97w<%oz_p5ubYm41mo?h+ z#<*O^@os)bmKS2I4A-X^UCxOfF*eXe@;P4nJ0fEPovFBttdSm{*cw+J#x;j~)qKD2 zpMevhQxWHN>p=IUot(VlDU;qUj11(MXTk(y%n=CVF%lasBwPh;!5b;OaK_L>+^9kK zviUJ)L|V7@B11K}HjoD8ny~p1>Vc~yG^i_74P?A)Mn<-VYqYpAnv?0x=KJT2EN>RO zL+h(td-^gmunOj)nd1%e9UY6Ciep_|OOaUvV$Ky?=PPfeJ@&%!F>?AzbEbW94xPXV zV{x48*eD6j##XR47D^1yyNbJYK4f`4Mn}vCT*rHR`ttg>&?jf}34HNbybOGDUIsoj bZ*Ttr*IDyNLgjQW00000NkvXXu0mjfIsiBI literal 0 HcmV?d00001 diff --git a/gfx/unknown/16cca3.2bpp b/gfx/unknown/16cca3.2bpp deleted file mode 100644 index 487a2556d0e93e735f6b11bd58f5fed40616b1e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmaLSJxIeq7zW_4*Jxs?xzMRfu__{hgXdTf45fpENTHj9O2k>mh}zaBLWhC~E>4vW z;vzUWNhsP%yNDUYSwYZE92}3toR`YEcrW>R_%3-90KSUFd5s-hvDoVJUVf*roe#&5 zNKB7EwqCP6*XwS%ZM7@hkx0G%eB{sI2)AYV&F83vEW}+ddriOLucSjO%E$;-Fit0W z&#S78(&@u+4p0sT*VleH2f!E)oE+Wm^Zfv0W0#{WJ%4?9xihEw}5o z+#41dJRZr@*c}bKSSRaah2YqxX_I?WWBKiSf9M8%@=xEcN?BMRSs)Ai>EAx|UmyF` G|JFCQnbIWy diff --git a/gfx/unknown/16cca3.png b/gfx/unknown/16cca3.png new file mode 100644 index 0000000000000000000000000000000000000000..d5ad353d8abf9ad03a71f9fd73be1de74902b4be GIT binary patch literal 453 zcmV;$0XqJPP)F}uUx3D{(#@m^G@-xGQc_?K##2?NHnUl! zR57#xLz0_nHnZuB%6E4OKpk&%cgM$huP<(QR|(Ubvf_zgQk|8+G}~|3 z6CYMEWs0v8?t6+WjHFr$Eul zg~53cmP3?bX^V82*j8Cvk7=+qiF;(YahzpQh6ph{EM&Iyya?XMGK(PNKm4c{{JvQW zzwgb!#!n=;q~2X`E=||HPH^nx>b0G#;x!5Aua`6~014`Sbg>PXojl>< z2;JvG6$u?~5RkwWZVx!TGPlY-;lMFYTZJlsfoJ9bTQ_;)m^r|HG)Vxp v^<@$8LlLl$1J5CgY8vmkeX^Qjt#aTK>^V6Q&dDrG00000NkvXXu0mjfPEE~w literal 0 HcmV?d00001 diff --git a/gfx/unknown/16cfc1.2bpp b/gfx/unknown/16cfc1.2bpp deleted file mode 100644 index cc9b9a87e586e5f3afb34b2a0a16c0d0a1f31438..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1120 zcmb7DO=uHA6n+~iSp*>`6(I(4>PgT;Jf!aAP}qydtg)w1(H0~Z52b}}oY+GPJ$Msp zMd&eZj$R6drqqiU1y5c=lkP=N3W6jglUd)JnGI7t`95}bzxTcOX5aiA^W%Teyn z;f}~6l9A?SEKtrli#@~D3sY1Mk`d+X2tPD>>WA372tT|C6F;jjfgnUiW~9LGxdLMq zUf~S8HSx3gsJh(|EtTC7&1QE*I>2&cxsi^5$JqtaSauRHgSNF?4_CPMGbB^Og zHNXC?xpnWfxs{JKfBPs3_MfzCQK0$WYNz_{L8rR6s`-b77tdd>;P*r~}V@%-M$$`w3;3|S*Y>>|eX<=?1Hn1ul2V+!C&qlE&_yISuDqWtT`|HZ@ z%R_hQ>i=6j3ZiN!h!&4D|2ki5)AQw)=KtHT&KeZ@tk2F^&)g4vBdL9@XGaq;5u2hM i_Pm~VhOu<_NmHiwUmx3YSPnNamhLX;6mNrc8-D=PD&r{t diff --git a/gfx/unknown/16cfc1.png b/gfx/unknown/16cfc1.png new file mode 100644 index 0000000000000000000000000000000000000000..390b107fdaa0cb3429e12536ce89852fd139c1f3 GIT binary patch literal 542 zcmV+(0^$9MP)3 zKWidE6aet&6%o>0mBx?Yr?9p)v)~p<g^8#PFMWq8VczKTcY zJw>rm(IzFW58tow@8u`NqoeK5D#n26R}zifAE?H;m-}5;(Lkk;T*}a0%qP6T+nc7{ zO_WNJ4-Z;TXU<{NMCPe;nD6IfA}4!4Rf;I3_=V^j3oEy1^VB4no!M-f;%yqOjlo7P z&yt--CMKO(=d86a$b_Sr%e^mug4Jn~V6x4wugg9hs{T6NETP$Evpyybzgh3M8$9g& zmZHlxSIlJyyDgs9w*|2*@i|*y^iD|03!oI@3zc306(H`2%bM|9@@6ub#ffozKi2ic zM6EF@6BA90;>2?$pN$jaZ?!qmF*|K`K{ott_inpSy-(RuY9Pdi*YKZ#kT2Tg{{|D2 g2feBdl4>6K4{%nF^)ghy`Tzg`07*qoM6N<$g0q4G8~^|S literal 0 HcmV?d00001 diff --git a/gfx/unknown/170d16.2bpp.lz b/gfx/unknown/170d16.2bpp.lz.5d6d2ad4 similarity index 100% rename from gfx/unknown/170d16.2bpp.lz rename to gfx/unknown/170d16.2bpp.lz.5d6d2ad4 diff --git a/gfx/unknown/170d16.png b/gfx/unknown/170d16.png new file mode 100644 index 0000000000000000000000000000000000000000..2832fdb6a5cafc1db98c98ba4c2e8f233657e927 GIT binary patch literal 1939 zcmV;E2WP)(#cvo_N<=iiEGgM=(#ZzcmZv4C*0panX{NCmrH?fh0W(0&Cz#l$N%eIb= zoh-}*5IM|7z{9xhaTr zBYREZIqw0k;r9iwHH52@xSbmT(b9~A(*OdnG{>5>OS!J(ub84)batUAwqnIklq=rsUCVW(tk`n$`Rl6dlmdxdw13j1_ zbA2YBU#r;;(Ckt1hyW-q7YX3i>GuKYGA5QcW~1#a0p3!{o$Vnxkpn9&R(%7W3v0r%<8O$5BLE3X9VQd( z&d)44hiuMU6h~WWjvU*m$4Q=|TPTzlEgXtQdT=g)ESD_~zes=!^!au!dCx)W(?%M! z5ZdSGU!`VnXItw*(g2b~t!ruV)Hrx`?;Ym}Tnv#6WNb~skG|{65*?zvbANl+1(V2X zOcz}M-3utmyvXVi0HO;3Wc6T-1EpvU|L4+Ja1th|iWXafo$ER{^eUBjh3@PUU=Xg_ z#AY@-0M&SBbOLlR`B!kpOE;M=0S>6f9yi$s@S)|GHW%@VrSv2EBhtw`Bsv-F2RxwM zeFd%pAPp<}F#?1lpy;5a_M^Te0XWdSTZxzOWKAm7eh=76kI72<#L$;pQmOX4D{jQ` z{YotIDFCSbM|*&4g%Mc!FiBFro(59h=!=eh5 zv@#Ms&J~sGqULoaoahE)MZuO;_hwg>7YqEnp!7vwfn|M>y?KvJ<{|w`-0chMGz8JN zw30cI)g`f8cE)zXkA$yyYSKCWYS6vqkV8CfMaw# z#3dY=pAJyPf3?f|2TM5(fpi6mkIh z*2v!=Y#KzqJ|mf-0zkuQn0RUQJRMAgd&?Rlr(fp}RdSYcn2hgL1bIj!VUE`M)SBE* zRnl*3rI-E;&DrtQ!QzYMqP>|ZPB}GKA~{44-7XI4Ds(_-RXW^3n_?#F_OQK`M5I$k z)xExbDndGvHDs8~R9}jp<7op%A@0hx(%C~j*oYHby~U_=T^enBKne^sq*xx)l||1i zBoJhwdx0l}xt1@uw=q*>F$|)SNS=|Gr>6+h=CXh`G)j{wqM4=RnwJykACx3ghU=mR z_cF>b3``ofOR-SBNC26^aCNIKQrbn62C$aR(A~esi2@mkXpY)KmUI7gR&)(N!4r}) zsDI+*B*&TzLJ<(YHX$oeknix+^6Rfv*9tvQ;HjLoqABSUn^)r#7Cu!^n`q=5la!C; zIV9qwRc1JO8|OlHj7%i zgFn$}RsCB|ZYOU6`GxP&KLB`2fTH6cyj0=t0OZvjfPFXpe+$z)09M}t7*6j1#O8+q Z{{y~ywKD}1Q&9i_002ovPDHLkV1n;gg+KrR literal 0 HcmV?d00001 diff --git a/gfx/unknown/1715a4.2bpp.lz b/gfx/unknown/1715a4.2bpp.lz.3eaf004f similarity index 100% rename from gfx/unknown/1715a4.2bpp.lz rename to gfx/unknown/1715a4.2bpp.lz.3eaf004f diff --git a/gfx/unknown/1715a4.png b/gfx/unknown/1715a4.png new file mode 100644 index 0000000000000000000000000000000000000000..3e1c0bb4689ee59ba8c8d8c928c31086c98114af GIT binary patch literal 692 zcmV;l0!#ggP)mpNrh5Tph#I>0$o9Iy-&JSrxO@7d4Nb%AqCQzCLjgH zLu0JmW_Oqw+lj?Fw5+0dcIUVMoi9UO3s0u0K8`{gNKdF~t~hAU0_8^@DxGG-rABALNqk(xaiN9e?BsG; z0pLj+C7a@k6g5qN6)rY_{iH$9?lA}_3-S7S=^GvEB&0f{=E$S af8YaZ0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1tUpBK~#8N?VAB^ z8#@d{o!&7yWOB&XgL(>rAf+Ltb=S#0z*t)=k|Sy?`#ZmHzwg{Gw(|A$b$fq*f4q8a zem$;-gQm?;=A0dxLvtKBF6F@tQk1TL!5XQs(TPNdJ)$+Sgr5tvue9_3YQ5kJ2g zPh^9zfWHE}c;5g;*l13a6WH-tjqHAu*OSF6>r%95*!)T@z`U40%db*8LA=mR2!#@L zfgWX%YHrTswUS$z>rrAj$FIS@_V*%?C(32VyR^T9WQ(&{amqq1qlGaSuWA!~T!l)b zD|5Z3NShzCucKOienpR`We{I5S`@+D(fx?geBN7WLPwLDzoLU07*km{u2HQlM@5&V zY>-Z&YD~7sY#gXH?7UIF2&IOq!`AM`boE!_PG^wnqAg0Dj(#$WJu6Bchtz@D{Jm*C+Zq1`iYNGY8~=lF)Yk0V`hTveWebubA9a* zQ4Jqg(LvN0)Y_%JyWSaPg8)Sw$JB*HzN0cWU@4|f0V)IhlNMlB((T``jm6|?(6w}d8N+*afgx5*~MyTSM zvy!_DHAU;~(9vG0#k`T;u4YpHh+#on*e)KADyxe)f=tshwT^1}dw6a4V3*G26J!@V zbNv+9vm<-A=W zVySL;R6oP!hPEgUhViCZ0X3pJs%DSvX=VV9clvK>8-(Tnw&|X(NsfYMq5+^SJ27^c zWM%@~uNcLf1F_yDetf0>ErY1$AegI)RPse|;}yIqV1y$~qUr&axqv3%gZq(gpAbKILDns4V-KQ?T>u2IScL7~of z3IE+?MAWDewuv*i`6CnTFb9Zq*|pjG*_!?QXih}cOc`5GkX133tYIF^VUuTAQ&dfW zSQV?s>WkLI`y7wf!uzU>8h*mD9tMH7*;U(LEiiZK6KHp3G3! zqnzT%Rqc;w>2EQLN$^;4Fo_!8<;c^+q8P%`S<}cUJNmxmk9EL{;rI?0AAxF;#rDW1 zS?Q5C$qr+XWrL8BNHpmcO|q#qQTcd@c?lq`9jdxIrPGe`aZ#<{#W^a)eb>QkQ zDkvB%kTNPHT+T+-RMyy#XY3sj5<~1TX^>$0%PgN^&WVD^sgJS6oiNQSA(=_6uq4jx z=k(s=1fPyE`IA|T5EZ$Bpx*jQW;SZNXPojeW*@9y@xX=C5(n~_8@Bt|JseV2t-m`V HM*P7S0Gds& diff --git a/gfx/unknown/171848.png b/gfx/unknown/171848.png new file mode 100644 index 0000000000000000000000000000000000000000..f0c0f64e98e7054574abdedc1ae74358005e9832 GIT binary patch literal 266 zcmV+l0rmcgP)46sZTlGXtWH#X&P z&r>k~7+&G1g=cLlA#q_8U9(vQ7A%}q@S~`c@Lg>HkA&BjE6n;ZdJP21)&>$R_nBag1K{9AK+$}WVA%iKMf(SvA22aL=P#|>aYSO{~ zM$=^x9z7Hj3;~U%Q_vvJy-&|q+aaILNl)+Hd*6Nc?ug#Q{SPA7z0^32==IXHr@5c&QO4c{LQzkR#BL~=wKxUTPqTlhY_wry=; z+pdeaPRDiA)O9-@o`opb>@}Gh8oSJCYQFEDwgyt;iP^peQ4kCUQse$U2oUSKK>#mm zz)lh=o6X5&wNeUpn%Z^{SeBGY0^9S1h~qq0%C=!wRhCuN&YvW(QGw%?k`nc~I_F0X za6*MFgJS!3mVwu5m1Xm}ltlrKJeRAX z9`7tx%R8`b1`BbhhbJm=RU*?pcp~59qm=8lQi}y55nmK^o>Cf+}+_!fdljKJao4Kc3FrhLQi~zH1&OS`=JkO>-VFm z-#6+e2}ofzK&!=?w^~Hlo$(mT&gW1IK*cl-L(JzsPZDO#e&j}W%Mt>aI6J>%rh`F9$)M-9J)hElNxyog7J-99ll>>ZzP+&FmW6U~a^yz_mzTRq;O zAa>u}a$z`~8eUxO-MFFh^U8VtlAq4broAWHQ2pP~M!)IT4W0ZwYP|lu$Y$Yn`@Hx2 z@Ynuz`0G5KO;2a-+<9)SsI2EBU!4?V`#ikPW}hw^ug(#ju( Zt(SD<1JzTuUl3bQ+1eE;eQNl&{s*&056}Pr diff --git a/gfx/unknown/171db1.png b/gfx/unknown/171db1.png new file mode 100644 index 0000000000000000000000000000000000000000..1c32d2bda310f87ea9891143cdb6afd379e920ca GIT binary patch literal 762 zcmVF)0*=jY7+$ODc`hfMXzNLYoZVnL4`zlE%lt5YT-|>))Wc_L>J%`r%mw$dUJ(9 zJS$57VV8!bC@cZhQYmhjWgSuhb+Cp+kQ&81Y%NJ<4*rr&TerWMyk3bisI{m-D-2a5 zNo1qmM$Dz0D-0+l7Y}N5?yU;|78bhygKSjsq@zG zKb>xlyTor{o{Ur`#|9Co%^q+1b!0u62RU4>GbeKAkn;)SOACjrQ93|+0Tvy_)K#F#CQ(;1MTm%cMUfhh5!Hn07*qoM6N<$f^5E9S^xk5 literal 0 HcmV?d00001 diff --git a/gfx/unknown/172f1f.2bpp b/gfx/unknown/172f1f.2bpp deleted file mode 100644 index 55a3c75218fc54169dafec639ebc50e8f6fa1ca4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1168 zcmZ8gO=uHA6rPw!H{D`4y_jB%C-EROQUn)*TNK1wda(yDNmY9Al7a^XHM6;BLBZT4 zv~;}){u~ZBP31-5coj;thB z&a;)v{$(Gj4ShDYBAWq~NMIXAtUPkOei&uMF{n-tA86h$Y5vQ%ps;l|&^Gr7L_dvKiSlwn*8Q z@x~|_rESu*UFRucoYuh6Jp-aH8iG{brOJITX%HPTC`jcwgns!5cEm2n&yXgDwyfRL z4zvTJ>@=Kjc#nC4LtB8Km9Uieg4i6$zaTz4P)SX+CrIC>|3`@!Pc zyBdwr(Jwn|p9hY8*%^K95Jy5+fh^7qRIs9~oZ_i_Vb#H5Pwz2HCd`X1S52Q~Uj2<# zt7@f*V;WOk23xAVkidCmC1A;l)**40{FK^F5MS5z8T?a4ypsn88>>_zE@%xkc2Ta{X!oN{Q%MW}=#csHf? zBxtIc9}$C)qZpw%=)Ly{_SU+-H@n?#eTN*rd3p18<_!b^V$c-<=ulBW5L8xS?!>lC zM9*qB5trI^&DC3-I~6MfFl4p&l-h6Ck@@Re{AoiTF%L>2O4X9Yj+4Cr zA~RAXJJ&_fb}7ICFhEt5YDHYAQJiC4q%dErZNS|Q{08-6N)0Pme@9#twORod2D8ME zN9x2osyiuiFMZtkyn29mn9D&l8PtADJ#4NX`70l& zeQKT;`D0rOvE1kXh^G?~)6q<*bxCb5rxMx3Z`3o*B`hQMBd*sc)DjBY_fs^EG?Kl| z9PoI(Za1jujq*v@{Z@Y*!eMMu_Zw$NFdmO?$d2h5nmI6z0~;O4TmqORmL7m9B{OGf zM#qo^x;H7o7JW!{Mn?w&Flai^0A*(e*cZilx_R|mxO7$SCz9;DGp6;0x}HdX7w zOW^U1m^)#NnUKwE3l>9MU##xW~was(w<0q1`snnQ7^n=&*q_uIXMug{11{!+Xb3> RKUx3)002ovPDHLkV1nnTXY>F7 literal 0 HcmV?d00001 diff --git a/gfx/unknown/17afa5.2bpp b/gfx/unknown/17afa5.2bpp deleted file mode 100644 index 3c0795de0ccda25a2e90440e7b8b2097213d1885..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmeHGPe|Kf6o0MS6kFPYf0n^8dJ_@NV22{5wX8@B>U6B^qBic*!C-n@H<(5&=s~8S z9yi3vHe~EDaf6jHu`p#j%!_k9xK@UZhfT{EZLqc3_vK4kQ+L^Ar@bFZzW07F@4fGr zF92sv2jyiZs>Wix&`is$giKA7Mm5k$Qa+Ox(n3bWU(+4-&6-w$@P=!jlSQj}lMSDm$yy@+7Os3rc<9uR&Ac0%)dbbG6k( z8OT-&DyxcD+iA8jwUyv_o^Z0hsy@LZt-gY+Kk0q{q$kzCi+O@fdVF0-f^>by9j%!U z#Jhgn{C+oEKZqIDD7*_}9xfGU;eCd;IZ3^gTM2%ctih1O3gs06Lw;qSuGR zMx()i&Jy3=J~PwMz_NaSXD6u_4)5>J&CSoRt^(B8_w+0+ZEj9YZEw%c0_gP>6>V+h zftWk-GhUBdmSBw_j-NEOs1+T;v0=N+v1|l zHaUrWMNjuP_pT2?{a%s$%A2RJreC0pvjU*t@-nHV+-V?x@}FIxk^N0Rz(S=aADXoN z&hV8B+WcoF`K7!{`(nPBJLcX~&&Twmi3g9Lth`ju2QZe4Ow0Ke2IID?8+G9ogHxgw_`~CO-odUlB3Yl$a diff --git a/gfx/unknown/17afa5.png b/gfx/unknown/17afa5.png new file mode 100644 index 0000000000000000000000000000000000000000..fc6459040befca6e8a4db3b9f078c80c6879d380 GIT binary patch literal 896 zcmV-`1AqL9P)k+VCcE>=_x+gnCIhI45aND3AqGVN zE19$!3qddC5{}9x4GsW`u;3M4^eROLFQqI(#^YJ(5g6ZLA5&noJO_TRYEUk^r{#(Z zaeNLv?2c9`S{(oI+XPVjq4lfNHDJN3xFb?LGC+GK#f4dL`0Y)1PVvJ4jy)`6^y4vu z6-iEMmljQadM+j=CiTOkIk4S1ub{*dA6z6-Q0gwyPHECRDbnKVNeU@fg}@dKnGYsdHl~yD`Xux0X$s z&EOU;A6J$QC}zs*SyEkxxF;}7M%WOzo`YOiKYN#g!=pJcrJ$-nZ%VLVIB&c@PJFZID+8%sB=nXu;)`!k3f z4t5T7nosRcv)Qq4{EbtcSmCBM5{Mryc$fgE9KLn&!-4_N?A`Ac0Z71Flt2D{IRVX1 zr^5we#YdxvfvE2bv6F&5OTOBZ@)g7K~2S%I%1eO6!n7?=#YUMxGCUq4jgo;FM&IEV8XvUWBq(k8c%unb0%uw-!kY#Q{6nYXM<~E;!y6nsHJe8;Osal^W zKfUuIbd8Mw1@e`goT_tws>;ga&)J8eAtyi=fl$2-g{py0Jh2C zyp=p`K7HB&I7T2!2Ed92!mrIgyW(pggltd~4^r;Uzq`H{Kzul^JLWA@esEBcxDZXu zfEQr2?BM+2FT?Gf0ODi>d~pF>Fbbe4G)w^f70{xcOap)fkVFAM9(++x$2GiDz}YP) z3Lw=26jy+8x!JI_pZ~~Xu_QfFB7pqt@44aKDm)GRNI3wGK=?`|L#EA!4c5=E4gU`~ z2;j0Y!Rj&vhU{`WrV+qyCt(Jw0Obon5x7ZZm+)@}(#8G^$QNBJJ*_52T2v6qD}a1p z_y*&bFqP#8&v)7W?cvX{a$%09xY|NQ(`&feB8<2?la4-8B#ez+r1X zKET9)JUomPi)H3>xpumbv`qu^fuCC^0Q|TBa_tN>AR7SOb2K$f3~8*OPMTgj0g2@; zDx@W#;dSf*o>MG07tw80>TVMnUQsqY`Uu(o`rYcMH@flXZwU#1U}=v=(jdSutJU{! z8P4*{m7zmXtPZW{xU&yIjO1aKJemn%zq0LCd`5EkN)9RTeM8v*dfNofdx6n+5; z0hq+1(b|!PA`}W99}!XYdp zRF&oLRkc3q%bifI5a=3fAH0DzaFiQEjh z09a=eaVmxdsPusfg=$iu)vC^2HRb@q1of8(PG1H{@(9#bT^<+UKc~y{U8>S#kpKVy M07*qoM6N<$f^MRoZ~y=R literal 0 HcmV?d00001 diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index 331242d88..ff661b1bc 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -1116,16 +1116,18 @@ INCBIN "gfx/unknown/106514.2bpp" LoadOverworldFont:: ; 106594 - ld de, .bgfont + ld de, .font ld hl, VTiles1 - lb bc, BANK(.bgfont), $80 + lb bc, BANK(.font), $80 call Get2bpp - ld de, .bgfont + $80 tiles + ld de, .space ld hl, VTiles2 tile $7f - lb bc, BANK(.bgfont), 1 + lb bc, BANK(.space), 1 call Get2bpp ret ; 1065ad -.bgfont +.font INCBIN "gfx/unknown/1065ad.2bpp" +.space +INCBIN "gfx/unknown/106dad.2bpp" From a749057b274609005d522b6fdbfc5d6595f4bf0f Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 16:28:50 -0400 Subject: [PATCH 33/46] Fix gfx/frames --- gfx/font.asm | 2 +- gfx/frames/space.png | Bin 71 -> 134 bytes 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 gfx/frames/space.png diff --git a/gfx/font.asm b/gfx/font.asm index b758717ee..30549b26f 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -63,7 +63,7 @@ INCBIN "gfx/unknown/0f8f34.1bpp" ; f9204 TextBoxSpaceGFX: ; f9204 -INCBIN "gfx/frames/space.2bpp" +INCBIN "gfx/frames/space.1bpp" ; f9214 MobilePhoneTilesGFX: ; f9214 diff --git a/gfx/frames/space.png b/gfx/frames/space.png old mode 100644 new mode 100755 index 3233c135eef064b25509a4d998b5b91b87f6ab9b..7590b85dd51aa1af63a34d4fede4f5e069911c36 GIT binary patch delta 117 zcmZ>7W1JwKFTlaZz`&s0WmgNN7>k44ofy`glX(f`u%tWsIx;Y9?C1WI$O`0h7I;J! zGcfQS0b$0e+I-SLL1|AH#}JL+r82sm(nfgv!6Mdt9{<$Hn3 O7(8A5T-G@yGywo_C?1^v delta 54 zcmZo;be|w@z`?`-1go$7{05}>JY5_^DsCnJ_&=Xfnu%e51pmj&ih4glDm-2NT-G@y GGywq7BN5sF From a20664d41528e8b9eacc7d9c278c5b5e7822507d Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 16:30:12 -0400 Subject: [PATCH 34/46] Fix gfx/misc --- Makefile | 3 ++- engine/trainer_card.asm | 4 ++-- main.asm | 16 ++++++++-------- misc/gbc_only.asm | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index d01fb9236..65e6d367e 100644 --- a/Makefile +++ b/Makefile @@ -159,8 +159,9 @@ gfx/misc/kris.2bpp: rgbgfx += -h gfx/misc/kris_card.2bpp: rgbgfx += -h gfx/misc/kris_back.2bpp: rgbgfx += -h gfx/misc/dude.2bpp: rgbgfx += -h +gfx/misc/unknown_egg.2bpp: rgbgfx += -h gfx/misc/player.2bpp: rgbgfx += -h -gfx/misc/pokegear.2bpp: tools/gfx += --trim-whitespace +gfx/misc/pokegear.2bpp: rgbgfx += -x2 gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index a993ce4ba..23defe919 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -608,8 +608,8 @@ TrainerCard_JohtoBadgesOAM: ; 254c9 CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp" -LeaderGFX: INCBIN "gfx/misc/leaders.w24.2bpp" -LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp" +LeaderGFX: INCBIN "gfx/misc/leaders.2bpp" +LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp" BadgeGFX: INCBIN "gfx/misc/badges.2bpp" BadgeGFX2: INCBIN "gfx/misc/badges.2bpp" diff --git a/main.asm b/main.asm index 385f865d7..a1dc24fdc 100644 --- a/main.asm +++ b/main.asm @@ -1178,10 +1178,10 @@ INCLUDE "engine/wildmons.asm" INCLUDE "battle/link_result.asm" ChrisBackpic: ; 2ba1a -INCBIN "gfx/misc/player.6x6.2bpp.lz" +INCBIN "gfx/misc/player.2bpp.lz" DudeBackpic: ; 2bbaa -INCBIN "gfx/misc/dude.6x6.2bpp.lz" +INCBIN "gfx/misc/dude.2bpp.lz" SECTION "bankB", ROMX, BANK[$B] @@ -4664,7 +4664,7 @@ Unknown_53d84: ; unreferenced UnknownEggPic:: ; 53d9c ; Another egg pic. This is shifted up a few pixels. -INCBIN "gfx/misc/unknown_egg.5x5.2bpp.lz" +INCBIN "gfx/misc/unknown_egg.2bpp.lz" SECTION "bank19", ROMX, BANK[$19] @@ -4857,10 +4857,10 @@ GetCardPic: ; 8833e ret ChrisCardPic: ; 88365 -INCBIN "gfx/misc/chris_card.5x7.2bpp" +INCBIN "gfx/misc/chris_card.2bpp" KrisCardPic: ; 88595 -INCBIN "gfx/misc/kris_card.5x7.2bpp" +INCBIN "gfx/misc/kris_card.2bpp" CardGFX: ; 887c5 INCBIN "gfx/misc/trainer_card.2bpp" @@ -4943,10 +4943,10 @@ DrawIntroPlayerPic: ; 88874 ret ChrisPic: ; 888a9 -INCBIN "gfx/misc/chris.7x7.2bpp" +INCBIN "gfx/misc/chris.2bpp" KrisPic: ; 88bb9 -INCBIN "gfx/misc/kris.7x7.2bpp" +INCBIN "gfx/misc/kris.2bpp" GetKrisBackpic: ; 88ec9 ; Kris's backpic is uncompressed. @@ -4957,7 +4957,7 @@ GetKrisBackpic: ; 88ec9 ret KrisBackpic: ; 88ed6 -INCBIN "gfx/misc/kris_back.6x6.2bpp" +INCBIN "gfx/misc/kris_back.2bpp" String_89116: db "-----@" diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm index cae976a1c..f4b3eba8b 100644 --- a/misc/gbc_only.asm +++ b/misc/gbc_only.asm @@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38 GBCOnlyGFX: ; 4eb76 -INCBIN "gfx/misc/gbc_only.w112.2bpp.lz" +INCBIN "gfx/misc/gbc_only.2bpp.lz" ; 4f0bc From bc787652987987d258dadd6e32649a3aea643ae9 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 16:31:23 -0400 Subject: [PATCH 35/46] 1bpp in gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9af0a0bd4..a4639d0ca 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ pokecrystal.txt *.dimensions *.gbcpal *.2bpp +*.1bpp *.lz *.pal *.animated.tilemap From 9b1550c5e0abf20da5c7043c3ac49260fac79147 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 16:31:42 -0400 Subject: [PATCH 36/46] Explicit rules for gfx/shrink{1,2}.2bpp --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 65e6d367e..61f1b6c8a 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,8 @@ gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimens # Misc file-specific graphics rules -gfx/shrink%.2bpp: rgbgfx += -h +gfx/shrink1.2bpp: rgbgfx += -h +gfx/shrink2.2bpp: rgbgfx += -h gfx/trainers/%.2bpp: rgbgfx += -h gfx/trainers/%.pal: gfx/trainers/%.gbcpal From 80f7477c3343517a96c6effcaf96f40c38f8f4d7 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 16:42:44 -0400 Subject: [PATCH 37/46] Fix tools/gfx --- tools/Makefile | 4 +++- tools/gfx.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 9e40bcd27..57a4d84ce 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,5 +1,7 @@ .PHONY: all +CFLAGS := -std=c99 + all: \ lzcomp \ png_dimensions \ @@ -11,4 +13,4 @@ all: \ @: %: %.c - $(CC) -o $@ $< + $(CC) $(CFLAGS) -o $@ $< diff --git a/tools/gfx.c b/tools/gfx.c index 25de45dbe..0e6864e91 100644 --- a/tools/gfx.c +++ b/tools/gfx.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "common.h" From ed99a86864535896d62ea1c5cdb49645754478f5 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 16:47:11 -0400 Subject: [PATCH 38/46] Fix implicit getopt --- tools/palette.c | 1 + tools/pokemon_animation.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/palette.c b/tools/palette.c index c1beb40e4..39837a096 100644 --- a/tools/palette.c +++ b/tools/palette.c @@ -3,6 +3,7 @@ #include #include #include +#include void usage(void) { printf("Usage: palette palfile\n"); diff --git a/tools/pokemon_animation.c b/tools/pokemon_animation.c index 835160c24..0728788ec 100644 --- a/tools/pokemon_animation.c +++ b/tools/pokemon_animation.c @@ -4,6 +4,7 @@ #include #include #include +#include struct Frame { uint8_t* data; From 7d5b9bb0c46fde6c7aa479e43725541a787a7db2 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 16:51:35 -0400 Subject: [PATCH 39/46] gcc is needed in cygwin - also mention the new dlls in install --- INSTALL.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 0d48f6daf..d44e82dce 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -56,10 +56,10 @@ make To build on Windows, install [**Cygwin**](http://cygwin.com/install.html) with the default settings. -In the installer, select the following packages: `make` `git` `gettext` +In the installer, select the following packages: `make` `git` `gettext` `gcc-core` Then get [**rgbds 0.2.5**](https://github.com/rednex/rgbds/releases/). Versions 0.3.0 and later are not compatible. -Extract the archive and put `rgbasm.exe`, `rgblink.exe`, `rgbfix.exe` and `rgbgfx.exe` in `C:\cygwin64\usr\local\bin`. +Extract the archive and put all the `exe` and `dll` files individually in `C:\cygwin64\usr\local\bin`. In the **Cygwin terminal**: @@ -67,7 +67,7 @@ In the **Cygwin terminal**: git clone https://github.com/pret/pokecrystal cd pokecrystal -make tools +make tools CC=gcc ``` To build **pokecrystal.gbc**: From 866ca63c514a8f3a6dbadbaba3da96209abb51cf Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 17:49:31 -0400 Subject: [PATCH 40/46] Fix a misleading define for SLP --- constants/battle_constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 804f223cb..793650913 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -91,12 +91,12 @@ const_value SET 1 const BATTLE_VARS_LAST_MOVE_OPP ; status +SLP EQU 7 ; 0-7 turns const_value SET 3 const PSN const BRN const FRZ const PAR - const SLP ; 7 turns ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP From f12e42ab6d41740a6e9302f1f12250a0f72c3f9d Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 18:32:54 -0400 Subject: [PATCH 41/46] Use SHA1 to compare roms --- Makefile | 8 ++++++-- README.md | 4 ++-- roms.md5 | 2 -- roms.sha1 | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 roms.md5 create mode 100644 roms.sha1 diff --git a/Makefile b/Makefile index 61f1b6c8a..b51652a00 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,8 @@ -MD5 := md5sum -c +ifeq (,$(shell which sha1sum)) +SHA1 := shasum +else +SHA1 := sha1sum +endif .SUFFIXES: .PHONY: all clean tools compare crystal crystal11 @@ -36,7 +40,7 @@ clean: rm -f $(roms) $(crystal_obj) $(crystal11_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) compare: $(roms) - @$(MD5) roms.md5 + @$(SHA1) -c roms.sha1 tools: make -C tools/ diff --git a/README.md b/README.md index 51e1b4302..a90c147a7 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ This is a disassembly of Pokémon Crystal. It builds the following roms: -* Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `md5: 9f2922b235a5eeb78d65594e82ef5dde` -* Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `md5: 301899b8087289a6436b0a241fbbb474` +* Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `sha1: f4cd194bdee0d04ca4eac29e09b8e4e9d818c133` +* Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `sha1: f2f52230b536214ef7c9924f483392993e226cfb` To set up the repository, see [**INSTALL.md**](INSTALL.md). diff --git a/roms.md5 b/roms.md5 deleted file mode 100644 index 79ca0bc51..000000000 --- a/roms.md5 +++ /dev/null @@ -1,2 +0,0 @@ -9f2922b235a5eeb78d65594e82ef5dde pokecrystal.gbc -301899b8087289a6436b0a241fbbb474 pokecrystal11.gbc diff --git a/roms.sha1 b/roms.sha1 new file mode 100644 index 000000000..3cdf981f6 --- /dev/null +++ b/roms.sha1 @@ -0,0 +1,2 @@ +f4cd194bdee0d04ca4eac29e09b8e4e9d818c133 *pokecrystal.gbc +f2f52230b536214ef7c9924f483392993e226cfb *pokecrystal11.gbc From f03b898250597680f115cec5cec06953b403acf9 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 18:34:25 -0400 Subject: [PATCH 42/46] Add a md5 tool to avoid md5sum dependency. md5sum is missing in macOS and (presumably) BSD. An alternative would have been to use sha1sum instead, but it's probably a good idea to have as few dependencies as possible, so this doesn't happen again. fixes #364 --- Makefile | 4 +- tools/Makefile | 3 +- tools/md5.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 3 deletions(-) create mode 100644 tools/md5.c diff --git a/Makefile b/Makefile index b51652a00..3382d9a41 100644 --- a/Makefile +++ b/Makefile @@ -62,11 +62,11 @@ pokecrystal.gbc: $(crystal_obj) rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ -# For files that the compressor can't match, there will be a .lz file suffixed with the hash of the correct uncompressed file. +# For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file. # If the hash of the uncompressed file matches, use this .lz instead. # This allows pngs to be used for compressed graphics and still match. -%.lz: hash = $(shell md5sum $(*D)/$(*F) | sed "s/\(.\{8\}\).*/\1/") +%.lz: hash = $(shell tools/md5 $(*D)/$(*F) | sed "s/\(.\{8\}\).*/\1/") %.lz: % $(eval filename := $@.$(hash)) $(if $(wildcard $(filename)),cp $(filename) $@,tools/lzcomp $< $@) diff --git a/tools/Makefile b/tools/Makefile index 57a4d84ce..202961c3e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -9,7 +9,8 @@ all: \ palette \ pokemon_animation \ pokemon_animation_graphics \ - gfx + gfx \ + md5 @: %: %.c diff --git a/tools/md5.c b/tools/md5.c new file mode 100644 index 000000000..9f6473d2c --- /dev/null +++ b/tools/md5.c @@ -0,0 +1,127 @@ +#include +#include +#include + +#include "common.h" + +static const int s[64] = { + 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, + 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, + 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, + 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, +}; + +static const uint32_t K[64] = { + 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, + 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, + 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, + 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, + 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, + 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, + 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, + 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, + 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, + 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, + 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, + 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, + 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, + 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, + 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, + 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391, +}; + +#define rotate_left_32(value, by) \ + ((((value) << (by)) & 0xffffffff) | ((value) >> 32 - (by))) + +void md5_wikipedia(uint8_t *data, int length, uint8_t *result) { + + uint8_t *message = calloc(length + 64, sizeof(uint8_t)); + memcpy(message, data, length); + + long orig_bitlength = length * 8; + + message[length++] |= 1 << 7; + + while (length % 64 != (64 - 8)) { + length++; + } + for (int i = 0; i < 8; i++) { + message[length++] = (orig_bitlength >> (i * 8)) & 0xff; + } + + int a0 = 0x67452301; + int b0 = 0xefcdab89; + int c0 = 0x98badcfe; + int d0 = 0x10325476; + + for (int start = 0; start < length; start += 64) { + uint32_t M[16]; + for (int j = 0; j < 16; j++) { + uint8_t *word = &message[start + j * 4]; + M[j] = *word++; + M[j] |= *word++ << 8; + M[j] |= *word++ << 16; + M[j] |= *word++ << 24; + } + + int A = a0; + int B = b0; + int C = c0; + int D = d0; + for (int i = 0; i < 64; i++) { + int F, g; + switch (i / 16) { + case 0: + F = (B & C) | (~B & D); + g = i; + break; + case 1: + F = (D & B) | (~D & C); + g = (5 * i + 1) % 16; + break; + case 2: + F = B ^ C ^ D; + g = (3 * i + 5) % 16; + break; + case 3: + F = C ^ (B | ~D); + g = (7 * i) % 16; + break; + } + int e = D; + D = C; + C = B; + B = B + rotate_left_32(A + F + K[i] + M[g], s[i]); + A = e; + } + a0 += A; + b0 += B; + c0 += C; + d0 += D; + } + + int values[] = {a0, b0, c0, d0}; + for (int i = 0; i < 16; i++) { + int value = values[i >> 2]; + int shift = (i % 4) * 8; + result[i] = (value >> shift) & 0xff; + } + + free(message); +} + +int main(int argc, char *argv[]) { + if (argc < 2) { + exit(1); + } + char *infile = argv[1]; + int size; + uint8_t *data = read_u8(infile, &size); + + uint8_t result[16]; + md5_wikipedia(data, size, result); + for (int i = 0; i < 16; i++) { + printf("%02x", result[i]); + } + printf("\n"); +} From 44baefce065e05e276ae4adcec28a4f78fe78d82 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 18:55:55 -0400 Subject: [PATCH 43/46] Add a travis badge and remove pokered link --- README.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a90c147a7..6a5cef33e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Pokémon Crystal +# Pokémon Crystal [![Build Status][travis-badge]][travis] This is a disassembly of Pokémon Crystal. @@ -7,13 +7,10 @@ It builds the following roms: * Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `sha1: f4cd194bdee0d04ca4eac29e09b8e4e9d818c133` * Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `sha1: f2f52230b536214ef7c9924f483392993e226cfb` -To set up the repository, see [**INSTALL.md**](INSTALL.md). +To set up the repository, see [INSTALL.md](INSTALL.md). +### irc: [freenode#pret][irc] -## See also - -* Disassembly of [**Pokémon Red/Blue**][pokered] -* irc: [**freenode#pret**][irc] - -[pokered]: https://github.com/iimarckus/pokered [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret +[travis]: https://travis-ci.org/pret/pokecrystal +[travis-badge]: https://travis-ci.org/pret/pokecrystal.svg?branch=master From 0fbc74a8c7596455b1cf33e1ff8c499215e1c1e1 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 19:02:02 -0400 Subject: [PATCH 44/46] Fix implicit stdint --- tools/md5.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/md5.c b/tools/md5.c index 9f6473d2c..e043e8537 100644 --- a/tools/md5.c +++ b/tools/md5.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "common.h" From 1f8bc7772bf94fdcfa0b92d5f797e234dd53d475 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 19:32:35 -0400 Subject: [PATCH 45/46] Fix insecure fprintf --- tools/gfx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/gfx.c b/tools/gfx.c index 0e6864e91..207dcb6c2 100644 --- a/tools/gfx.c +++ b/tools/gfx.c @@ -12,8 +12,8 @@ static void usage(void) { } static void error(char *message) { - fprintf(stderr, message); - fprintf(stderr, "\n"); + fputs(message, stderr); + fputs("\n", stderr); } struct Options { From dbaec2053429e04f21613c3c0964e213008bfdb9 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 Jun 2017 20:21:30 -0400 Subject: [PATCH 46/46] Include front.dimensions file instead of manual pic dimensions --- data/base_stats/abra.asm | 2 +- data/base_stats/aerodactyl.asm | 2 +- data/base_stats/aipom.asm | 2 +- data/base_stats/alakazam.asm | 2 +- data/base_stats/ampharos.asm | 2 +- data/base_stats/arbok.asm | 2 +- data/base_stats/arcanine.asm | 2 +- data/base_stats/ariados.asm | 2 +- data/base_stats/articuno.asm | 2 +- data/base_stats/azumarill.asm | 2 +- data/base_stats/bayleef.asm | 2 +- data/base_stats/beedrill.asm | 2 +- data/base_stats/bellossom.asm | 2 +- data/base_stats/bellsprout.asm | 2 +- data/base_stats/blastoise.asm | 2 +- data/base_stats/blissey.asm | 2 +- data/base_stats/bulbasaur.asm | 2 +- data/base_stats/butterfree.asm | 2 +- data/base_stats/caterpie.asm | 2 +- data/base_stats/celebi.asm | 2 +- data/base_stats/chansey.asm | 2 +- data/base_stats/charizard.asm | 2 +- data/base_stats/charmander.asm | 2 +- data/base_stats/charmeleon.asm | 2 +- data/base_stats/chikorita.asm | 2 +- data/base_stats/chinchou.asm | 2 +- data/base_stats/clefable.asm | 2 +- data/base_stats/clefairy.asm | 2 +- data/base_stats/cleffa.asm | 2 +- data/base_stats/cloyster.asm | 2 +- data/base_stats/corsola.asm | 2 +- data/base_stats/crobat.asm | 2 +- data/base_stats/croconaw.asm | 2 +- data/base_stats/cubone.asm | 2 +- data/base_stats/cyndaquil.asm | 2 +- data/base_stats/delibird.asm | 2 +- data/base_stats/dewgong.asm | 2 +- data/base_stats/diglett.asm | 2 +- data/base_stats/ditto.asm | 2 +- data/base_stats/dodrio.asm | 2 +- data/base_stats/doduo.asm | 2 +- data/base_stats/donphan.asm | 2 +- data/base_stats/dragonair.asm | 2 +- data/base_stats/dragonite.asm | 2 +- data/base_stats/dratini.asm | 2 +- data/base_stats/drowzee.asm | 2 +- data/base_stats/dugtrio.asm | 2 +- data/base_stats/dunsparce.asm | 2 +- data/base_stats/eevee.asm | 2 +- data/base_stats/ekans.asm | 2 +- data/base_stats/electabuzz.asm | 2 +- data/base_stats/electrode.asm | 2 +- data/base_stats/elekid.asm | 2 +- data/base_stats/entei.asm | 2 +- data/base_stats/espeon.asm | 2 +- data/base_stats/exeggcute.asm | 2 +- data/base_stats/exeggutor.asm | 2 +- data/base_stats/farfetch_d.asm | 2 +- data/base_stats/fearow.asm | 2 +- data/base_stats/feraligatr.asm | 2 +- data/base_stats/flaaffy.asm | 2 +- data/base_stats/flareon.asm | 2 +- data/base_stats/forretress.asm | 2 +- data/base_stats/furret.asm | 2 +- data/base_stats/gastly.asm | 2 +- data/base_stats/gengar.asm | 2 +- data/base_stats/geodude.asm | 2 +- data/base_stats/girafarig.asm | 2 +- data/base_stats/gligar.asm | 2 +- data/base_stats/gloom.asm | 2 +- data/base_stats/golbat.asm | 2 +- data/base_stats/goldeen.asm | 2 +- data/base_stats/golduck.asm | 2 +- data/base_stats/golem.asm | 2 +- data/base_stats/granbull.asm | 2 +- data/base_stats/graveler.asm | 2 +- data/base_stats/grimer.asm | 2 +- data/base_stats/growlithe.asm | 2 +- data/base_stats/gyarados.asm | 2 +- data/base_stats/haunter.asm | 2 +- data/base_stats/heracross.asm | 2 +- data/base_stats/hitmonchan.asm | 2 +- data/base_stats/hitmonlee.asm | 2 +- data/base_stats/hitmontop.asm | 2 +- data/base_stats/ho_oh.asm | 2 +- data/base_stats/hoothoot.asm | 2 +- data/base_stats/hoppip.asm | 2 +- data/base_stats/horsea.asm | 2 +- data/base_stats/houndoom.asm | 2 +- data/base_stats/houndour.asm | 2 +- data/base_stats/hypno.asm | 2 +- data/base_stats/igglybuff.asm | 2 +- data/base_stats/ivysaur.asm | 2 +- data/base_stats/jigglypuff.asm | 2 +- data/base_stats/jolteon.asm | 2 +- data/base_stats/jumpluff.asm | 2 +- data/base_stats/jynx.asm | 2 +- data/base_stats/kabuto.asm | 2 +- data/base_stats/kabutops.asm | 2 +- data/base_stats/kadabra.asm | 2 +- data/base_stats/kakuna.asm | 2 +- data/base_stats/kangaskhan.asm | 2 +- data/base_stats/kingdra.asm | 2 +- data/base_stats/kingler.asm | 2 +- data/base_stats/koffing.asm | 2 +- data/base_stats/krabby.asm | 2 +- data/base_stats/lanturn.asm | 2 +- data/base_stats/lapras.asm | 2 +- data/base_stats/larvitar.asm | 2 +- data/base_stats/ledian.asm | 2 +- data/base_stats/ledyba.asm | 2 +- data/base_stats/lickitung.asm | 2 +- data/base_stats/lugia.asm | 2 +- data/base_stats/machamp.asm | 2 +- data/base_stats/machoke.asm | 2 +- data/base_stats/machop.asm | 2 +- data/base_stats/magby.asm | 2 +- data/base_stats/magcargo.asm | 2 +- data/base_stats/magikarp.asm | 2 +- data/base_stats/magmar.asm | 2 +- data/base_stats/magnemite.asm | 2 +- data/base_stats/magneton.asm | 2 +- data/base_stats/mankey.asm | 2 +- data/base_stats/mantine.asm | 2 +- data/base_stats/mareep.asm | 2 +- data/base_stats/marill.asm | 2 +- data/base_stats/marowak.asm | 2 +- data/base_stats/meganium.asm | 2 +- data/base_stats/meowth.asm | 2 +- data/base_stats/metapod.asm | 2 +- data/base_stats/mew.asm | 2 +- data/base_stats/mewtwo.asm | 2 +- data/base_stats/miltank.asm | 2 +- data/base_stats/misdreavus.asm | 2 +- data/base_stats/moltres.asm | 2 +- data/base_stats/mr__mime.asm | 2 +- data/base_stats/muk.asm | 2 +- data/base_stats/murkrow.asm | 2 +- data/base_stats/natu.asm | 2 +- data/base_stats/nidoking.asm | 2 +- data/base_stats/nidoqueen.asm | 2 +- data/base_stats/nidoran_f.asm | 2 +- data/base_stats/nidoran_m.asm | 2 +- data/base_stats/nidorina.asm | 2 +- data/base_stats/nidorino.asm | 2 +- data/base_stats/ninetales.asm | 2 +- data/base_stats/noctowl.asm | 2 +- data/base_stats/octillery.asm | 2 +- data/base_stats/oddish.asm | 2 +- data/base_stats/omanyte.asm | 2 +- data/base_stats/omastar.asm | 2 +- data/base_stats/onix.asm | 2 +- data/base_stats/paras.asm | 2 +- data/base_stats/parasect.asm | 2 +- data/base_stats/persian.asm | 2 +- data/base_stats/phanpy.asm | 2 +- data/base_stats/pichu.asm | 2 +- data/base_stats/pidgeot.asm | 2 +- data/base_stats/pidgeotto.asm | 2 +- data/base_stats/pidgey.asm | 2 +- data/base_stats/pikachu.asm | 2 +- data/base_stats/piloswine.asm | 2 +- data/base_stats/pineco.asm | 2 +- data/base_stats/pinsir.asm | 2 +- data/base_stats/politoed.asm | 2 +- data/base_stats/poliwag.asm | 2 +- data/base_stats/poliwhirl.asm | 2 +- data/base_stats/poliwrath.asm | 2 +- data/base_stats/ponyta.asm | 2 +- data/base_stats/porygon.asm | 2 +- data/base_stats/porygon2.asm | 2 +- data/base_stats/primeape.asm | 2 +- data/base_stats/psyduck.asm | 2 +- data/base_stats/pupitar.asm | 2 +- data/base_stats/quagsire.asm | 2 +- data/base_stats/quilava.asm | 2 +- data/base_stats/qwilfish.asm | 2 +- data/base_stats/raichu.asm | 2 +- data/base_stats/raikou.asm | 2 +- data/base_stats/rapidash.asm | 2 +- data/base_stats/raticate.asm | 2 +- data/base_stats/rattata.asm | 2 +- data/base_stats/remoraid.asm | 2 +- data/base_stats/rhydon.asm | 2 +- data/base_stats/rhyhorn.asm | 2 +- data/base_stats/sandshrew.asm | 2 +- data/base_stats/sandslash.asm | 2 +- data/base_stats/scizor.asm | 2 +- data/base_stats/scyther.asm | 2 +- data/base_stats/seadra.asm | 2 +- data/base_stats/seaking.asm | 2 +- data/base_stats/seel.asm | 2 +- data/base_stats/sentret.asm | 2 +- data/base_stats/shellder.asm | 2 +- data/base_stats/shuckle.asm | 2 +- data/base_stats/skarmory.asm | 2 +- data/base_stats/skiploom.asm | 2 +- data/base_stats/slowbro.asm | 2 +- data/base_stats/slowking.asm | 2 +- data/base_stats/slowpoke.asm | 2 +- data/base_stats/slugma.asm | 2 +- data/base_stats/smeargle.asm | 2 +- data/base_stats/smoochum.asm | 2 +- data/base_stats/sneasel.asm | 2 +- data/base_stats/snorlax.asm | 2 +- data/base_stats/snubbull.asm | 2 +- data/base_stats/spearow.asm | 2 +- data/base_stats/spinarak.asm | 2 +- data/base_stats/squirtle.asm | 2 +- data/base_stats/stantler.asm | 2 +- data/base_stats/starmie.asm | 2 +- data/base_stats/staryu.asm | 2 +- data/base_stats/steelix.asm | 2 +- data/base_stats/sudowoodo.asm | 2 +- data/base_stats/suicune.asm | 2 +- data/base_stats/sunflora.asm | 2 +- data/base_stats/sunkern.asm | 2 +- data/base_stats/swinub.asm | 2 +- data/base_stats/tangela.asm | 2 +- data/base_stats/tauros.asm | 2 +- data/base_stats/teddiursa.asm | 2 +- data/base_stats/tentacool.asm | 2 +- data/base_stats/tentacruel.asm | 2 +- data/base_stats/togepi.asm | 2 +- data/base_stats/togetic.asm | 2 +- data/base_stats/totodile.asm | 2 +- data/base_stats/typhlosion.asm | 2 +- data/base_stats/tyranitar.asm | 2 +- data/base_stats/tyrogue.asm | 2 +- data/base_stats/umbreon.asm | 2 +- data/base_stats/unown.asm | 2 +- data/base_stats/ursaring.asm | 2 +- data/base_stats/vaporeon.asm | 2 +- data/base_stats/venomoth.asm | 2 +- data/base_stats/venonat.asm | 2 +- data/base_stats/venusaur.asm | 2 +- data/base_stats/victreebel.asm | 2 +- data/base_stats/vileplume.asm | 2 +- data/base_stats/voltorb.asm | 2 +- data/base_stats/vulpix.asm | 2 +- data/base_stats/wartortle.asm | 2 +- data/base_stats/weedle.asm | 2 +- data/base_stats/weepinbell.asm | 2 +- data/base_stats/weezing.asm | 2 +- data/base_stats/wigglytuff.asm | 2 +- data/base_stats/wobbuffet.asm | 2 +- data/base_stats/wooper.asm | 2 +- data/base_stats/xatu.asm | 2 +- data/base_stats/yanma.asm | 2 +- data/base_stats/zapdos.asm | 2 +- data/base_stats/zubat.asm | 2 +- 251 files changed, 251 insertions(+), 251 deletions(-) diff --git a/data/base_stats/abra.asm b/data/base_stats/abra.asm index 1856a2fd6..f3a39edbb 100644 --- a/data/base_stats/abra.asm +++ b/data/base_stats/abra.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/abra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/aerodactyl.asm b/data/base_stats/aerodactyl.asm index c3c3b4c76..56530206c 100644 --- a/data/base_stats/aerodactyl.asm +++ b/data/base_stats/aerodactyl.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/aerodactyl/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/aipom.asm b/data/base_stats/aipom.asm index 6226a4526..aa9ca45a1 100644 --- a/data/base_stats/aipom.asm +++ b/data/base_stats/aipom.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/aipom/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/alakazam.asm b/data/base_stats/alakazam.asm index 086a1bb43..79e2e99ee 100644 --- a/data/base_stats/alakazam.asm +++ b/data/base_stats/alakazam.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/alakazam/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/ampharos.asm b/data/base_stats/ampharos.asm index 3c5626d81..a0a2c48f7 100644 --- a/data/base_stats/ampharos.asm +++ b/data/base_stats/ampharos.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/ampharos/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups diff --git a/data/base_stats/arbok.asm b/data/base_stats/arbok.asm index 3b82c1801..48129fc36 100644 --- a/data/base_stats/arbok.asm +++ b/data/base_stats/arbok.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/arbok/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, REPTILE ; egg groups diff --git a/data/base_stats/arcanine.asm b/data/base_stats/arcanine.asm index ce2554998..81452dd19 100644 --- a/data/base_stats/arcanine.asm +++ b/data/base_stats/arcanine.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/arcanine/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/ariados.asm b/data/base_stats/ariados.asm index f0572464b..244c70d86 100644 --- a/data/base_stats/ariados.asm +++ b/data/base_stats/ariados.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/ariados/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/articuno.asm b/data/base_stats/articuno.asm index 5e8167ba8..320e210c6 100644 --- a/data/base_stats/articuno.asm +++ b/data/base_stats/articuno.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/articuno/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/azumarill.asm b/data/base_stats/azumarill.asm index c5a47615e..c18e517c4 100644 --- a/data/base_stats/azumarill.asm +++ b/data/base_stats/azumarill.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/azumarill/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, FAIRY ; egg groups diff --git a/data/base_stats/bayleef.asm b/data/base_stats/bayleef.asm index e94ecaa34..bb439ccd3 100644 --- a/data/base_stats/bayleef.asm +++ b/data/base_stats/bayleef.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/bayleef/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups diff --git a/data/base_stats/beedrill.asm b/data/base_stats/beedrill.asm index 254ee749e..465b076de 100644 --- a/data/base_stats/beedrill.asm +++ b/data/base_stats/beedrill.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/beedrill/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/bellossom.asm b/data/base_stats/bellossom.asm index 0dde920c8..6489fe50c 100644 --- a/data/base_stats/bellossom.asm +++ b/data/base_stats/bellossom.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/bellossom/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/bellsprout.asm b/data/base_stats/bellsprout.asm index d8f6c6c13..d8e3160e6 100644 --- a/data/base_stats/bellsprout.asm +++ b/data/base_stats/bellsprout.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/bellsprout/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/blastoise.asm b/data/base_stats/blastoise.asm index 122e4c65b..1a2df93b3 100644 --- a/data/base_stats/blastoise.asm +++ b/data/base_stats/blastoise.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/blastoise/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups diff --git a/data/base_stats/blissey.asm b/data/base_stats/blissey.asm index 1a437a248..d9c870da4 100644 --- a/data/base_stats/blissey.asm +++ b/data/base_stats/blissey.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/blissey/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups diff --git a/data/base_stats/bulbasaur.asm b/data/base_stats/bulbasaur.asm index 70a264a60..eb4bec3f6 100644 --- a/data/base_stats/bulbasaur.asm +++ b/data/base_stats/bulbasaur.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/bulbasaur/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups diff --git a/data/base_stats/butterfree.asm b/data/base_stats/butterfree.asm index 80f288967..ca1609d1e 100644 --- a/data/base_stats/butterfree.asm +++ b/data/base_stats/butterfree.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/butterfree/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/caterpie.asm b/data/base_stats/caterpie.asm index ebaee52f1..47e0b5210 100644 --- a/data/base_stats/caterpie.asm +++ b/data/base_stats/caterpie.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/caterpie/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/celebi.asm b/data/base_stats/celebi.asm index 29f61843f..2a09691bd 100644 --- a/data/base_stats/celebi.asm +++ b/data/base_stats/celebi.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown - dn 5 , 5 ; frontpic dimensions + INCBIN "gfx/pics/celebi/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/chansey.asm b/data/base_stats/chansey.asm index 2d0e84f47..2ba6091f9 100644 --- a/data/base_stats/chansey.asm +++ b/data/base_stats/chansey.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/chansey/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups diff --git a/data/base_stats/charizard.asm b/data/base_stats/charizard.asm index 522d213e4..d8b1ee769 100644 --- a/data/base_stats/charizard.asm +++ b/data/base_stats/charizard.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/charizard/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups diff --git a/data/base_stats/charmander.asm b/data/base_stats/charmander.asm index 34c14cb81..ba6822529 100644 --- a/data/base_stats/charmander.asm +++ b/data/base_stats/charmander.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/charmander/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups diff --git a/data/base_stats/charmeleon.asm b/data/base_stats/charmeleon.asm index 5c7794cdd..0be9be06f 100644 --- a/data/base_stats/charmeleon.asm +++ b/data/base_stats/charmeleon.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/charmeleon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups diff --git a/data/base_stats/chikorita.asm b/data/base_stats/chikorita.asm index c572e8667..74f77ae8f 100644 --- a/data/base_stats/chikorita.asm +++ b/data/base_stats/chikorita.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/chikorita/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups diff --git a/data/base_stats/chinchou.asm b/data/base_stats/chinchou.asm index 93ca3cae6..13fb43872 100644 --- a/data/base_stats/chinchou.asm +++ b/data/base_stats/chinchou.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/chinchou/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, FISH ; egg groups diff --git a/data/base_stats/clefable.asm b/data/base_stats/clefable.asm index 95262df0a..ffa07d9dc 100644 --- a/data/base_stats/clefable.asm +++ b/data/base_stats/clefable.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/clefable/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups diff --git a/data/base_stats/clefairy.asm b/data/base_stats/clefairy.asm index 8e1677236..ee1f38d04 100644 --- a/data/base_stats/clefairy.asm +++ b/data/base_stats/clefairy.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/clefairy/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups diff --git a/data/base_stats/cleffa.asm b/data/base_stats/cleffa.asm index 322a3695c..3afb4c6c6 100644 --- a/data/base_stats/cleffa.asm +++ b/data/base_stats/cleffa.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/cleffa/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/cloyster.asm b/data/base_stats/cloyster.asm index f8da41cc7..f7de0467d 100644 --- a/data/base_stats/cloyster.asm +++ b/data/base_stats/cloyster.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/cloyster/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups diff --git a/data/base_stats/corsola.asm b/data/base_stats/corsola.asm index b6eaa47ca..5a3adde57 100644 --- a/data/base_stats/corsola.asm +++ b/data/base_stats/corsola.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/corsola/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups diff --git a/data/base_stats/crobat.asm b/data/base_stats/crobat.asm index c2e9b310d..923ca38a9 100644 --- a/data/base_stats/crobat.asm +++ b/data/base_stats/crobat.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/crobat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/croconaw.asm b/data/base_stats/croconaw.asm index ce22048e1..66fb9f10c 100644 --- a/data/base_stats/croconaw.asm +++ b/data/base_stats/croconaw.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/croconaw/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups diff --git a/data/base_stats/cubone.asm b/data/base_stats/cubone.asm index 9a87a8a65..7c8d32d82 100644 --- a/data/base_stats/cubone.asm +++ b/data/base_stats/cubone.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/cubone/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups diff --git a/data/base_stats/cyndaquil.asm b/data/base_stats/cyndaquil.asm index d6a9f865b..b1f294907 100644 --- a/data/base_stats/cyndaquil.asm +++ b/data/base_stats/cyndaquil.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/cyndaquil/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/delibird.asm b/data/base_stats/delibird.asm index 9f4db9f97..139bfb66b 100644 --- a/data/base_stats/delibird.asm +++ b/data/base_stats/delibird.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/delibird/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups diff --git a/data/base_stats/dewgong.asm b/data/base_stats/dewgong.asm index 19135700d..e73de86b3 100644 --- a/data/base_stats/dewgong.asm +++ b/data/base_stats/dewgong.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/dewgong/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups diff --git a/data/base_stats/diglett.asm b/data/base_stats/diglett.asm index 3bcc864e0..9e9005114 100644 --- a/data/base_stats/diglett.asm +++ b/data/base_stats/diglett.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/diglett/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/ditto.asm b/data/base_stats/ditto.asm index fda952a08..6cbbe60ca 100644 --- a/data/base_stats/ditto.asm +++ b/data/base_stats/ditto.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/ditto/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn LADIES_MAN, LADIES_MAN ; egg groups diff --git a/data/base_stats/dodrio.asm b/data/base_stats/dodrio.asm index 5530f780e..dd96b10aa 100644 --- a/data/base_stats/dodrio.asm +++ b/data/base_stats/dodrio.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/dodrio/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/doduo.asm b/data/base_stats/doduo.asm index 554bb5dba..02c1e792a 100644 --- a/data/base_stats/doduo.asm +++ b/data/base_stats/doduo.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/doduo/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/donphan.asm b/data/base_stats/donphan.asm index 28517d41d..6e66787e1 100644 --- a/data/base_stats/donphan.asm +++ b/data/base_stats/donphan.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/donphan/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/dragonair.asm b/data/base_stats/dragonair.asm index a437457e0..621b50d51 100644 --- a/data/base_stats/dragonair.asm +++ b/data/base_stats/dragonair.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/dragonair/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, REPTILE ; egg groups diff --git a/data/base_stats/dragonite.asm b/data/base_stats/dragonite.asm index e99d05e67..83bbbb3eb 100644 --- a/data/base_stats/dragonite.asm +++ b/data/base_stats/dragonite.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/dragonite/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, REPTILE ; egg groups diff --git a/data/base_stats/dratini.asm b/data/base_stats/dratini.asm index 9b5516fa6..f9cf27faf 100644 --- a/data/base_stats/dratini.asm +++ b/data/base_stats/dratini.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/dratini/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, REPTILE ; egg groups diff --git a/data/base_stats/drowzee.asm b/data/base_stats/drowzee.asm index 31b6da7e8..04d7780bb 100644 --- a/data/base_stats/drowzee.asm +++ b/data/base_stats/drowzee.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/drowzee/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/dugtrio.asm b/data/base_stats/dugtrio.asm index 4a6073655..402cc6c03 100644 --- a/data/base_stats/dugtrio.asm +++ b/data/base_stats/dugtrio.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/dugtrio/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/dunsparce.asm b/data/base_stats/dunsparce.asm index 6ba6fc527..e3ed6a9df 100644 --- a/data/base_stats/dunsparce.asm +++ b/data/base_stats/dunsparce.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/dunsparce/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/eevee.asm b/data/base_stats/eevee.asm index b13c544b0..44584c15d 100644 --- a/data/base_stats/eevee.asm +++ b/data/base_stats/eevee.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/eevee/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/ekans.asm b/data/base_stats/ekans.asm index 81ee35558..0876d169a 100644 --- a/data/base_stats/ekans.asm +++ b/data/base_stats/ekans.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/ekans/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, REPTILE ; egg groups diff --git a/data/base_stats/electabuzz.asm b/data/base_stats/electabuzz.asm index e584527e8..7b690eae2 100644 --- a/data/base_stats/electabuzz.asm +++ b/data/base_stats/electabuzz.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/electabuzz/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/electrode.asm b/data/base_stats/electrode.asm index 771780a7f..3c2895384 100644 --- a/data/base_stats/electrode.asm +++ b/data/base_stats/electrode.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/electrode/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/elekid.asm b/data/base_stats/elekid.asm index c0d30fcdf..9fae865c6 100644 --- a/data/base_stats/elekid.asm +++ b/data/base_stats/elekid.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/elekid/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/entei.asm b/data/base_stats/entei.asm index 6db3cc3ec..c05954720 100644 --- a/data/base_stats/entei.asm +++ b/data/base_stats/entei.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/entei/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/espeon.asm b/data/base_stats/espeon.asm index 33f50bfb6..deebb0902 100644 --- a/data/base_stats/espeon.asm +++ b/data/base_stats/espeon.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/espeon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/exeggcute.asm b/data/base_stats/exeggcute.asm index b657f71c7..95daf462b 100644 --- a/data/base_stats/exeggcute.asm +++ b/data/base_stats/exeggcute.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/exeggcute/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/exeggutor.asm b/data/base_stats/exeggutor.asm index 34d7db139..d7561e6eb 100644 --- a/data/base_stats/exeggutor.asm +++ b/data/base_stats/exeggutor.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/exeggutor/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/farfetch_d.asm b/data/base_stats/farfetch_d.asm index 55c12ffcc..2ab5fb9e8 100644 --- a/data/base_stats/farfetch_d.asm +++ b/data/base_stats/farfetch_d.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/farfetch_d/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, FIELD ; egg groups diff --git a/data/base_stats/fearow.asm b/data/base_stats/fearow.asm index 2d6af3436..6cb670332 100644 --- a/data/base_stats/fearow.asm +++ b/data/base_stats/fearow.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/fearow/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/feraligatr.asm b/data/base_stats/feraligatr.asm index 78263e349..758fdb1da 100644 --- a/data/base_stats/feraligatr.asm +++ b/data/base_stats/feraligatr.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/feraligatr/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups diff --git a/data/base_stats/flaaffy.asm b/data/base_stats/flaaffy.asm index 9ac1d8e00..936ee3b1d 100644 --- a/data/base_stats/flaaffy.asm +++ b/data/base_stats/flaaffy.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/flaaffy/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups diff --git a/data/base_stats/flareon.asm b/data/base_stats/flareon.asm index 3c0312d19..345b9a385 100644 --- a/data/base_stats/flareon.asm +++ b/data/base_stats/flareon.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/flareon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/forretress.asm b/data/base_stats/forretress.asm index 9a8e56e84..ab36e1827 100644 --- a/data/base_stats/forretress.asm +++ b/data/base_stats/forretress.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/forretress/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/furret.asm b/data/base_stats/furret.asm index 2344f62d6..75180036c 100644 --- a/data/base_stats/furret.asm +++ b/data/base_stats/furret.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/furret/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/gastly.asm b/data/base_stats/gastly.asm index 69cf1bad5..dcec2fdca 100644 --- a/data/base_stats/gastly.asm +++ b/data/base_stats/gastly.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/gastly/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/gengar.asm b/data/base_stats/gengar.asm index 6659adfc3..5fe8894ef 100644 --- a/data/base_stats/gengar.asm +++ b/data/base_stats/gengar.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/gengar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/geodude.asm b/data/base_stats/geodude.asm index 030e56477..2b472bafc 100644 --- a/data/base_stats/geodude.asm +++ b/data/base_stats/geodude.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/geodude/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/girafarig.asm b/data/base_stats/girafarig.asm index 0b114eff5..3180513f7 100644 --- a/data/base_stats/girafarig.asm +++ b/data/base_stats/girafarig.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/girafarig/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/gligar.asm b/data/base_stats/gligar.asm index 527f022a1..3197e0203 100644 --- a/data/base_stats/gligar.asm +++ b/data/base_stats/gligar.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/gligar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/gloom.asm b/data/base_stats/gloom.asm index f0238e12f..d67f73d54 100644 --- a/data/base_stats/gloom.asm +++ b/data/base_stats/gloom.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/gloom/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/golbat.asm b/data/base_stats/golbat.asm index 7f0552c23..be69af4cf 100644 --- a/data/base_stats/golbat.asm +++ b/data/base_stats/golbat.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/golbat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/goldeen.asm b/data/base_stats/goldeen.asm index 81dfed80e..3769ce1b6 100644 --- a/data/base_stats/goldeen.asm +++ b/data/base_stats/goldeen.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/goldeen/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups diff --git a/data/base_stats/golduck.asm b/data/base_stats/golduck.asm index bced4b43d..b32d538b5 100644 --- a/data/base_stats/golduck.asm +++ b/data/base_stats/golduck.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/golduck/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups diff --git a/data/base_stats/golem.asm b/data/base_stats/golem.asm index d27186c20..b8fb85054 100644 --- a/data/base_stats/golem.asm +++ b/data/base_stats/golem.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/golem/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/granbull.asm b/data/base_stats/granbull.asm index 17570b165..c2dcda517 100644 --- a/data/base_stats/granbull.asm +++ b/data/base_stats/granbull.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/granbull/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FAIRY ; egg groups diff --git a/data/base_stats/graveler.asm b/data/base_stats/graveler.asm index 834a1c97b..17e4e8905 100644 --- a/data/base_stats/graveler.asm +++ b/data/base_stats/graveler.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/graveler/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/grimer.asm b/data/base_stats/grimer.asm index 2b289ede9..7fb64eb07 100644 --- a/data/base_stats/grimer.asm +++ b/data/base_stats/grimer.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/grimer/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/growlithe.asm b/data/base_stats/growlithe.asm index 1929f5674..a5e8676f6 100644 --- a/data/base_stats/growlithe.asm +++ b/data/base_stats/growlithe.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/growlithe/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/gyarados.asm b/data/base_stats/gyarados.asm index b7b0abbd5..9b57391c5 100644 --- a/data/base_stats/gyarados.asm +++ b/data/base_stats/gyarados.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 5 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/gyarados/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, REPTILE ; egg groups diff --git a/data/base_stats/haunter.asm b/data/base_stats/haunter.asm index a75cf79db..76f18a739 100644 --- a/data/base_stats/haunter.asm +++ b/data/base_stats/haunter.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/haunter/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/heracross.asm b/data/base_stats/heracross.asm index c8260e7d6..5d625bf58 100644 --- a/data/base_stats/heracross.asm +++ b/data/base_stats/heracross.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/heracross/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/hitmonchan.asm b/data/base_stats/hitmonchan.asm index 7753c3bd1..dbad48c61 100644 --- a/data/base_stats/hitmonchan.asm +++ b/data/base_stats/hitmonchan.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/hitmonchan/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/hitmonlee.asm b/data/base_stats/hitmonlee.asm index a2c53ca32..2a7c5a553 100644 --- a/data/base_stats/hitmonlee.asm +++ b/data/base_stats/hitmonlee.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/hitmonlee/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/hitmontop.asm b/data/base_stats/hitmontop.asm index af3eb7c88..b4e33a3ee 100644 --- a/data/base_stats/hitmontop.asm +++ b/data/base_stats/hitmontop.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/hitmontop/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/ho_oh.asm b/data/base_stats/ho_oh.asm index c9c1f639f..5e58d46ae 100644 --- a/data/base_stats/ho_oh.asm +++ b/data/base_stats/ho_oh.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown - dn 7 , 7 ; frontpic dimensions + INCBIN "gfx/pics/ho_oh/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/hoothoot.asm b/data/base_stats/hoothoot.asm index a9574bce8..1af3a01db 100644 --- a/data/base_stats/hoothoot.asm +++ b/data/base_stats/hoothoot.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/hoothoot/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/hoppip.asm b/data/base_stats/hoppip.asm index 2c284096c..ad2bb7a02 100644 --- a/data/base_stats/hoppip.asm +++ b/data/base_stats/hoppip.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/hoppip/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups diff --git a/data/base_stats/horsea.asm b/data/base_stats/horsea.asm index 3339872fe..5a4e06b84 100644 --- a/data/base_stats/horsea.asm +++ b/data/base_stats/horsea.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/horsea/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups diff --git a/data/base_stats/houndoom.asm b/data/base_stats/houndoom.asm index d0b82cb62..82271238c 100644 --- a/data/base_stats/houndoom.asm +++ b/data/base_stats/houndoom.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/houndoom/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/houndour.asm b/data/base_stats/houndour.asm index d661fa949..6f97bd086 100644 --- a/data/base_stats/houndour.asm +++ b/data/base_stats/houndour.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/houndour/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/hypno.asm b/data/base_stats/hypno.asm index 85dcc73e6..1bf322d95 100644 --- a/data/base_stats/hypno.asm +++ b/data/base_stats/hypno.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/hypno/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/igglybuff.asm b/data/base_stats/igglybuff.asm index 79e0ed733..1951f5aa0 100644 --- a/data/base_stats/igglybuff.asm +++ b/data/base_stats/igglybuff.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/igglybuff/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/ivysaur.asm b/data/base_stats/ivysaur.asm index aebfce677..032c2408c 100644 --- a/data/base_stats/ivysaur.asm +++ b/data/base_stats/ivysaur.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/ivysaur/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups diff --git a/data/base_stats/jigglypuff.asm b/data/base_stats/jigglypuff.asm index 38d5e57d3..66ab23227 100644 --- a/data/base_stats/jigglypuff.asm +++ b/data/base_stats/jigglypuff.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/jigglypuff/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups diff --git a/data/base_stats/jolteon.asm b/data/base_stats/jolteon.asm index 060c13a6f..3f956946a 100644 --- a/data/base_stats/jolteon.asm +++ b/data/base_stats/jolteon.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/jolteon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/jumpluff.asm b/data/base_stats/jumpluff.asm index 948d89ae9..7a857dec4 100644 --- a/data/base_stats/jumpluff.asm +++ b/data/base_stats/jumpluff.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/jumpluff/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups diff --git a/data/base_stats/jynx.asm b/data/base_stats/jynx.asm index 23f37107a..054dca9ae 100644 --- a/data/base_stats/jynx.asm +++ b/data/base_stats/jynx.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/jynx/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/kabuto.asm b/data/base_stats/kabuto.asm index 036821999..024f2791d 100644 --- a/data/base_stats/kabuto.asm +++ b/data/base_stats/kabuto.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/kabuto/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups diff --git a/data/base_stats/kabutops.asm b/data/base_stats/kabutops.asm index b0cdf9a76..3c5076954 100644 --- a/data/base_stats/kabutops.asm +++ b/data/base_stats/kabutops.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/kabutops/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups diff --git a/data/base_stats/kadabra.asm b/data/base_stats/kadabra.asm index 0cdf2b74f..bf5f33638 100644 --- a/data/base_stats/kadabra.asm +++ b/data/base_stats/kadabra.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/kadabra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/kakuna.asm b/data/base_stats/kakuna.asm index c48ad4c6c..827e17262 100644 --- a/data/base_stats/kakuna.asm +++ b/data/base_stats/kakuna.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/kakuna/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/kangaskhan.asm b/data/base_stats/kangaskhan.asm index 1958b1ce3..ca6094ad7 100644 --- a/data/base_stats/kangaskhan.asm +++ b/data/base_stats/kangaskhan.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/kangaskhan/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups diff --git a/data/base_stats/kingdra.asm b/data/base_stats/kingdra.asm index ac049ac4a..ac4dfd659 100644 --- a/data/base_stats/kingdra.asm +++ b/data/base_stats/kingdra.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/kingdra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups diff --git a/data/base_stats/kingler.asm b/data/base_stats/kingler.asm index bb0e19904..65c3344ac 100644 --- a/data/base_stats/kingler.asm +++ b/data/base_stats/kingler.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/kingler/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups diff --git a/data/base_stats/koffing.asm b/data/base_stats/koffing.asm index 9851a985e..b46e8241e 100644 --- a/data/base_stats/koffing.asm +++ b/data/base_stats/koffing.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/koffing/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/krabby.asm b/data/base_stats/krabby.asm index 54ec9eab4..517d3bd07 100644 --- a/data/base_stats/krabby.asm +++ b/data/base_stats/krabby.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/krabby/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups diff --git a/data/base_stats/lanturn.asm b/data/base_stats/lanturn.asm index 046ebc0bb..f4dd4cd3a 100644 --- a/data/base_stats/lanturn.asm +++ b/data/base_stats/lanturn.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/lanturn/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, FISH ; egg groups diff --git a/data/base_stats/lapras.asm b/data/base_stats/lapras.asm index df595b8c5..e57154bc6 100644 --- a/data/base_stats/lapras.asm +++ b/data/base_stats/lapras.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/lapras/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups diff --git a/data/base_stats/larvitar.asm b/data/base_stats/larvitar.asm index 4115fd7ae..03a9be50f 100644 --- a/data/base_stats/larvitar.asm +++ b/data/base_stats/larvitar.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/larvitar/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups diff --git a/data/base_stats/ledian.asm b/data/base_stats/ledian.asm index 37f7c1478..a1ca61629 100644 --- a/data/base_stats/ledian.asm +++ b/data/base_stats/ledian.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/ledian/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/ledyba.asm b/data/base_stats/ledyba.asm index 2beb81883..a01e329b1 100644 --- a/data/base_stats/ledyba.asm +++ b/data/base_stats/ledyba.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/ledyba/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/lickitung.asm b/data/base_stats/lickitung.asm index 14bb7160b..8b915bc59 100644 --- a/data/base_stats/lickitung.asm +++ b/data/base_stats/lickitung.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/lickitung/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups diff --git a/data/base_stats/lugia.asm b/data/base_stats/lugia.asm index aa7b6297c..26f337e2a 100644 --- a/data/base_stats/lugia.asm +++ b/data/base_stats/lugia.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/lugia/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/machamp.asm b/data/base_stats/machamp.asm index 091fe7391..056ce3945 100644 --- a/data/base_stats/machamp.asm +++ b/data/base_stats/machamp.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/machamp/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/machoke.asm b/data/base_stats/machoke.asm index 355aee6d8..3fdec0eb2 100644 --- a/data/base_stats/machoke.asm +++ b/data/base_stats/machoke.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/machoke/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/machop.asm b/data/base_stats/machop.asm index 60f0ae04a..bdde42528 100644 --- a/data/base_stats/machop.asm +++ b/data/base_stats/machop.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/machop/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/magby.asm b/data/base_stats/magby.asm index 84c9c30a0..876bceb3f 100644 --- a/data/base_stats/magby.asm +++ b/data/base_stats/magby.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/magby/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/magcargo.asm b/data/base_stats/magcargo.asm index 6a245c784..bdbd0ca97 100644 --- a/data/base_stats/magcargo.asm +++ b/data/base_stats/magcargo.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/magcargo/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/magikarp.asm b/data/base_stats/magikarp.asm index d8620a4eb..5d489fbff 100644 --- a/data/base_stats/magikarp.asm +++ b/data/base_stats/magikarp.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 5 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/magikarp/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, REPTILE ; egg groups diff --git a/data/base_stats/magmar.asm b/data/base_stats/magmar.asm index 9b1e15ac1..3c27ad670 100644 --- a/data/base_stats/magmar.asm +++ b/data/base_stats/magmar.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/magmar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/magnemite.asm b/data/base_stats/magnemite.asm index e7ba32b37..78a3ddea6 100644 --- a/data/base_stats/magnemite.asm +++ b/data/base_stats/magnemite.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/magnemite/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/magneton.asm b/data/base_stats/magneton.asm index dbe564757..8b9158bba 100644 --- a/data/base_stats/magneton.asm +++ b/data/base_stats/magneton.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/magneton/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/mankey.asm b/data/base_stats/mankey.asm index 50c0e6c69..7ee15d3f7 100644 --- a/data/base_stats/mankey.asm +++ b/data/base_stats/mankey.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/mankey/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/mantine.asm b/data/base_stats/mantine.asm index 5253d178b..e8730d787 100644 --- a/data/base_stats/mantine.asm +++ b/data/base_stats/mantine.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/mantine/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups diff --git a/data/base_stats/mareep.asm b/data/base_stats/mareep.asm index 46b26f018..366863245 100644 --- a/data/base_stats/mareep.asm +++ b/data/base_stats/mareep.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/mareep/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups diff --git a/data/base_stats/marill.asm b/data/base_stats/marill.asm index 6c187a9d3..7d9f4ce8a 100644 --- a/data/base_stats/marill.asm +++ b/data/base_stats/marill.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/marill/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, FAIRY ; egg groups diff --git a/data/base_stats/marowak.asm b/data/base_stats/marowak.asm index d8f45a05d..76b7e4870 100644 --- a/data/base_stats/marowak.asm +++ b/data/base_stats/marowak.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/marowak/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups diff --git a/data/base_stats/meganium.asm b/data/base_stats/meganium.asm index 952f53a07..57f228c28 100644 --- a/data/base_stats/meganium.asm +++ b/data/base_stats/meganium.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/meganium/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups diff --git a/data/base_stats/meowth.asm b/data/base_stats/meowth.asm index 159c7525c..f795aa4c2 100644 --- a/data/base_stats/meowth.asm +++ b/data/base_stats/meowth.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/meowth/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/metapod.asm b/data/base_stats/metapod.asm index 100c33f41..deb7bc8e7 100644 --- a/data/base_stats/metapod.asm +++ b/data/base_stats/metapod.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/metapod/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/mew.asm b/data/base_stats/mew.asm index 26405aa5d..7544467c7 100644 --- a/data/base_stats/mew.asm +++ b/data/base_stats/mew.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/mew/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/mewtwo.asm b/data/base_stats/mewtwo.asm index 575b0cd7e..61e01c32c 100644 --- a/data/base_stats/mewtwo.asm +++ b/data/base_stats/mewtwo.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 120 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/mewtwo/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/miltank.asm b/data/base_stats/miltank.asm index c356605c7..7083c15c7 100644 --- a/data/base_stats/miltank.asm +++ b/data/base_stats/miltank.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/miltank/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/misdreavus.asm b/data/base_stats/misdreavus.asm index bc360bc86..5811aa665 100644 --- a/data/base_stats/misdreavus.asm +++ b/data/base_stats/misdreavus.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/misdreavus/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/moltres.asm b/data/base_stats/moltres.asm index e57559c9a..13eb7e7af 100644 --- a/data/base_stats/moltres.asm +++ b/data/base_stats/moltres.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/moltres/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/mr__mime.asm b/data/base_stats/mr__mime.asm index 4c692f739..3a271baf4 100644 --- a/data/base_stats/mr__mime.asm +++ b/data/base_stats/mr__mime.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/mr__mime/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups diff --git a/data/base_stats/muk.asm b/data/base_stats/muk.asm index d041042e4..7669e59b0 100644 --- a/data/base_stats/muk.asm +++ b/data/base_stats/muk.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/muk/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/murkrow.asm b/data/base_stats/murkrow.asm index d13e9607c..08a1d7143 100644 --- a/data/base_stats/murkrow.asm +++ b/data/base_stats/murkrow.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/murkrow/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/natu.asm b/data/base_stats/natu.asm index 8739ce260..2f65b73ba 100644 --- a/data/base_stats/natu.asm +++ b/data/base_stats/natu.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/natu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/nidoking.asm b/data/base_stats/nidoking.asm index 0c004b1f4..a5d6abef0 100644 --- a/data/base_stats/nidoking.asm +++ b/data/base_stats/nidoking.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/nidoking/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups diff --git a/data/base_stats/nidoqueen.asm b/data/base_stats/nidoqueen.asm index a946e8837..cf888b7eb 100644 --- a/data/base_stats/nidoqueen.asm +++ b/data/base_stats/nidoqueen.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/nidoqueen/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/nidoran_f.asm b/data/base_stats/nidoran_f.asm index c336a6330..e80b622c9 100644 --- a/data/base_stats/nidoran_f.asm +++ b/data/base_stats/nidoran_f.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/nidoran_f/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups diff --git a/data/base_stats/nidoran_m.asm b/data/base_stats/nidoran_m.asm index be3c87d0a..1029a2511 100644 --- a/data/base_stats/nidoran_m.asm +++ b/data/base_stats/nidoran_m.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/nidoran_m/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups diff --git a/data/base_stats/nidorina.asm b/data/base_stats/nidorina.asm index 238144bc8..3ca843e85 100644 --- a/data/base_stats/nidorina.asm +++ b/data/base_stats/nidorina.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/nidorina/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/nidorino.asm b/data/base_stats/nidorino.asm index 307382c45..c853ef943 100644 --- a/data/base_stats/nidorino.asm +++ b/data/base_stats/nidorino.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/nidorino/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups diff --git a/data/base_stats/ninetales.asm b/data/base_stats/ninetales.asm index 34befe1d6..c651f8c57 100644 --- a/data/base_stats/ninetales.asm +++ b/data/base_stats/ninetales.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/ninetales/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/noctowl.asm b/data/base_stats/noctowl.asm index fedbc1228..7c97fd769 100644 --- a/data/base_stats/noctowl.asm +++ b/data/base_stats/noctowl.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/noctowl/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/octillery.asm b/data/base_stats/octillery.asm index 24910f46b..1d64afa82 100644 --- a/data/base_stats/octillery.asm +++ b/data/base_stats/octillery.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/octillery/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FISH ; egg groups diff --git a/data/base_stats/oddish.asm b/data/base_stats/oddish.asm index d0db4bd32..dc91485b6 100644 --- a/data/base_stats/oddish.asm +++ b/data/base_stats/oddish.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/oddish/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/omanyte.asm b/data/base_stats/omanyte.asm index b1a81d7e5..0e511f244 100644 --- a/data/base_stats/omanyte.asm +++ b/data/base_stats/omanyte.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/omanyte/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups diff --git a/data/base_stats/omastar.asm b/data/base_stats/omastar.asm index 69e4317a3..7e35a8987 100644 --- a/data/base_stats/omastar.asm +++ b/data/base_stats/omastar.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 30 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/omastar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups diff --git a/data/base_stats/onix.asm b/data/base_stats/onix.asm index dc937f1ad..f67c1eb86 100644 --- a/data/base_stats/onix.asm +++ b/data/base_stats/onix.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/onix/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/paras.asm b/data/base_stats/paras.asm index 1051395ab..4994aa8dd 100644 --- a/data/base_stats/paras.asm +++ b/data/base_stats/paras.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/paras/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, PLANT ; egg groups diff --git a/data/base_stats/parasect.asm b/data/base_stats/parasect.asm index 7ec7f8837..310eba07f 100644 --- a/data/base_stats/parasect.asm +++ b/data/base_stats/parasect.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/parasect/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, PLANT ; egg groups diff --git a/data/base_stats/persian.asm b/data/base_stats/persian.asm index d945188d0..f76ecaaae 100644 --- a/data/base_stats/persian.asm +++ b/data/base_stats/persian.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/persian/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/phanpy.asm b/data/base_stats/phanpy.asm index 40a9a5fb6..08ff39595 100644 --- a/data/base_stats/phanpy.asm +++ b/data/base_stats/phanpy.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/phanpy/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/pichu.asm b/data/base_stats/pichu.asm index be3607b36..dbadc22d3 100644 --- a/data/base_stats/pichu.asm +++ b/data/base_stats/pichu.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/pichu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/pidgeot.asm b/data/base_stats/pidgeot.asm index 9689c83b9..1024b6624 100644 --- a/data/base_stats/pidgeot.asm +++ b/data/base_stats/pidgeot.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/pidgeot/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/pidgeotto.asm b/data/base_stats/pidgeotto.asm index 5dfc5494a..8e9d434a3 100644 --- a/data/base_stats/pidgeotto.asm +++ b/data/base_stats/pidgeotto.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/pidgeotto/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/pidgey.asm b/data/base_stats/pidgey.asm index e5a110c14..d5f8fa630 100644 --- a/data/base_stats/pidgey.asm +++ b/data/base_stats/pidgey.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/pidgey/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/pikachu.asm b/data/base_stats/pikachu.asm index 0c1306eee..5875b1ea7 100644 --- a/data/base_stats/pikachu.asm +++ b/data/base_stats/pikachu.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/pikachu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FAIRY ; egg groups diff --git a/data/base_stats/piloswine.asm b/data/base_stats/piloswine.asm index bf3ca9296..3da32746b 100644 --- a/data/base_stats/piloswine.asm +++ b/data/base_stats/piloswine.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/piloswine/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/pineco.asm b/data/base_stats/pineco.asm index 2711aa89a..43289701c 100644 --- a/data/base_stats/pineco.asm +++ b/data/base_stats/pineco.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/pineco/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/pinsir.asm b/data/base_stats/pinsir.asm index 4c06d8612..cd07cde27 100644 --- a/data/base_stats/pinsir.asm +++ b/data/base_stats/pinsir.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/pinsir/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/politoed.asm b/data/base_stats/politoed.asm index 889b4a56c..8b510fc8f 100644 --- a/data/base_stats/politoed.asm +++ b/data/base_stats/politoed.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/politoed/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups diff --git a/data/base_stats/poliwag.asm b/data/base_stats/poliwag.asm index 818e7ff56..abcab97e2 100644 --- a/data/base_stats/poliwag.asm +++ b/data/base_stats/poliwag.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/poliwag/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups diff --git a/data/base_stats/poliwhirl.asm b/data/base_stats/poliwhirl.asm index e26cfc4af..c2aac43f7 100644 --- a/data/base_stats/poliwhirl.asm +++ b/data/base_stats/poliwhirl.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/poliwhirl/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups diff --git a/data/base_stats/poliwrath.asm b/data/base_stats/poliwrath.asm index 6b90592d1..1e3130078 100644 --- a/data/base_stats/poliwrath.asm +++ b/data/base_stats/poliwrath.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/poliwrath/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups diff --git a/data/base_stats/ponyta.asm b/data/base_stats/ponyta.asm index f8df9a0f2..2366b1b12 100644 --- a/data/base_stats/ponyta.asm +++ b/data/base_stats/ponyta.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/ponyta/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/porygon.asm b/data/base_stats/porygon.asm index 828e813aa..340c79af1 100644 --- a/data/base_stats/porygon.asm +++ b/data/base_stats/porygon.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/porygon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/porygon2.asm b/data/base_stats/porygon2.asm index d180b44ac..6c5a518a7 100644 --- a/data/base_stats/porygon2.asm +++ b/data/base_stats/porygon2.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/porygon2/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/primeape.asm b/data/base_stats/primeape.asm index 7a7e753f0..4abd0b68f 100644 --- a/data/base_stats/primeape.asm +++ b/data/base_stats/primeape.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/primeape/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/psyduck.asm b/data/base_stats/psyduck.asm index d95ff0e92..bbd0e64e3 100644 --- a/data/base_stats/psyduck.asm +++ b/data/base_stats/psyduck.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/psyduck/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups diff --git a/data/base_stats/pupitar.asm b/data/base_stats/pupitar.asm index 98f0782fc..643b88e34 100644 --- a/data/base_stats/pupitar.asm +++ b/data/base_stats/pupitar.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/pupitar/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups diff --git a/data/base_stats/quagsire.asm b/data/base_stats/quagsire.asm index 5ffaf7dab..3e65ce4a1 100644 --- a/data/base_stats/quagsire.asm +++ b/data/base_stats/quagsire.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/quagsire/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups diff --git a/data/base_stats/quilava.asm b/data/base_stats/quilava.asm index 58662b46a..f1d9a8b3c 100644 --- a/data/base_stats/quilava.asm +++ b/data/base_stats/quilava.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/quilava/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/qwilfish.asm b/data/base_stats/qwilfish.asm index 5bd9e1c5e..5308e60ef 100644 --- a/data/base_stats/qwilfish.asm +++ b/data/base_stats/qwilfish.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/qwilfish/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups diff --git a/data/base_stats/raichu.asm b/data/base_stats/raichu.asm index c63552517..aefc56713 100644 --- a/data/base_stats/raichu.asm +++ b/data/base_stats/raichu.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/raichu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FAIRY ; egg groups diff --git a/data/base_stats/raikou.asm b/data/base_stats/raikou.asm index 8d5bf96bf..26966258d 100644 --- a/data/base_stats/raikou.asm +++ b/data/base_stats/raikou.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/raikou/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/rapidash.asm b/data/base_stats/rapidash.asm index e3684e5e9..a55f7cd36 100644 --- a/data/base_stats/rapidash.asm +++ b/data/base_stats/rapidash.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/rapidash/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/raticate.asm b/data/base_stats/raticate.asm index 361e003aa..6248cf4ca 100644 --- a/data/base_stats/raticate.asm +++ b/data/base_stats/raticate.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/raticate/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/rattata.asm b/data/base_stats/rattata.asm index ac5ac1acb..0fb688d58 100644 --- a/data/base_stats/rattata.asm +++ b/data/base_stats/rattata.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/rattata/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/remoraid.asm b/data/base_stats/remoraid.asm index 9218ba8c1..4af024564 100644 --- a/data/base_stats/remoraid.asm +++ b/data/base_stats/remoraid.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/remoraid/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FISH ; egg groups diff --git a/data/base_stats/rhydon.asm b/data/base_stats/rhydon.asm index 0190aa5cb..8890718a5 100644 --- a/data/base_stats/rhydon.asm +++ b/data/base_stats/rhydon.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/rhydon/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, FIELD ; egg groups diff --git a/data/base_stats/rhyhorn.asm b/data/base_stats/rhyhorn.asm index 717a872c0..33cff8b54 100644 --- a/data/base_stats/rhyhorn.asm +++ b/data/base_stats/rhyhorn.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/rhyhorn/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, FIELD ; egg groups diff --git a/data/base_stats/sandshrew.asm b/data/base_stats/sandshrew.asm index 53288890e..f2148f9fa 100644 --- a/data/base_stats/sandshrew.asm +++ b/data/base_stats/sandshrew.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/sandshrew/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/sandslash.asm b/data/base_stats/sandslash.asm index 1067ccb3e..ae4c38df0 100644 --- a/data/base_stats/sandslash.asm +++ b/data/base_stats/sandslash.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/sandslash/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/scizor.asm b/data/base_stats/scizor.asm index af9bfc938..c05fa7aca 100644 --- a/data/base_stats/scizor.asm +++ b/data/base_stats/scizor.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/scizor/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/scyther.asm b/data/base_stats/scyther.asm index 7de348478..e01386c6e 100644 --- a/data/base_stats/scyther.asm +++ b/data/base_stats/scyther.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/scyther/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/seadra.asm b/data/base_stats/seadra.asm index f43abfaa0..b242641c3 100644 --- a/data/base_stats/seadra.asm +++ b/data/base_stats/seadra.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/seadra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups diff --git a/data/base_stats/seaking.asm b/data/base_stats/seaking.asm index 9543366bf..381c61298 100644 --- a/data/base_stats/seaking.asm +++ b/data/base_stats/seaking.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/seaking/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups diff --git a/data/base_stats/seel.asm b/data/base_stats/seel.asm index 873d410aa..2589fc272 100644 --- a/data/base_stats/seel.asm +++ b/data/base_stats/seel.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/seel/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups diff --git a/data/base_stats/sentret.asm b/data/base_stats/sentret.asm index 1b66348e2..25c7b779c 100644 --- a/data/base_stats/sentret.asm +++ b/data/base_stats/sentret.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/sentret/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/shellder.asm b/data/base_stats/shellder.asm index 86b69a62f..7d7f801d7 100644 --- a/data/base_stats/shellder.asm +++ b/data/base_stats/shellder.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/shellder/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups diff --git a/data/base_stats/shuckle.asm b/data/base_stats/shuckle.asm index ef76037fd..9f2cee33b 100644 --- a/data/base_stats/shuckle.asm +++ b/data/base_stats/shuckle.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/shuckle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/skarmory.asm b/data/base_stats/skarmory.asm index 334803e0a..106cee7f3 100644 --- a/data/base_stats/skarmory.asm +++ b/data/base_stats/skarmory.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/skarmory/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/skiploom.asm b/data/base_stats/skiploom.asm index dab6b1acd..2920f19f0 100644 --- a/data/base_stats/skiploom.asm +++ b/data/base_stats/skiploom.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/skiploom/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups diff --git a/data/base_stats/slowbro.asm b/data/base_stats/slowbro.asm index 1a1743ceb..7c6520d8a 100644 --- a/data/base_stats/slowbro.asm +++ b/data/base_stats/slowbro.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/slowbro/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups diff --git a/data/base_stats/slowking.asm b/data/base_stats/slowking.asm index 699bf8467..4974b23c5 100644 --- a/data/base_stats/slowking.asm +++ b/data/base_stats/slowking.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/slowking/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups diff --git a/data/base_stats/slowpoke.asm b/data/base_stats/slowpoke.asm index 250d37fd7..4ad676ab0 100644 --- a/data/base_stats/slowpoke.asm +++ b/data/base_stats/slowpoke.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/slowpoke/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups diff --git a/data/base_stats/slugma.asm b/data/base_stats/slugma.asm index 2694300dd..52da7221f 100644 --- a/data/base_stats/slugma.asm +++ b/data/base_stats/slugma.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/slugma/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/smeargle.asm b/data/base_stats/smeargle.asm index f7363ca25..e3011c8d2 100644 --- a/data/base_stats/smeargle.asm +++ b/data/base_stats/smeargle.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/smeargle/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/smoochum.asm b/data/base_stats/smoochum.asm index 20b79b263..985a52a19 100644 --- a/data/base_stats/smoochum.asm +++ b/data/base_stats/smoochum.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/smoochum/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/sneasel.asm b/data/base_stats/sneasel.asm index 939c11b5a..eb62897eb 100644 --- a/data/base_stats/sneasel.asm +++ b/data/base_stats/sneasel.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/sneasel/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/snorlax.asm b/data/base_stats/snorlax.asm index 9bd0bcb66..e04cd1442 100644 --- a/data/base_stats/snorlax.asm +++ b/data/base_stats/snorlax.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/snorlax/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups diff --git a/data/base_stats/snubbull.asm b/data/base_stats/snubbull.asm index fc537900e..3ac629f26 100644 --- a/data/base_stats/snubbull.asm +++ b/data/base_stats/snubbull.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/snubbull/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FAIRY ; egg groups diff --git a/data/base_stats/spearow.asm b/data/base_stats/spearow.asm index e422d750f..4321aa799 100644 --- a/data/base_stats/spearow.asm +++ b/data/base_stats/spearow.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/spearow/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/spinarak.asm b/data/base_stats/spinarak.asm index bc1d997f9..7f00a4677 100644 --- a/data/base_stats/spinarak.asm +++ b/data/base_stats/spinarak.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/spinarak/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/squirtle.asm b/data/base_stats/squirtle.asm index 0ba0d4b81..06484e52c 100644 --- a/data/base_stats/squirtle.asm +++ b/data/base_stats/squirtle.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/squirtle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups diff --git a/data/base_stats/stantler.asm b/data/base_stats/stantler.asm index 9ab141b94..911e1904f 100644 --- a/data/base_stats/stantler.asm +++ b/data/base_stats/stantler.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/stantler/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/starmie.asm b/data/base_stats/starmie.asm index 69410ba86..dbc2122bb 100644 --- a/data/base_stats/starmie.asm +++ b/data/base_stats/starmie.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/starmie/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups diff --git a/data/base_stats/staryu.asm b/data/base_stats/staryu.asm index 18e958528..6d0d90eb3 100644 --- a/data/base_stats/staryu.asm +++ b/data/base_stats/staryu.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/staryu/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups diff --git a/data/base_stats/steelix.asm b/data/base_stats/steelix.asm index 11c3d031c..f740d0c02 100644 --- a/data/base_stats/steelix.asm +++ b/data/base_stats/steelix.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/steelix/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/sudowoodo.asm b/data/base_stats/sudowoodo.asm index 9d13d5628..6ddc4cd57 100644 --- a/data/base_stats/sudowoodo.asm +++ b/data/base_stats/sudowoodo.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/sudowoodo/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/suicune.asm b/data/base_stats/suicune.asm index 2abe525c8..6262bd513 100644 --- a/data/base_stats/suicune.asm +++ b/data/base_stats/suicune.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/suicune/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/sunflora.asm b/data/base_stats/sunflora.asm index 8ec14fb96..d8f01ebad 100644 --- a/data/base_stats/sunflora.asm +++ b/data/base_stats/sunflora.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/sunflora/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/sunkern.asm b/data/base_stats/sunkern.asm index c75e83a36..2cab9d9a1 100644 --- a/data/base_stats/sunkern.asm +++ b/data/base_stats/sunkern.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/sunkern/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/swinub.asm b/data/base_stats/swinub.asm index f9a6be4fa..70b389b30 100644 --- a/data/base_stats/swinub.asm +++ b/data/base_stats/swinub.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/swinub/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/tangela.asm b/data/base_stats/tangela.asm index bf539b28a..d379fdb92 100644 --- a/data/base_stats/tangela.asm +++ b/data/base_stats/tangela.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/tangela/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/tauros.asm b/data/base_stats/tauros.asm index d67ba30cb..365de3f8d 100644 --- a/data/base_stats/tauros.asm +++ b/data/base_stats/tauros.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/tauros/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/teddiursa.asm b/data/base_stats/teddiursa.asm index 81eebe7ba..0269d4c68 100644 --- a/data/base_stats/teddiursa.asm +++ b/data/base_stats/teddiursa.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/teddiursa/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/tentacool.asm b/data/base_stats/tentacool.asm index ebbfd26e0..e225309e5 100644 --- a/data/base_stats/tentacool.asm +++ b/data/base_stats/tentacool.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/tentacool/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups diff --git a/data/base_stats/tentacruel.asm b/data/base_stats/tentacruel.asm index fd23df31a..22b2a3808 100644 --- a/data/base_stats/tentacruel.asm +++ b/data/base_stats/tentacruel.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/tentacruel/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups diff --git a/data/base_stats/togepi.asm b/data/base_stats/togepi.asm index 8d156f518..1bf6cc339 100644 --- a/data/base_stats/togepi.asm +++ b/data/base_stats/togepi.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/togepi/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/togetic.asm b/data/base_stats/togetic.asm index de55594b7..f8330c50f 100644 --- a/data/base_stats/togetic.asm +++ b/data/base_stats/togetic.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/togetic/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AVIAN, FAIRY ; egg groups diff --git a/data/base_stats/totodile.asm b/data/base_stats/totodile.asm index 46521a06c..3d57dbc89 100644 --- a/data/base_stats/totodile.asm +++ b/data/base_stats/totodile.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/totodile/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups diff --git a/data/base_stats/typhlosion.asm b/data/base_stats/typhlosion.asm index 31adbd154..a73529cef 100644 --- a/data/base_stats/typhlosion.asm +++ b/data/base_stats/typhlosion.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/typhlosion/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/tyranitar.asm b/data/base_stats/tyranitar.asm index 78f09ec1e..c116bdde3 100644 --- a/data/base_stats/tyranitar.asm +++ b/data/base_stats/tyranitar.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/tyranitar/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups diff --git a/data/base_stats/tyrogue.asm b/data/base_stats/tyrogue.asm index c128a7b9c..87d44a3c5 100644 --- a/data/base_stats/tyrogue.asm +++ b/data/base_stats/tyrogue.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 25 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/tyrogue/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/umbreon.asm b/data/base_stats/umbreon.asm index fadc9d9f8..1274f6afa 100644 --- a/data/base_stats/umbreon.asm +++ b/data/base_stats/umbreon.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/umbreon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/unown.asm b/data/base_stats/unown.asm index 0b5308aa9..d447757eb 100644 --- a/data/base_stats/unown.asm +++ b/data/base_stats/unown.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 40 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/unown_a/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/ursaring.asm b/data/base_stats/ursaring.asm index 5e9171366..ba87a54ff 100644 --- a/data/base_stats/ursaring.asm +++ b/data/base_stats/ursaring.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/ursaring/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/vaporeon.asm b/data/base_stats/vaporeon.asm index 981fdc314..7d024d5fd 100644 --- a/data/base_stats/vaporeon.asm +++ b/data/base_stats/vaporeon.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 35 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/vaporeon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/venomoth.asm b/data/base_stats/venomoth.asm index c31068c8f..c2ac64222 100644 --- a/data/base_stats/venomoth.asm +++ b/data/base_stats/venomoth.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/venomoth/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/venonat.asm b/data/base_stats/venonat.asm index 92e7de208..ef662fb91 100644 --- a/data/base_stats/venonat.asm +++ b/data/base_stats/venonat.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/venonat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/venusaur.asm b/data/base_stats/venusaur.asm index 88b839a08..728508bee 100644 --- a/data/base_stats/venusaur.asm +++ b/data/base_stats/venusaur.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/venusaur/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups diff --git a/data/base_stats/victreebel.asm b/data/base_stats/victreebel.asm index 85701718f..fd33d5c1c 100644 --- a/data/base_stats/victreebel.asm +++ b/data/base_stats/victreebel.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/victreebel/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/vileplume.asm b/data/base_stats/vileplume.asm index 5160c052c..f6f4b370e 100644 --- a/data/base_stats/vileplume.asm +++ b/data/base_stats/vileplume.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/vileplume/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/voltorb.asm b/data/base_stats/voltorb.asm index b4d9b1538..5daf64af9 100644 --- a/data/base_stats/voltorb.asm +++ b/data/base_stats/voltorb.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/voltorb/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups diff --git a/data/base_stats/vulpix.asm b/data/base_stats/vulpix.asm index f0bd24047..0212212ff 100644 --- a/data/base_stats/vulpix.asm +++ b/data/base_stats/vulpix.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/vulpix/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups diff --git a/data/base_stats/wartortle.asm b/data/base_stats/wartortle.asm index 28b0d42c2..751d881ef 100644 --- a/data/base_stats/wartortle.asm +++ b/data/base_stats/wartortle.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/wartortle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups diff --git a/data/base_stats/weedle.asm b/data/base_stats/weedle.asm index f11ee09e3..acc241e74 100644 --- a/data/base_stats/weedle.asm +++ b/data/base_stats/weedle.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/weedle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/weepinbell.asm b/data/base_stats/weepinbell.asm index c85075e92..b87ba6326 100644 --- a/data/base_stats/weepinbell.asm +++ b/data/base_stats/weepinbell.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/weepinbell/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups diff --git a/data/base_stats/weezing.asm b/data/base_stats/weezing.asm index 8a0d25bcb..96a645828 100644 --- a/data/base_stats/weezing.asm +++ b/data/base_stats/weezing.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/weezing/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/wigglytuff.asm b/data/base_stats/wigglytuff.asm index 0edc4dea4..82321d595 100644 --- a/data/base_stats/wigglytuff.asm +++ b/data/base_stats/wigglytuff.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 10 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/wigglytuff/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups diff --git a/data/base_stats/wobbuffet.asm b/data/base_stats/wobbuffet.asm index 526139934..4b865b33c 100644 --- a/data/base_stats/wobbuffet.asm +++ b/data/base_stats/wobbuffet.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/wobbuffet/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups diff --git a/data/base_stats/wooper.asm b/data/base_stats/wooper.asm index 8449cda10..0f0d53630 100644 --- a/data/base_stats/wooper.asm +++ b/data/base_stats/wooper.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/wooper/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups diff --git a/data/base_stats/xatu.asm b/data/base_stats/xatu.asm index b5ef96969..ba0e964af 100644 --- a/data/base_stats/xatu.asm +++ b/data/base_stats/xatu.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/xatu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups diff --git a/data/base_stats/yanma.asm b/data/base_stats/yanma.asm index 6fe69d8c5..96cf497be 100644 --- a/data/base_stats/yanma.asm +++ b/data/base_stats/yanma.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 20 ; step cycles to hatch db 5 ; unknown - dn 6, 6 ; frontpic dimensions + INCBIN "gfx/pics/yanma/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups diff --git a/data/base_stats/zapdos.asm b/data/base_stats/zapdos.asm index 4999c463a..eece9b897 100644 --- a/data/base_stats/zapdos.asm +++ b/data/base_stats/zapdos.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 80 ; step cycles to hatch db 5 ; unknown - dn 7, 7 ; frontpic dimensions + INCBIN "gfx/pics/zapdos/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups diff --git a/data/base_stats/zubat.asm b/data/base_stats/zubat.asm index 882d8d436..ac5f450d1 100644 --- a/data/base_stats/zubat.asm +++ b/data/base_stats/zubat.asm @@ -12,7 +12,7 @@ db 100 ; unknown db 15 ; step cycles to hatch db 5 ; unknown - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pics/zubat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups