ref: 5dfe27125b589a6a38c5d43fddd3724386e9803b
parent: fc300ab0ee63a1ecbcead67c3a7019a0bfe8deb5
parent: dbaec2053429e04f21613c3c0964e213008bfdb9
author: yenatch <yenatch@gmail.com>
date: Sat Jun 24 16:42:25 EDT 2017
Merge branch 'master' into tools-makefile-integration
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@
*.dimensions
*.gbcpal
*.2bpp
+*.1bpp
*.lz
*.pal
*.animated.tilemap
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -7,7 +7,7 @@
# 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
@@ -54,10 +54,10 @@
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**:
--- 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
@@ -44,7 +48,7 @@
make clean -C tools/
compare: $(roms)
- @$(MD5) roms.md5
+ @$(SHA1) -c roms.sha1
tools:
make -C tools/
@@ -66,22 +70,14 @@
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.
+# 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 [ -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.
@@ -126,20 +122,82 @@
# Misc file-specific graphics rules
-gfx/shrink%.2bpp: gfx/shrink%.png
- rgbgfx -h -o $@ $<
+gfx/shrink1.2bpp: rgbgfx += -h
+gfx/shrink2.2bpp: rgbgfx += -h
-gfx/trainers/%.2bpp: gfx/trainers/%.png
- rgbgfx -h -o $@ $<
+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
+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
+
+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
+
+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
+
+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
+
+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/unknown_egg.2bpp: rgbgfx += -h
+gfx/misc/player.2bpp: rgbgfx += -h
+gfx/misc/pokegear.2bpp: rgbgfx += -x2
+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: ;
%.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
--- a/README.md
+++ b/README.md
@@ -1,19 +1,16 @@
-# Pokémon Crystal
+# Pokémon Crystal [![Build Status][travis-badge]][travis]
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).
+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
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -229,7 +229,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.ChannelFnPtrs:
dw .Channel1
@@ -1389,7 +1389,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; e8720
--- a/battle/ai/items.asm
+++ b/battle/ai/items.asm
@@ -211,7 +211,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.callback
pop de
pop hl
@@ -238,7 +238,7 @@
res SUBSTATUS_RAGE, [hl]
xor a
- ld [LastPlayerCounterMove], a
+ ld [LastEnemyCounterMove], a
scf
ret
--- a/battle/ai/redundant.asm
+++ b/battle/ai/redundant.asm
@@ -11,7 +11,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Moves: ; 2c42c
dbw EFFECT_DREAM_EATER, .DreamEater
--- a/battle/ai/scoring.asm
+++ b/battle/ai/scoring.asm
@@ -756,7 +756,7 @@
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_Mimic: ; 38ba8
- ld a, [LastEnemyCounterMove]
+ ld a, [LastPlayerCounterMove]
and a
jr z, .asm_38be9
@@ -1361,7 +1361,7 @@
jr nc, .asm_38bef
push hl
- ld a, [LastEnemyCounterMove]
+ ld a, [LastPlayerCounterMove]
call AIGetEnemyMove
ld a, $1
@@ -1380,7 +1380,7 @@
dec [hl]
.asm_38bd4
- ld a, [LastEnemyCounterMove]
+ ld a, [LastPlayerCounterMove]
push hl
ld hl, UsefulMoves
ld de, 1
@@ -1438,7 +1438,7 @@
cp $3
jr nc, .asm_38c30
- ld a, [LastEnemyCounterMove]
+ ld a, [LastPlayerCounterMove]
and a
jr z, .asm_38c38
@@ -1499,7 +1499,7 @@
.asm_38c68
push hl
- ld a, [LastEnemyCounterMove]
+ ld a, [LastPlayerCounterMove]
ld hl, .EncoreMoves
ld de, 1
call IsInArray
@@ -1615,7 +1615,7 @@
AI_Smart_Spite: ; 38cd5
- ld a, [LastEnemyCounterMove]
+ ld a, [LastPlayerCounterMove]
and a
jr nz, .asm_38ce7
@@ -1837,7 +1837,7 @@
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_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 @@
cp $3
jr nc, .asm_391ca
- ld a, [LastEnemyCounterMove]
+ ld a, [LastPlayerCounterMove]
and a
jr z, .asm_391d2
@@ -2775,7 +2775,7 @@
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
--- a/battle/ai/switch.asm
+++ b/battle/ai/switch.asm
@@ -229,7 +229,7 @@
cp 11
ret nc
- ld a, [LastEnemyCounterMove]
+ ld a, [LastPlayerCounterMove]
and a
jr z, .no_last_counter_move
@@ -378,8 +378,8 @@
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 @@
push hl
ld [CurSpecies], a
call GetBaseData
- ld a, [LastEnemyCounterMove]
+ ld a, [LastPlayerCounterMove]
and a
jr z, .skip_move
--- a/battle/anim_commands.asm
+++ b/battle/anim_commands.asm
@@ -347,7 +347,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; cc2a4
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -75,7 +75,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
BattleBGEffects: ; c805a (32:405a)
dw BattleBGEffect_End
@@ -161,7 +161,7 @@
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 @@
.cgb
ld de, .Jumptable
call BatttleBGEffects_GetNamedJumptablePointer
- jp [hl]
+ jp hl
.Jumptable:
dw .cgb_zero
@@ -2421,7 +2421,7 @@
ld de, .Jumptable_DMG
call BatttleBGEffects_GetNamedJumptablePointer
pop de
- jp [hl]
+ jp hl
.Jumptable_DMG:
dw .zero_dmg
@@ -2484,7 +2484,7 @@
ld de, .Jumptable_CGB
call BatttleBGEffects_GetNamedJumptablePointer
pop de
- jp [hl]
+ jp hl
.Jumptable_CGB: ; c8ddd (32:4ddd)
dw .zero_cgb
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -3366,8 +3366,8 @@
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 @@
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 @@
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 @@
NewBattleMonStatus: ; 3dbde
xor a
- ld [LastEnemyCounterMove], a
ld [LastPlayerCounterMove], a
+ ld [LastEnemyCounterMove], a
ld [LastPlayerMove], a
ld hl, PlayerSubStatus1
rept 4
@@ -4331,7 +4331,7 @@
jp WaitBGMap
.hl
- jp [hl]
+ jp hl
; 3dc5b
PursuitSwitch: ; 3dc5b
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -113,7 +113,7 @@
jr .ReadMoveEffectCommand
.DoMoveEffectCommand:
- jp [hl]
+ jp hl
; 34084
@@ -971,7 +971,7 @@
.EndDisobedience:
xor a
ld [LastPlayerMove], a
- ld [LastEnemyCounterMove], a
+ ld [LastPlayerCounterMove], a
; Break Encore too.
ld hl, PlayerSubStatus5
@@ -1542,6 +1542,12 @@
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
--- a/battle/objects/functions.asm
+++ b/battle/objects/functions.asm
@@ -9,7 +9,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; ccfce
.Jumptable:
@@ -4085,7 +4085,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c)
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -91,12 +91,12 @@
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -39,7 +39,7 @@
ld a, [wJumptableIndex]
ld hl, .Jumptable
call BillsPC_Jumptable
- jp [hl]
+ jp hl
.Jumptable: ; e23df (38:63df)
@@ -147,7 +147,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
BillsPCDepositJumptable: ; e24a1 (38:64a1)
@@ -306,7 +306,7 @@
ld a, [wJumptableIndex]
ld hl, .Jumptable
call BillsPC_Jumptable
- jp [hl]
+ jp hl
.Jumptable: ; e25d2 (38:65d2)
@@ -415,7 +415,7 @@
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 @@
ld a, [wJumptableIndex]
ld hl, .Jumptable
call BillsPC_Jumptable
- jp [hl]
+ jp hl
; e27ac
.Jumptable: ; e27ac
@@ -678,7 +678,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; e2881
.Jumptable2: ; e2881
@@ -2014,7 +2014,7 @@
ld l, a
ld de, .dw_return
push de
- jp [hl]
+ jp hl
; e322a
.dw_return ; e322a
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -76,7 +76,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; e01a0 (38:41a0)
.Jumptable: ; e01a0
@@ -652,7 +652,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; e0553
.Jumptable: ; e0553
@@ -829,7 +829,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; e0643
.Jumptable: ; e0643
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -263,7 +263,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 109937
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -125,7 +125,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; e467f
.dw ; e467f
@@ -222,7 +222,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
GameFreakLogoScenes: ; e46fd (39:46fd)
dw GameFreakLogoScene1
@@ -367,7 +367,8 @@
; e47cc
GameFreakLogo: ; e47cc
-INCBIN "gfx/splash/logo.1bpp"
+INCBIN "gfx/splash/logo1.1bpp"
+INCBIN "gfx/splash/logo2.1bpp"
; e48ac
CrystalIntro: ; e48ac
@@ -438,7 +439,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; e491e
IntroScenes: ; e491e (39:491e)
--- a/engine/debug.asm
+++ b/engine/debug.asm
@@ -305,7 +305,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.asm_81a9a
call Function81eca
@@ -611,7 +611,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.asm_81cdf
ld a, $4
@@ -1353,7 +1353,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 82301
.dw ; 82301
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -609,7 +609,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.nope_bugged
; pop bc
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -1064,7 +1064,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 626a
.dw
@@ -1117,7 +1117,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 62af
.scenes
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -1955,7 +1955,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 5065
ContinueReadingMovement: ; 5065
--- a/engine/mon_icons.asm
+++ b/engine/mon_icons.asm
@@ -33,7 +33,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 8e854
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -70,7 +70,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 1172e
@@ -405,7 +405,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 11977
@@ -1166,7 +1166,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable: ; 12017 (4:6017)
dw .init_blinking_cursor
--- a/engine/options_menu.asm
+++ b/engine/options_menu.asm
@@ -90,7 +90,7 @@
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:
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -23,7 +23,7 @@
ld a, [wJumptableIndex]
ld hl, .Jumptable
call Pack_GetJumptablePointer
- jp [hl]
+ jp hl
; 10030
@@ -144,7 +144,7 @@
ld a, [wMenuCursorY]
dec a
call Pack_GetJumptablePointer
- jp [hl]
+ jp hl
; 10124 (4:4124)
.MenuDataHeader1: ; 0x10124
@@ -306,7 +306,7 @@
ld a, [wMenuCursorY]
dec a
call Pack_GetJumptablePointer
- jp [hl]
+ jp hl
; 10249 (4:4249)
MenuDataHeader_UsableKeyItem: ; 0x10249
@@ -689,7 +689,7 @@
ld a, [wJumptableIndex]
ld hl, .Jumptable
call Pack_GetJumptablePointer
- jp [hl]
+ jp hl
; 104c3
@@ -846,7 +846,7 @@
ld a, [wMenuCursorY]
dec a
call Pack_GetJumptablePointer
- jp [hl]
+ jp hl
; 10601 (4:4601)
.UsableMenuDataHeader: ; 0x10601
@@ -997,7 +997,7 @@
ld a, [wJumptableIndex]
ld hl, .Jumptable
call Pack_GetJumptablePointer
- jp [hl]
+ jp hl
; 106d1
@@ -1144,7 +1144,7 @@
ld a, [wJumptableIndex]
ld hl, .dw
call Pack_GetJumptablePointer
- jp [hl]
+ jp hl
; 107e1
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -182,7 +182,7 @@
ld a, [wJumptableIndex]
ld hl, .Jumptable
call Pokedex_LoadPointer
- jp [hl]
+ jp hl
.Jumptable: ; 40115 (10:4115)
@@ -366,7 +366,7 @@
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 @@
ld a, [wDexArrowCursorPosIndex]
ld hl, .MenuActionJumptable
call Pokedex_LoadPointer
- jp [hl]
+ jp hl
.return_to_main_screen
call Pokedex_BlackOutBG
@@ -647,7 +647,7 @@
ld a, [wDexArrowCursorPosIndex]
ld hl, .MenuActionJumptable
call Pokedex_LoadPointer
- jp [hl]
+ jp hl
.cancel
call Pokedex_BlackOutBG
@@ -1621,7 +1621,7 @@
ld a, [wCurrentDexMode]
ld hl, .Jumptable
call Pokedex_LoadPointer
- jp [hl]
+ jp hl
.Jumptable: ; 40bf0 (10:4bf0)
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -235,7 +235,7 @@
ld l, a
ld de, .return_from_jumptable
push de
- jp [hl]
+ jp hl
.return_from_jumptable
call Pokegear_FinishTilemap
@@ -431,7 +431,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable: ; 90f13 (24:4f13)
dw PokegearClock_Init
@@ -1217,7 +1217,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Cancel: ; 913f1
ld hl, PokegearText_WhomToCall
@@ -1484,7 +1484,7 @@
ld l, a
ld de, .returnafterstation
push de
- jp [hl]
+ jp hl
.returnafterstation
ld a, [wPokegearRadioChannelBank]
@@ -2043,7 +2043,7 @@
ld l, a
ld de, .jump_return
push de
- jp [hl]
+ jp hl
.jump_return
push de
@@ -2987,7 +2987,7 @@
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
--- a/engine/printer/serial.asm
+++ b/engine/printer/serial.asm
@@ -26,7 +26,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 84031
@@ -468,7 +468,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 842ea
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -25,7 +25,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
RadioJumptable:
dw OaksPkmnTalk1 ; $00
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -796,7 +796,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 92be4 (24:6be4)
@@ -1311,7 +1311,7 @@
ld l, a
ld de, .return
push de
- jp [hl]
+ jp hl
.return
ld a, [wFirstTwoReelsMatching]
@@ -1422,7 +1422,7 @@
ld l, a
ld de, .return
push de
- jp [hl]
+ jp hl
.return
ld a, [wSlotMatched]
@@ -1855,7 +1855,7 @@
ld l, a
ld de, .return
push de
- jp [hl]
+ jp hl
.return
ld hl, .Text_PrintPayout
@@ -1958,7 +1958,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable: ; 9322d (24:722d)
@@ -2059,7 +2059,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable: ; 932bc (24:72bc)
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -9,7 +9,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 8d25b
.Jumptable: ; 8d25b (23:525b)
@@ -134,7 +134,7 @@
.four ; 8d302 (23:5302)
call .AnonymousJumptable
- jp [hl]
+ jp hl
; 8d306 (23:5306)
; Anonymous dw (see .AnonymousJumptable)
@@ -418,7 +418,7 @@
.sixteen ; 8d483 (23:5483)
call .AnonymousJumptable
- jp [hl]
+ jp hl
; 8d487 (23:5487)
; Anonymous dw (see .AnonymousJumptable)
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -55,7 +55,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.MenuReturns:
dw .Reopen
@@ -227,7 +227,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 127ef
.MenuString: ; 127ef
@@ -701,7 +701,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.nothing
ld a, 0
--- a/engine/timeofdaypals.asm
+++ b/engine/timeofdaypals.asm
@@ -250,7 +250,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 8c126
.TimePalettes:
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -397,11 +397,11 @@
; 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
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -387,15 +387,15 @@
; 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:
--- a/engine/trade/animation.asm
+++ b/engine/trade/animation.asm
@@ -232,7 +232,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 290af
.JumpTable: ; 290af
@@ -549,7 +549,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 2928f
.Jumptable: ; 2928f
@@ -1173,7 +1173,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 29686
.Jumptable: ; 29686 (a:5686)
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -608,8 +608,8 @@
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"
--- a/engine/unown_puzzle.asm
+++ b/engine/unown_puzzle.asm
@@ -183,7 +183,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; e12d9
.Jumptable: ; e12d9
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -169,7 +169,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 8ca1b
--- a/event/magnet_train.asm
+++ b/event/magnet_train.asm
@@ -299,7 +299,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 8ce06
.Jumptable: ; 8ce06
--- a/event/mom.asm
+++ b/event/mom.asm
@@ -28,7 +28,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 16242
.dw ; 16242
binary files a/gfx/battle/balls.2bpp /dev/null differ
binary files /dev/null b/gfx/battle/balls.png differ
binary files a/gfx/battle/enemy_hp_bar_border.1bpp /dev/null differ
binary files /dev/null b/gfx/battle/enemy_hp_bar_border.png differ
binary files a/gfx/battle/expbar.2bpp /dev/null differ
binary files /dev/null b/gfx/battle/expbar.png differ
binary files a/gfx/battle/expbarend.2bpp /dev/null differ
binary files /dev/null b/gfx/battle/expbarend.png differ
binary files a/gfx/battle/expbarend_sgb.2bpp /dev/null differ
binary files /dev/null b/gfx/battle/expbarend_sgb.png differ
binary files a/gfx/battle/hp_exp_bar_border.1bpp /dev/null differ
binary files /dev/null b/gfx/battle/hp_exp_bar_border.png differ
binary files a/gfx/battle/minimize.2bpp /dev/null differ
binary files /dev/null b/gfx/battle/minimize.png differ
binary files a/gfx/debug/color_test.2bpp /dev/null differ
binary files /dev/null b/gfx/debug/color_test.png differ
binary files a/gfx/emotes/bolt.2bpp /dev/null differ
binary files /dev/null b/gfx/emotes/bolt.png differ
binary files a/gfx/emotes/fish.2bpp /dev/null differ
binary files /dev/null b/gfx/emotes/fish.png differ
binary files a/gfx/emotes/happy.2bpp /dev/null differ
binary files /dev/null b/gfx/emotes/happy.png differ
binary files a/gfx/emotes/heart.2bpp /dev/null differ
binary files /dev/null b/gfx/emotes/heart.png differ
binary files a/gfx/emotes/question.2bpp /dev/null differ
binary files /dev/null b/gfx/emotes/question.png differ
binary files a/gfx/emotes/sad.2bpp /dev/null differ
binary files /dev/null b/gfx/emotes/sad.png differ
binary files a/gfx/emotes/shock.2bpp /dev/null differ
binary files /dev/null b/gfx/emotes/shock.png differ
binary files a/gfx/emotes/sleep.2bpp /dev/null differ
binary files /dev/null b/gfx/emotes/sleep.png differ
binary files a/gfx/evo/bubble.2bpp /dev/null differ
binary files /dev/null b/gfx/evo/bubble.png differ
binary files a/gfx/evo/bubble_large.2bpp /dev/null differ
binary files /dev/null b/gfx/evo/bubble_large.png differ
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -59,11 +59,11 @@
; f8f34
GFX_f8f34: ; unused bold letters + unown chars
-INCBIN "gfx/unknown/0f8f34.w64.1bpp"
+INCBIN "gfx/unknown/0f8f34.1bpp"
; f9204
TextBoxSpaceGFX: ; f9204
-INCBIN "gfx/frames/space.2bpp"
+INCBIN "gfx/frames/space.1bpp"
; f9214
MobilePhoneTilesGFX: ; f9214
binary files a/gfx/font/english.1bpp /dev/null differ
binary files /dev/null b/gfx/font/english.png differ
binary files a/gfx/font/french_german.1bpp /dev/null differ
binary files /dev/null b/gfx/font/french_german.png differ
binary files a/gfx/font/spanish_italian.1bpp /dev/null differ
binary files /dev/null b/gfx/font/spanish_italian.png differ
binary files a/gfx/frames/1.1bpp /dev/null differ
binary files /dev/null b/gfx/frames/1.png differ
binary files a/gfx/frames/2.1bpp /dev/null differ
binary files /dev/null b/gfx/frames/2.png differ
binary files a/gfx/frames/3.1bpp /dev/null differ
binary files /dev/null b/gfx/frames/3.png differ
binary files a/gfx/frames/4.1bpp /dev/null differ
binary files /dev/null b/gfx/frames/4.png differ
binary files a/gfx/frames/5.1bpp /dev/null differ
binary files /dev/null b/gfx/frames/5.png differ
binary files a/gfx/frames/6.1bpp /dev/null differ
binary files /dev/null b/gfx/frames/6.png differ
binary files a/gfx/frames/7.1bpp /dev/null differ
binary files /dev/null b/gfx/frames/7.png differ
binary files a/gfx/frames/8.1bpp /dev/null differ
binary files /dev/null b/gfx/frames/8.png differ
binary files a/gfx/frames/9.1bpp /dev/null differ
binary files /dev/null b/gfx/frames/9.png differ
binary files a/gfx/frames/map_entry_sign.2bpp /dev/null differ
binary files /dev/null b/gfx/frames/map_entry_sign.png differ
binary files a/gfx/frames/space.2bpp /dev/null differ
binary files /dev/null b/gfx/frames/space.png differ
binary files a/gfx/fx/aeroblast.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/aeroblast.2bpp.lz.2f07c4ea differ
binary files /dev/null b/gfx/fx/aeroblast.png differ
binary files a/gfx/fx/angels.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/angels.2bpp.lz.b026d81e differ
binary files /dev/null b/gfx/fx/angels.png differ
binary files a/gfx/fx/beam.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/beam.2bpp.lz.80b6d613 differ
binary files /dev/null b/gfx/fx/beam.png differ
binary files a/gfx/fx/bubble.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/bubble.2bpp.lz.03b8ac99 differ
binary files /dev/null b/gfx/fx/bubble.png differ
binary files a/gfx/fx/charge.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/charge.2bpp.lz.95d3ea98 differ
binary files /dev/null b/gfx/fx/charge.png differ
binary files a/gfx/fx/cut.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/cut.2bpp.lz.03d343ed differ
binary files /dev/null b/gfx/fx/cut.png differ
binary files a/gfx/fx/egg.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/egg.2bpp.lz.41dd1a53 differ
binary files /dev/null b/gfx/fx/egg.png differ
binary files a/gfx/fx/explosion.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/explosion.2bpp.lz.55fc334f differ
binary files /dev/null b/gfx/fx/explosion.png differ
binary files a/gfx/fx/fire.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/fire.2bpp.lz.d7701cda differ
binary files /dev/null b/gfx/fx/fire.png differ
binary files a/gfx/fx/flower.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/flower.2bpp.lz.1bc2e9d2 differ
binary files /dev/null b/gfx/fx/flower.png differ
binary files a/gfx/fx/globe.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/globe.2bpp.lz.710dbb8e differ
binary files /dev/null b/gfx/fx/globe.png differ
binary files a/gfx/fx/haze.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/haze.2bpp.lz.91424607 differ
binary files /dev/null b/gfx/fx/haze.png differ
binary files a/gfx/fx/hit.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/hit.2bpp.lz.2b3c83f2 differ
binary files /dev/null b/gfx/fx/hit.png differ
binary files a/gfx/fx/horn.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/horn.2bpp.lz.48908aae differ
binary files /dev/null b/gfx/fx/horn.png differ
binary files a/gfx/fx/ice.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/ice.2bpp.lz.664d900f differ
binary files /dev/null b/gfx/fx/ice.png differ
binary files a/gfx/fx/lightning.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/lightning.2bpp.lz.a88fc131 differ
binary files /dev/null b/gfx/fx/lightning.png differ
binary files a/gfx/fx/misc.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/misc.2bpp.lz.4b20c3d7 differ
binary files /dev/null b/gfx/fx/misc.png differ
binary files a/gfx/fx/noise.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/noise.2bpp.lz.acb4a76e differ
binary files /dev/null b/gfx/fx/noise.png differ
binary files a/gfx/fx/objects.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/objects.2bpp.lz.83f812de differ
binary files /dev/null b/gfx/fx/objects.png differ
--- a/gfx/fx/plant.2bpp.lz
+++ /dev/null
@@ -1,3 +1,0 @@
-a <<~B��ߡ>�����
- <$xx��c >2��88i��~Bø }c}CC��➆�xx<$|D~B^b3=a�� C e00PpC��
-=%}EC_c�����<�>��c ����_aOq'83<e 79Nr���� )���`�@I@� 00<,.2/1'9 a�� ,4\d���� ������
\ No newline at end of file
--- /dev/null
+++ b/gfx/fx/plant.2bpp.lz.4a00c417
@@ -1,0 +1,3 @@
+a <<~B��ߡ>�����
+ <$xx��c >2��88i��~Bø }c}CC��➆�xx<$|D~B^b3=a�� C e00PpC��
+=%}EC_c�����<�>��c ����_aOq'83<e 79Nr���� )���`�@I@� 00<,.2/1'9 a�� ,4\d���� ������
\ No newline at end of file
binary files /dev/null b/gfx/fx/plant.png differ
binary files a/gfx/fx/poison.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/poison.2bpp.lz.fc7dc9c1 differ
binary files /dev/null b/gfx/fx/poison.png differ
binary files a/gfx/fx/pokeball.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/pokeball.2bpp.lz.c58f7e01 differ
binary files /dev/null b/gfx/fx/pokeball.png differ
--- a/gfx/fx/powder.2bpp.lz
+++ /dev/null
@@ -1,1 +1,0 @@
-@@��GEa 8(@@��EG��Î
\ No newline at end of file
--- /dev/null
+++ b/gfx/fx/powder.2bpp.lz.bfd566bb
@@ -1,0 +1,1 @@
+@@��GEa 8(@@��EG��Î
\ No newline at end of file
binary files /dev/null b/gfx/fx/powder.png differ
binary files a/gfx/fx/psychic.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/psychic.2bpp.lz.d80f285c differ
binary files /dev/null b/gfx/fx/psychic.png differ
binary files a/gfx/fx/reflect.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/reflect.2bpp.lz.9a9c822d differ
binary files /dev/null b/gfx/fx/reflect.png differ
binary files a/gfx/fx/rocks.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/rocks.2bpp.lz.73d0153e differ
binary files /dev/null b/gfx/fx/rocks.png differ
binary files a/gfx/fx/rope.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/rope.2bpp.lz.209d63dd differ
binary files /dev/null b/gfx/fx/rope.png differ
binary files a/gfx/fx/sand.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/sand.2bpp.lz.c87c0eaa differ
binary files /dev/null b/gfx/fx/sand.png differ
binary files a/gfx/fx/shapes.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/shapes.2bpp.lz.262d77f0 differ
binary files /dev/null b/gfx/fx/shapes.png differ
binary files a/gfx/fx/shine.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/shine.2bpp.lz.5fb79056 differ
binary files /dev/null b/gfx/fx/shine.png differ
binary files a/gfx/fx/skyattack.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/skyattack.2bpp.lz.31738ab8 differ
binary files /dev/null b/gfx/fx/skyattack.png differ
binary files a/gfx/fx/smoke.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/smoke.2bpp.lz.aa05905e differ
binary files /dev/null b/gfx/fx/smoke.png differ
binary files a/gfx/fx/speed.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/speed.2bpp.lz.1732b364 differ
binary files /dev/null b/gfx/fx/speed.png differ
binary files a/gfx/fx/status.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/status.2bpp.lz.0c0aa13e differ
binary files /dev/null b/gfx/fx/status.png differ
binary files a/gfx/fx/water.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/water.2bpp.lz.7b52ed12 differ
binary files /dev/null b/gfx/fx/water.png differ
binary files a/gfx/fx/wave.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/wave.2bpp.lz.bee99402 differ
binary files /dev/null b/gfx/fx/wave.png differ
binary files a/gfx/fx/web.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/web.2bpp.lz.80e3d480 differ
binary files /dev/null b/gfx/fx/web.png differ
binary files a/gfx/fx/whip.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/whip.2bpp.lz.d80d8d6e differ
binary files /dev/null b/gfx/fx/whip.png differ
binary files a/gfx/fx/wind.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/fx/wind.2bpp.lz.5a785180 differ
binary files /dev/null b/gfx/fx/wind.png differ
binary files a/gfx/icon/bat.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/bat.png differ
binary files a/gfx/icon/bigmon.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/bigmon.png differ
binary files a/gfx/icon/bird.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/bird.png differ
binary files a/gfx/icon/blob.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/blob.png differ
binary files a/gfx/icon/bug.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/bug.png differ
binary files a/gfx/icon/bulbasaur.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/bulbasaur.png differ
binary files a/gfx/icon/caterpillar.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/caterpillar.png differ
binary files a/gfx/icon/charmander.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/charmander.png differ
binary files a/gfx/icon/clefairy.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/clefairy.png differ
binary files a/gfx/icon/diglett.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/diglett.png differ
binary files a/gfx/icon/egg.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/egg.png differ
binary files a/gfx/icon/equine.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/equine.png differ
binary files a/gfx/icon/fighter.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/fighter.png differ
binary files a/gfx/icon/fish.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/fish.png differ
binary files a/gfx/icon/fox.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/fox.png differ
binary files a/gfx/icon/geodude.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/geodude.png differ
binary files a/gfx/icon/ghost.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/ghost.png differ
binary files a/gfx/icon/gyarados.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/gyarados.png differ
binary files a/gfx/icon/ho_oh.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/ho_oh.png differ
binary files a/gfx/icon/humanshape.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/humanshape.png differ
--- a/gfx/icon/item.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�������������
\ No newline at end of file
binary files /dev/null b/gfx/icon/item.png differ
binary files a/gfx/icon/jellyfish.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/jellyfish.png differ
binary files a/gfx/icon/jigglypuff.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/jigglypuff.png differ
binary files a/gfx/icon/lapras.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/lapras.png differ
binary files a/gfx/icon/lugia.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/lugia.png differ
--- a/gfx/icon/mail.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-��������������
\ No newline at end of file
binary files /dev/null b/gfx/icon/mail.png differ
binary files a/gfx/icon/mail2.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/mail2.png differ
binary files a/gfx/icon/monster.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/monster.png differ
binary files a/gfx/icon/moth.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/moth.png differ
binary files a/gfx/icon/oddish.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/oddish.png differ
binary files a/gfx/icon/pikachu.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/pikachu.png differ
binary files a/gfx/icon/poliwag.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/poliwag.png differ
binary files a/gfx/icon/serpent.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/serpent.png differ
binary files a/gfx/icon/shell.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/shell.png differ
--- a/gfx/icon/slowpoke.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
-88GP|c<+<#@O88���|�x�x����? ? ? ���������pp #?(?>1 ? ?' �-�>�<�<���� ? ? ��������
\ No newline at end of file
binary files /dev/null b/gfx/icon/slowpoke.png differ
binary files a/gfx/icon/snorlax.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/snorlax.png differ
binary files a/gfx/icon/squirtle.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/squirtle.png differ
binary files a/gfx/icon/staryu.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/staryu.png differ
binary files a/gfx/icon/sudowoodo.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/sudowoodo.png differ
binary files a/gfx/icon/unown.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/unown.png differ
binary files a/gfx/icon/voltorb.2bpp /dev/null differ
binary files /dev/null b/gfx/icon/voltorb.png differ
binary files /dev/null b/gfx/intro/001.tilemap differ
--- a/gfx/intro/001.tilemap.lz
+++ /dev/null
@@ -1,1 +1,0 @@
-s%�ŀ� ���
\ No newline at end of file
--- /dev/null
+++ b/gfx/intro/001.tilemap.lz.c2341875
@@ -1,0 +1,1 @@
+s%�ŀ� ���
\ No newline at end of file
binary files /dev/null b/gfx/intro/002.tilemap differ
binary files a/gfx/intro/002.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/002.tilemap.lz.54d5b74b differ
binary files /dev/null b/gfx/intro/003.tilemap differ
--- a/gfx/intro/003.tilemap.lz
+++ /dev/null
@@ -1,1 +1,0 @@
-��_��_���
\ No newline at end of file
--- /dev/null
+++ b/gfx/intro/003.tilemap.lz.9f90366a
@@ -1,0 +1,1 @@
+��_��_���
\ No newline at end of file
binary files /dev/null b/gfx/intro/004.tilemap differ
binary files a/gfx/intro/004.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/004.tilemap.lz.4c7562ee differ
binary files /dev/null b/gfx/intro/005.tilemap differ
binary files a/gfx/intro/005.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/005.tilemap.lz.bed1ff6d differ
binary files /dev/null b/gfx/intro/006.tilemap differ
binary files a/gfx/intro/006.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/006.tilemap.lz.c8756972 differ
binary files /dev/null b/gfx/intro/007.tilemap differ
binary files a/gfx/intro/007.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/007.tilemap.lz.a9cbcbca differ
binary files /dev/null b/gfx/intro/008.tilemap differ
binary files a/gfx/intro/008.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/008.tilemap.lz.f12ed6d9 differ
binary files /dev/null b/gfx/intro/009.tilemap differ
--- a/gfx/intro/009.tilemap.lz
+++ /dev/null
@@ -1,1 +1,0 @@
-��#πˀ�ߟ�U
\ No newline at end of file
--- /dev/null
+++ b/gfx/intro/009.tilemap.lz.911a1ace
@@ -1,0 +1,1 @@
+��#πˀ�ߟ�U
\ No newline at end of file
binary files /dev/null b/gfx/intro/010.tilemap differ
binary files a/gfx/intro/010.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/010.tilemap.lz.2717d106 differ
binary files /dev/null b/gfx/intro/011.tilemap differ
binary files a/gfx/intro/011.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/011.tilemap.lz.bb066632 differ
binary files /dev/null b/gfx/intro/012.tilemap differ
binary files a/gfx/intro/012.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/012.tilemap.lz.bc182264 differ
binary files /dev/null b/gfx/intro/013.tilemap differ
binary files a/gfx/intro/013.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/013.tilemap.lz.18e3115f differ
binary files /dev/null b/gfx/intro/014.tilemap differ
binary files a/gfx/intro/014.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/014.tilemap.lz.7b59259d differ
binary files /dev/null b/gfx/intro/015.tilemap differ
binary files a/gfx/intro/015.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/015.tilemap.lz.1bfc5a89 differ
binary files /dev/null b/gfx/intro/017.tilemap differ
binary files a/gfx/intro/017.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/intro/017.tilemap.lz.e4772015 differ
binary files a/gfx/intro/background.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/background.2bpp.lz.b58b3984 differ
binary files /dev/null b/gfx/intro/background.png differ
binary files a/gfx/intro/crystal_unowns.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/crystal_unowns.2bpp.lz.e7f8ad51 differ
binary files /dev/null b/gfx/intro/crystal_unowns.png differ
binary files a/gfx/intro/gender_screen.2bpp /dev/null differ
binary files /dev/null b/gfx/intro/gender_screen.png differ
binary files a/gfx/intro/grass1.2bpp /dev/null differ
binary files /dev/null b/gfx/intro/grass1.png differ
binary files a/gfx/intro/grass2.2bpp /dev/null differ
binary files /dev/null b/gfx/intro/grass2.png differ
binary files a/gfx/intro/grass3.2bpp /dev/null differ
binary files /dev/null b/gfx/intro/grass3.png differ
binary files a/gfx/intro/grass4.2bpp /dev/null differ
binary files /dev/null b/gfx/intro/grass4.png differ
binary files a/gfx/intro/logo.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/logo.2bpp.lz.e03ee257 differ
binary files /dev/null b/gfx/intro/logo.png differ
binary files a/gfx/intro/pichu_wooper.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/pichu_wooper.2bpp.lz.4bccf7f4 differ
binary files /dev/null b/gfx/intro/pichu_wooper.png differ
binary files a/gfx/intro/pulse.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/pulse.2bpp.lz.9fb06bb6 differ
binary files /dev/null b/gfx/intro/pulse.png differ
binary files a/gfx/intro/suicune_back.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/suicune_back.2bpp.lz.c6f529b0 differ
binary files /dev/null b/gfx/intro/suicune_back.png differ
binary files a/gfx/intro/suicune_close.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/suicune_close.2bpp.lz.7e362923 differ
binary files /dev/null b/gfx/intro/suicune_close.png differ
binary files a/gfx/intro/suicune_jump.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/suicune_jump.2bpp.lz.1b09fb64 differ
binary files /dev/null b/gfx/intro/suicune_jump.png differ
binary files a/gfx/intro/suicune_run.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/suicune_run.2bpp.lz.ef999ad2 differ
binary files /dev/null b/gfx/intro/suicune_run.png differ
binary files a/gfx/intro/unown_back.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/unown_back.2bpp.lz.740c4d28 differ
binary files /dev/null b/gfx/intro/unown_back.png differ
binary files a/gfx/intro/unowns.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/intro/unowns.2bpp.lz.3a1f185e differ
binary files /dev/null b/gfx/intro/unowns.png differ
--- a/gfx/mail.asm
+++ b/gfx/mail.asm
@@ -107,7 +107,7 @@
ld de, .done
pop bc
push de
- jp [hl]
+ jp hl
.done
ret
; b92f8
@@ -226,7 +226,7 @@
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,13 +329,13 @@
ld hl, VTiles2 tile $31
ld bc, 5 * 8
call MailGFX_GenerateMonochromeTilesColor2
- ld de, MorphMailBorderGFX
+ ld de, MorphMailBorderCornerGFX + 3 * 8
ld c, 1 * 8
call LoadMailGFX_Color2
- ld de, MorphMailBorderCorner1GFX
+ ld de, MorphMailBorderCornerGFX
ld c, 1 * 8
call LoadMailGFX_Color2
- ld de, MorphMailBorderCorner2GFX
+ ld de, MorphMailBorderGFX
ld c, 1 * 8
call LoadMailGFX_Color2
ld de, EonMailBorder1GFX
@@ -418,16 +418,16 @@
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 @@
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 @@
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 @@
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 @@
PortraitMailSmallPokeballGFX: ; b9936
INCBIN "gfx/mail/0b9936.1bpp"
-MorphMailBorderCorner2GFX: ; b993e
+MorphMailBorderGFX: ; b993e
INCBIN "gfx/mail/0b993e.1bpp"
MusicMailSmallNoteGFX: ; b9946
@@ -1016,20 +1016,14 @@
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,32 +1032,14 @@
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"
binary files a/gfx/mail/0b9926.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9926.png differ
--- a/gfx/mail/0b992e.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�HLm}
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b992e.png differ
--- a/gfx/mail/0b9936.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-<~���~<
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b9936.png differ
binary files a/gfx/mail/0b993e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b993e.png differ
--- a/gfx/mail/0b9946.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- p
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b9946.png differ
binary files a/gfx/mail/0b994e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b994e.png differ
binary files a/gfx/mail/0b995e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b995e.png differ
binary files a/gfx/mail/0b9966.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9966.png differ
binary files a/gfx/mail/0b996e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b996e.png differ
binary files a/gfx/mail/0b9976.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9976.png differ
binary files a/gfx/mail/0b997e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b997e.png differ
--- a/gfx/mail/0b998e.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-<~���
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b998e.png differ
binary files a/gfx/mail/0b9996.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9996.png differ
binary files a/gfx/mail/0b99c6.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b99c6.png differ
binary files a/gfx/mail/0b99f6.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b99f6.png differ
binary files a/gfx/mail/0b9a26.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9a26.png differ
binary files a/gfx/mail/0b9a56.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9a56.png differ
binary files a/gfx/mail/0b9a86.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9a86.png differ
binary files a/gfx/mail/0b9ab6.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9ab6.png differ
binary files a/gfx/mail/0b9b46.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9b46.png differ
binary files a/gfx/mail/0b9bce.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9bce.png differ
--- a/gfx/mail/0b9bee.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�KKm}�������
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b9bee.png differ
binary files a/gfx/mail/0b9bfe.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9bfe.png differ
binary files a/gfx/mail/0b9c1e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9c1e.png differ
binary files a/gfx/mail/0b9c3e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9c3e.png differ
binary files a/gfx/mail/0b9c5e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9c5e.png differ
binary files a/gfx/mail/0b9c7e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9c7e.png differ
--- a/gfx/mail/0b9c96.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-������
\ No newline at end of file
binary files a/gfx/mail/0b9c9e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9c9e.png differ
binary files a/gfx/mail/0b9cbe.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9cbe.png differ
binary files a/gfx/mail/0b9cde.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9cde.png differ
binary files a/gfx/mail/0b9cfe.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9cfe.png differ
binary files a/gfx/mail/0b9d16.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9d16.png differ
binary files a/gfx/mail/0b9d26.1bpp /dev/null differ
binary files a/gfx/mail/0b9d3e.1bpp /dev/null differ
binary files a/gfx/mail/0b9d46.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9d46.png differ
binary files a/gfx/mail/0b9d76.1bpp /dev/null differ
binary files a/gfx/mail/0b9d86.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9d86.png differ
binary files a/gfx/mail/0b9db6.1bpp /dev/null differ
--- a/gfx/mail/0b9dc6.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�������
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b9dc6.png differ
binary files a/gfx/mail/0b9dce.1bpp /dev/null differ
binary files a/gfx/mail/0b9df6.1bpp /dev/null differ
binary files a/gfx/mail/0b9e06.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9e06.png differ
--- a/gfx/mail/0b9e26.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�Ù������������<��������<�������χ��
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b9e26.png differ
binary files a/gfx/mail/0b9e4e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9e4e.png differ
binary files a/gfx/misc/boulderdust.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/boulderdust.png differ
binary files a/gfx/misc/card_right_corner.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/card_right_corner.png differ
binary files a/gfx/misc/card_status.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/card_status.png differ
binary files a/gfx/misc/chris.7x7.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/chris.png differ
binary files a/gfx/misc/chris_card.5x7.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/chris_card.png differ
binary files a/gfx/misc/copyright.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/copyright.png differ
binary files a/gfx/misc/cut_grass.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/cut_grass.png differ
binary files a/gfx/misc/cut_tree.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/cut_tree.png differ
binary files /dev/null b/gfx/misc/dude.2bpp.lz.d13fb490 differ
binary files a/gfx/misc/dude.6x6.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/misc/dude.png differ
binary files a/gfx/misc/fast_ship.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/fast_ship.png differ
binary files a/gfx/misc/fishing2.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/fishing2.png differ
--- a/gfx/misc/fishing4.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-@ 2 �d 6
\ No newline at end of file
binary files /dev/null b/gfx/misc/fishing4.png differ
binary files /dev/null b/gfx/misc/gbc_only.2bpp.lz.4a5bba0e differ
binary files /dev/null b/gfx/misc/gbc_only.png differ
binary files a/gfx/misc/gbc_only.w112.2bpp.lz /dev/null differ
binary files a/gfx/misc/kris.7x7.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/kris.png differ
binary files a/gfx/misc/kris_back.6x6.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/kris_back.png differ
binary files a/gfx/misc/kris_card.5x7.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/kris_card.png differ
binary files /dev/null b/gfx/misc/leaders.png differ
binary files a/gfx/misc/leaders.w24.2bpp /dev/null differ
binary files a/gfx/misc/mobile_adapter.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/mobile_adapter.png differ
binary files a/gfx/misc/mystery_gift.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/mystery_gift.png differ
binary files a/gfx/misc/mystery_gift_jp.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/mystery_gift_jp.png differ
binary files a/gfx/misc/pack.png b/gfx/misc/pack.png differ
binary files a/gfx/misc/pack_menu.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/pack_menu.png differ
binary files /dev/null b/gfx/misc/player.2bpp.lz.0312ddce differ
binary files a/gfx/misc/player.6x6.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/misc/player.png differ
binary files a/gfx/misc/pokegear.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/misc/pokegear.2bpp.lz.42315ab4 differ
binary files /dev/null b/gfx/misc/pokegear.png differ
binary files a/gfx/misc/pokegear_sprites.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f differ
binary files /dev/null b/gfx/misc/pokegear_sprites.png differ
binary files a/gfx/misc/sgb_border.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/sgb_border.png differ
--- a/gfx/misc/shadow.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ????
\ No newline at end of file
binary files /dev/null b/gfx/misc/shadow.png differ
binary files a/gfx/misc/town_map.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/misc/town_map.2bpp.lz.c0587c86 differ
binary files /dev/null b/gfx/misc/town_map.png differ
binary files a/gfx/misc/trainer_card.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/trainer_card.png differ
binary files /dev/null b/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa differ
binary files a/gfx/misc/unknown_egg.5x5.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/misc/unknown_egg.png differ
binary files a/gfx/misc/unown_font.2bpp /dev/null differ
binary files /dev/null b/gfx/misc/unown_font.png differ
binary files a/gfx/mobile/havewant.2bpp /dev/null differ
binary files /dev/null b/gfx/mobile/havewant.png differ
binary files a/gfx/mobile/hp.1bpp /dev/null differ
binary files /dev/null b/gfx/mobile/hp.png differ
binary files a/gfx/mobile/lv.1bpp /dev/null differ
binary files /dev/null b/gfx/mobile/lv.png differ
--- a/gfx/mobile/overworld_phone_icon.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-��������������
\ No newline at end of file
binary files /dev/null b/gfx/mobile/overworld_phone_icon.png differ
binary files a/gfx/mobile/phone_tiles.2bpp /dev/null differ
binary files /dev/null b/gfx/mobile/phone_tiles.png differ
binary files a/gfx/mobile/pokemon_news.2bpp /dev/null differ
binary files /dev/null b/gfx/mobile/pokemon_news.png differ
binary files a/gfx/mobile/select.2bpp /dev/null differ
binary files /dev/null b/gfx/mobile/select.png differ
binary files a/gfx/overworld/000.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/000.png differ
binary files a/gfx/overworld/001.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/001.png differ
--- a/gfx/overworld/002.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ?7S@oR��������������J?3 ��p����(�0����pp ????_Oo_����������������;7</?+ ��<����������pp ???9 ��������������|� ��p����(�0���
\ No newline at end of file
binary files /dev/null b/gfx/overworld/002.png differ
binary files a/gfx/overworld/003.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/003.png differ
binary files a/gfx/overworld/004.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/004.png differ
binary files a/gfx/overworld/005.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/005.png differ
binary files a/gfx/overworld/006.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/006.png differ
binary files a/gfx/overworld/007.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/007.png differ
--- a/gfx/overworld/008.2bpp
+++ /dev/null
@@ -1,7 +1,0 @@
- (7P@oR���`0���-��J?0/9M~^?? 9???� ���~z�������� /0PP@���`0��� --�?0_xW~Os?3 9?>>� � �~����8���|| >!? ? ?(��� p�����d�? �x��� �������� (7P@oR���`0���-��J?0Oy_~?? � ���~����8�0��� /0P@oP���`0��� -�-?0_x_~Os?3 � � �~����8�0��� #<}B@@P���@� ������(@>1=# �(��p� �p���p
\ No newline at end of file
binary files /dev/null b/gfx/overworld/008.png differ
binary files a/gfx/overworld/009.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/009.png differ
binary files a/gfx/overworld/010.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/010.png differ
binary files a/gfx/overworld/011.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/011.png differ
binary files a/gfx/overworld/012.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/012.png differ
binary files a/gfx/overworld/013.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/013.png differ
binary files a/gfx/overworld/014.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/014.png differ
binary files a/gfx/overworld/015.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/015.png differ
--- a/gfx/overworld/016.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- "?"?*?O_y��0���$�4�r���/? ?'>' �����|���p���`` ? ? ?@D��0������"�$? ?/?/ $�X�������p���`` ?DI.? ��0������� �������`�`��@��
\ No newline at end of file
binary files /dev/null b/gfx/overworld/016.png differ
binary files a/gfx/overworld/017.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/017.png differ
binary files a/gfx/overworld/018.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/018.png differ
binary files a/gfx/overworld/019.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/019.png differ
binary files a/gfx/overworld/020.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/020.png differ
binary files a/gfx/overworld/021.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/021.png differ
binary files a/gfx/overworld/022.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/022.png differ
binary files a/gfx/overworld/023.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/023.png differ
binary files a/gfx/overworld/024.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/024.png differ
binary files a/gfx/overworld/025.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/025.png differ
--- a/gfx/overworld/026.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
- ?"='?(HJ���0��D�����R?*?$C?% �T�$�������А�`` ? ? ? @@���0������? ?!C?' ����������А�`` ���0��������
- ������,��@��
\ No newline at end of file
binary files /dev/null b/gfx/overworld/026.png differ
binary files a/gfx/overworld/027.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/027.png differ
binary files a/gfx/overworld/028.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/028.png differ
binary files a/gfx/overworld/029.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/029.png differ
binary files a/gfx/overworld/030.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/030.png differ
binary files a/gfx/overworld/031.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/031.png differ
binary files a/gfx/overworld/032.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/032.png differ
binary files a/gfx/overworld/033.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/033.png differ
binary files a/gfx/overworld/034.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/034.png differ
binary files a/gfx/overworld/035.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/035.png differ
binary files a/gfx/overworld/036.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/036.png differ
binary files a/gfx/overworld/037.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/037.png differ
binary files a/gfx/overworld/038.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/038.png differ
binary files a/gfx/overworld/039.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/039.png differ
binary files a/gfx/overworld/040.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/040.png differ
binary files a/gfx/overworld/041.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/041.png differ
binary files a/gfx/overworld/042.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/042.png differ
binary files a/gfx/overworld/043.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/043.png differ
binary files a/gfx/overworld/044.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/044.png differ
--- a/gfx/overworld/045.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ;>?8 ���������|� �H�H ?/?(?< p���������<�8�� ;?=? ��p���������x��� ?/_X~ ���������~���� >?=3 ���������������� �x�p������������ ;>?8 ���������|� �H�H ?/?(?< p���������<�8�� ;?=? ��p���������x��� ?/_X~ ���������x���� >?=3 ���������������� �x�p�������|�|
\ No newline at end of file
binary files /dev/null b/gfx/overworld/045.png differ
binary files a/gfx/overworld/046.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/046.png differ
binary files a/gfx/overworld/047.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/047.png differ
binary files a/gfx/overworld/048.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/048.png differ
binary files a/gfx/overworld/049.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/049.png differ
binary files a/gfx/overworld/050.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/050.png differ
binary files a/gfx/overworld/051.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/051.png differ
binary files a/gfx/overworld/052.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/052.png differ
binary files a/gfx/overworld/053.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/053.png differ
binary files a/gfx/overworld/054.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/054.png differ
binary files a/gfx/overworld/055.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/055.png differ
binary files a/gfx/overworld/056.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/056.png differ
binary files a/gfx/overworld/057.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/057.png differ
binary files a/gfx/overworld/058.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/058.png differ
binary files a/gfx/overworld/059.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/059.png differ
binary files a/gfx/overworld/060.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/060.png differ
binary files a/gfx/overworld/061.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/061.png differ
binary files a/gfx/overworld/062.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/062.png differ
binary files a/gfx/overworld/063.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/063.png differ
binary files a/gfx/overworld/064.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/064.png differ
binary files a/gfx/overworld/065.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/065.png differ
binary files a/gfx/overworld/066.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/066.png differ
binary files a/gfx/overworld/067.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/067.png differ
--- a/gfx/overworld/068.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-88GP|c<+<#@O88���|�x�x����? ? ? ��������
\ No newline at end of file
binary files /dev/null b/gfx/overworld/068.png differ
binary files a/gfx/overworld/069.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/069.png differ
binary files a/gfx/overworld/070.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/070.png differ
binary files a/gfx/overworld/071.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/071.png differ
binary files a/gfx/overworld/072.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/072.png differ
--- a/gfx/overworld/073.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
- ???:?0ToR���������\� �*�J?0 ?'<' � x���<��x������ ??????_o_����������������?0 ?/</ � ���<���������
-�����������~�<�$ ?9gc?? ��0������c��� ??t`��ߤ������������T��`<3OxO?< ��0��xȰ�����`` ??��߿����������������`?0_x_7??? ��0��x�������`` ???7?4 �������������x�H +</3s����~99��`��������|
\ No newline at end of file
binary files /dev/null b/gfx/overworld/073.png differ
binary files a/gfx/overworld/074.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/074.png differ
binary files a/gfx/overworld/075.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/075.png differ
binary files a/gfx/overworld/076.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/076.png differ
binary files a/gfx/overworld/077.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/077.png differ
binary files a/gfx/overworld/078.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/078.png differ
binary files a/gfx/overworld/079.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/079.png differ
--- a/gfx/overworld/080.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- 78??4???xS���0�8��X���<���tk?/?1?" \�����w��5ͷ��22
\ No newline at end of file
binary files /dev/null b/gfx/overworld/080.png differ
binary files a/gfx/overworld/081.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/081.png differ
binary files a/gfx/overworld/082.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/082.png differ
binary files a/gfx/overworld/083.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/083.png differ
binary files a/gfx/overworld/084.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/084.png differ
binary files a/gfx/overworld/085.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/085.png differ
binary files a/gfx/overworld/086.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/086.png differ
--- a/gfx/overworld/087.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ?"?'=Ox����0���D���� �G��ny �Ov����������
\ No newline at end of file
binary files /dev/null b/gfx/overworld/087.png differ
--- a/gfx/overworld/088.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-7\����t���p����|z� ����q~������Go??���>��������
\ No newline at end of file
binary files /dev/null b/gfx/overworld/088.png differ
--- a/gfx/overworld/089.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ? @��ժ��Ѯ����� R��^C��+��ҭ��������u??���+�W���~��
\ No newline at end of file
binary files /dev/null b/gfx/overworld/089.png differ
binary files a/gfx/overworld/090.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/090.png differ
binary files a/gfx/overworld/091.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/091.png differ
--- a/gfx/overworld/092.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ;2nO]i6)]`�й���lLv�ږl���3M���Gx0? > �� ����������
\ No newline at end of file
binary files /dev/null b/gfx/overworld/092.png differ
binary files a/gfx/overworld/093.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/093.png differ
binary files a/gfx/overworld/094.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/094.png differ
binary files a/gfx/overworld/095.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/095.png differ
--- a/gfx/overworld/096.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
- %?/: ����0��8xȤ��\��G��xOO3>�O� �����|H��p�� (7/8 �������8�� �����c\t?<a����:.��<���p�� '>-; ���8��8�Ȅ����� ?3S����|D88�������_���>" q���� <����.� �"Oy?<OO?>�'������|�x@��� t���� �
-�����C1? 1���� �� ��X谰 ,3O|[w?%?)?)��� p��p������0># ?3S����uM88��������?���
\ No newline at end of file
binary files /dev/null b/gfx/overworld/096.png differ
--- a/gfx/overworld/097.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
- /0P@oV��������� -��jp?3{LK?<8/ � ���2���< ����� ??___����������������??/<[X0? ���<��� ������� ? ? ? ?,����x��x�<�<�|� ? � x���x�����\ No newline at end of file
binary files /dev/null b/gfx/overworld/097.png differ
--- a/gfx/overworld/098.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- >}} 56=w^���| �������,�n�������y_y_��R^ ��O�W�����WuJz08
\ No newline at end of file
binary files /dev/null b/gfx/overworld/098.png differ
--- a/gfx/overworld/099.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ?8O~5?C7=���X�h� �~������7<?-?'?;??~F~R<<�<��������~b~J<<
\ No newline at end of file
binary files /dev/null b/gfx/overworld/099.png differ
--- a/gfx/overworld/100.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ?/{O]S����������������?(?=w}s#?:>~V||���������^~~j>>\ No newline at end of file
binary files /dev/null b/gfx/overworld/100.png differ
--- a/gfx/overworld/101.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ????_~ToR�����������~�*�J?2 ?'=& �Lx����d�����xx ????__o_����������������;7 ?/8/ ���8�� ��x���pp ??7?+7 �������������.�. � �8���0�0�����
\ No newline at end of file
binary files /dev/null b/gfx/overworld/101.png differ
binary files a/gfx/overworld/chris_fish.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/chris_fish.png differ
binary files a/gfx/overworld/kris_fish.2bpp /dev/null differ
binary files /dev/null b/gfx/overworld/kris_fish.png differ
--- a/gfx/overworld/trainer_battle_pokeball_tiles.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-����Á����ý�����������������
\ No newline at end of file
binary files /dev/null b/gfx/overworld/trainer_battle_pokeball_tiles.png differ
binary files a/gfx/pc.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/pc.2bpp.lz.2201c1aa differ
binary files /dev/null b/gfx/pc.png differ
binary files a/gfx/pc_mail.2bpp /dev/null differ
binary files /dev/null b/gfx/pc_mail.png differ
binary files a/gfx/pokedex/pokedex.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/pokedex/pokedex.2bpp.lz.3726dd3f differ
binary files /dev/null b/gfx/pokedex/pokedex.png differ
--- a/gfx/pokedex/select_start.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����ˉ�����������,,mm,,mmmm$$�����������������������������ۛ�������UUUUUUUU��������������
\ No newline at end of file
binary files /dev/null b/gfx/pokedex/select_start.png differ
binary files a/gfx/pokedex/sgb.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/pokedex/sgb.2bpp.lz.82bc0a7b differ
binary files /dev/null b/gfx/pokedex/sgb.png differ
binary files a/gfx/pokedex/slowpoke.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/pokedex/slowpoke.2bpp.lz.49a91b42 differ
binary files /dev/null b/gfx/pokedex/slowpoke.png differ
--- a/gfx/pokegear/dexmap_nest_icon.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-BBff��������ZZ$$
\ No newline at end of file
binary files /dev/null b/gfx/pokegear/dexmap_nest_icon.png differ
binary files a/gfx/pokegear/flymap_label_border.2bpp /dev/null differ
binary files /dev/null b/gfx/pokegear/flymap_label_border.png differ
binary files a/gfx/shrink1.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/shrink1.2bpp.lz.d4443930 differ
binary files /dev/null b/gfx/shrink1.png differ
binary files a/gfx/shrink2.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/shrink2.2bpp.lz.3f58480a differ
binary files /dev/null b/gfx/shrink2.png differ
binary files a/gfx/slots_1.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/slots_1.2bpp.lz.b22ddc13 differ
binary files /dev/null b/gfx/slots_1.png differ
binary files a/gfx/slots_2.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/slots_2.2bpp.lz.b28f76e3 differ
binary files /dev/null b/gfx/slots_2.png differ
binary files a/gfx/slots_3.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/slots_3.2bpp.lz.70c2984c differ
binary files /dev/null b/gfx/slots_3.png differ
--- a/gfx/special/celebi/1.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-00.> ��d$6�����&�����_g?83<}__{jn � ����@� ظ�\ No newline at end of file
binary files /dev/null b/gfx/special/celebi/1.png differ
binary files a/gfx/special/celebi/2.2bpp /dev/null differ
binary files /dev/null b/gfx/special/celebi/2.png differ
--- a/gfx/special/celebi/3.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-00.> �Ϸ�d$6�����&���Zk?'?83<}__{jn � ����`�8�\ No newline at end of file
binary files /dev/null b/gfx/special/celebi/3.png differ
--- a/gfx/special/celebi/4.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-00.> �Ϸ�d$6�����&���Zk?'?83<}__{jn � ����`�8�\ No newline at end of file
binary files /dev/null b/gfx/special/celebi/4.png differ
binary files a/gfx/special/celebi/leaf.2bpp /dev/null differ
binary files /dev/null b/gfx/special/celebi/leaf.png differ
binary files a/gfx/splash/logo.1bpp /dev/null differ
binary files /dev/null b/gfx/splash/logo1.png differ
binary files /dev/null b/gfx/splash/logo2.png differ
--- a/gfx/stats/shiny.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-@@��BB88
\ No newline at end of file
binary files /dev/null b/gfx/stats/shiny.png differ
binary files a/gfx/tilesets/00.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/00.2bpp.lz.0c7e555a differ
binary files /dev/null b/gfx/tilesets/00.png differ
binary files a/gfx/tilesets/01.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/01.2bpp.lz.0c7e555a differ
binary files /dev/null b/gfx/tilesets/01.png differ
binary files a/gfx/tilesets/02.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/02.2bpp.lz.391603fb differ
binary files /dev/null b/gfx/tilesets/02.png differ
binary files a/gfx/tilesets/03.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/03.2bpp.lz.a29f5d51 differ
binary files /dev/null b/gfx/tilesets/03.png differ
binary files a/gfx/tilesets/04.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/04.2bpp.lz.391603fb differ
binary files /dev/null b/gfx/tilesets/04.png differ
binary files a/gfx/tilesets/05.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/05.2bpp.lz.c848ef13 differ
binary files /dev/null b/gfx/tilesets/05.png differ
binary files a/gfx/tilesets/06.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/06.2bpp.lz.252cbd8f differ
binary files /dev/null b/gfx/tilesets/06.png differ
binary files a/gfx/tilesets/07.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/07.2bpp.lz.e1c4014c differ
binary files /dev/null b/gfx/tilesets/07.png differ
binary files a/gfx/tilesets/08.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/08.2bpp.lz.f5a55006 differ
binary files /dev/null b/gfx/tilesets/08.png differ
binary files a/gfx/tilesets/09.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/09.2bpp.lz.56b1a405 differ
binary files /dev/null b/gfx/tilesets/09.png differ
binary files a/gfx/tilesets/10.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/10.2bpp.lz.b8d0f547 differ
binary files /dev/null b/gfx/tilesets/10.png differ
binary files a/gfx/tilesets/11.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/11.2bpp.lz.454cfd8b differ
binary files /dev/null b/gfx/tilesets/11.png differ
binary files a/gfx/tilesets/12.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/12.2bpp.lz.e2e94f92 differ
binary files /dev/null b/gfx/tilesets/12.png differ
binary files a/gfx/tilesets/13.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/13.2bpp.lz.63b414d4 differ
binary files /dev/null b/gfx/tilesets/13.png differ
binary files a/gfx/tilesets/14.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/14.2bpp.lz.71d29a2f differ
binary files /dev/null b/gfx/tilesets/14.png differ
binary files a/gfx/tilesets/15.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/15.2bpp.lz.c1f2ed8f differ
binary files /dev/null b/gfx/tilesets/15.png differ
binary files a/gfx/tilesets/16.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/16.2bpp.lz.dd51d079 differ
binary files /dev/null b/gfx/tilesets/16.png differ
binary files a/gfx/tilesets/17.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/17.2bpp.lz.1600ca86 differ
binary files /dev/null b/gfx/tilesets/17.png differ
binary files a/gfx/tilesets/18.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/18.2bpp.lz.93800351 differ
binary files /dev/null b/gfx/tilesets/18.png differ
binary files a/gfx/tilesets/19.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/19.2bpp.lz.0c1544c1 differ
binary files /dev/null b/gfx/tilesets/19.png differ
binary files a/gfx/tilesets/20.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/20.2bpp.lz.35e51007 differ
binary files /dev/null b/gfx/tilesets/20.png differ
binary files a/gfx/tilesets/21.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/21.2bpp.lz.febbc4ec differ
binary files /dev/null b/gfx/tilesets/21.png differ
binary files a/gfx/tilesets/22.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/22.2bpp.lz.467b6a2d differ
binary files /dev/null b/gfx/tilesets/22.png differ
binary files a/gfx/tilesets/23.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/23.2bpp.lz.bc56789c differ
binary files /dev/null b/gfx/tilesets/23.png differ
binary files a/gfx/tilesets/24.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/24.2bpp.lz.3437812a differ
binary files /dev/null b/gfx/tilesets/24.png differ
binary files a/gfx/tilesets/25.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/25.2bpp.lz.7fcb81d6 differ
binary files /dev/null b/gfx/tilesets/25.png differ
binary files a/gfx/tilesets/26.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/26.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/26.png differ
binary files a/gfx/tilesets/27.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/27.2bpp.lz.27cdd9ad differ
binary files /dev/null b/gfx/tilesets/27.png differ
binary files a/gfx/tilesets/28.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/28.2bpp.lz.cace291c differ
binary files /dev/null b/gfx/tilesets/28.png differ
binary files a/gfx/tilesets/29.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/29.2bpp.lz.e23bc89f differ
binary files /dev/null b/gfx/tilesets/29.png differ
binary files a/gfx/tilesets/30.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/30.2bpp.lz.25b9c4b6 differ
binary files /dev/null b/gfx/tilesets/30.png differ
binary files a/gfx/tilesets/31.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/31.2bpp.lz.6b0ac896 differ
binary files /dev/null b/gfx/tilesets/31.png differ
binary files a/gfx/tilesets/32.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/32.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/32.png differ
binary files a/gfx/tilesets/33.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/33.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/33.png differ
binary files a/gfx/tilesets/34.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/34.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/34.png differ
binary files a/gfx/tilesets/35.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/35.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/35.png differ
binary files a/gfx/tilesets/36.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/tilesets/36.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/36.png differ
--- a/gfx/tilesets/flower/cgb_1.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-� M�-mL�A��HE0
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/flower/cgb_1.png differ
--- a/gfx/tilesets/flower/cgb_2.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�Y$�Z%Z�f%Z�$E
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/flower/cgb_2.png differ
--- a/gfx/tilesets/flower/dmg_1.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-� A�! a �1��HE0
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/flower/dmg_1.png differ
--- a/gfx/tilesets/flower/dmg_2.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�A$�BB�fZ�$E
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/flower/dmg_2.png differ
--- a/gfx/tilesets/forest-tree/1.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�W$�2�0[LG`
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/forest-tree/1.png differ
--- a/gfx/tilesets/forest-tree/2.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
-�U&�
-:�(3$nq߰
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/forest-tree/2.png differ
binary files a/gfx/tilesets/forest-tree/3.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/forest-tree/3.png differ
binary files a/gfx/tilesets/forest-tree/4.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/forest-tree/4.png differ
binary files a/gfx/tilesets/fountain/1.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/fountain/1.png differ
binary files a/gfx/tilesets/fountain/2.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/fountain/2.png differ
binary files a/gfx/tilesets/fountain/3.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/fountain/3.png differ
binary files a/gfx/tilesets/fountain/4.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/fountain/4.png differ
binary files a/gfx/tilesets/fountain/5.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/fountain/5.png differ
binary files a/gfx/tilesets/roofs/0.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/roofs/0.png differ
binary files a/gfx/tilesets/roofs/1.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/roofs/1.png differ
binary files a/gfx/tilesets/roofs/2.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/roofs/2.png differ
binary files a/gfx/tilesets/roofs/3.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/roofs/3.png differ
binary files a/gfx/tilesets/roofs/4.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/roofs/4.png differ
binary files a/gfx/tilesets/safari/1.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/safari/1.png differ
--- a/gfx/tilesets/safari/2.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-@��2��~���,
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/safari/2.png differ
binary files a/gfx/tilesets/safari/3.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/safari/3.png differ
binary files a/gfx/tilesets/safari/4.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/safari/4.png differ
--- a/gfx/tilesets/sprout-pillar/1.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����������������_�_������?/�/?�?��?��?� � � �_� �� � � � �O��o
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/sprout-pillar/1.png differ
--- a/gfx/tilesets/sprout-pillar/10.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-?�_���_��������� ���_���_��������W���������������W���W��������U���u������
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/sprout-pillar/10.png differ
--- a/gfx/tilesets/sprout-pillar/2.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ������������������������������������������������������������������������
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/sprout-pillar/2.png differ
--- a/gfx/tilesets/sprout-pillar/3.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����������������_�_������?/�/?�?��?��?� � � �_� �� � � � �O��o
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/sprout-pillar/3.png differ
--- a/gfx/tilesets/sprout-pillar/4.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����������������������������������������������������������������������������
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/sprout-pillar/4.png differ
--- a/gfx/tilesets/sprout-pillar/5.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����������������_�_������������?/�o������������ �W������������ �[��������
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/sprout-pillar/5.png differ
--- a/gfx/tilesets/sprout-pillar/6.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����������������������������������������������������������������������������
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/sprout-pillar/6.png differ
--- a/gfx/tilesets/sprout-pillar/7.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����ݠ߀��������������������������������������������������������������������
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/sprout-pillar/7.png differ
--- a/gfx/tilesets/sprout-pillar/8.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- �?�?� � �_�_� �� � ���/�/��������������� � ��������
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/sprout-pillar/8.png differ
--- a/gfx/tilesets/sprout-pillar/9.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����������������������������������������������������������������������������
\ No newline at end of file
binary files /dev/null b/gfx/tilesets/sprout-pillar/9.png differ
binary files a/gfx/tilesets/water.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/water.png differ
binary files a/gfx/tilesets/whirlpool/1.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/whirlpool/1.png differ
binary files a/gfx/tilesets/whirlpool/2.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/whirlpool/2.png differ
binary files a/gfx/tilesets/whirlpool/3.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/whirlpool/3.png differ
binary files a/gfx/tilesets/whirlpool/4.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/whirlpool/4.png differ
binary files /dev/null b/gfx/title/crystal.2bpp.lz.cd5aabdd differ
binary files /dev/null b/gfx/title/crystal.png differ
binary files a/gfx/title/crystal.w48.interleave.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/title/logo.2bpp.lz.f22013e3 differ
binary files /dev/null b/gfx/title/logo.png differ
binary files a/gfx/title/logo.w160.t4.2bpp.lz /dev/null differ
binary files a/gfx/title/old_bg.2bpp /dev/null differ
binary files /dev/null b/gfx/title/old_bg.png differ
binary files a/gfx/title/old_fg.2bpp /dev/null differ
binary files /dev/null b/gfx/title/old_fg.png differ
binary files /dev/null b/gfx/title/suicune.2bpp.lz.30e490d0 differ
binary files /dev/null b/gfx/title/suicune.png differ
binary files a/gfx/title/suicune.w128.2bpp.lz /dev/null differ
binary files a/gfx/trade/arrow.2bpp /dev/null differ
binary files /dev/null b/gfx/trade/arrow.png differ
binary files a/gfx/trade/ball.2bpp /dev/null differ
binary files /dev/null b/gfx/trade/ball.png differ
binary files a/gfx/trade/bubble.2bpp /dev/null differ
binary files /dev/null b/gfx/trade/bubble.png differ
binary files a/gfx/trade/cable.2bpp /dev/null differ
binary files /dev/null b/gfx/trade/cable.png differ
binary files a/gfx/trade/game_boy.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trade/game_boy.2bpp.lz.71a5f644 differ
binary files /dev/null b/gfx/trade/game_boy.png differ
binary files a/gfx/trade/poof.2bpp /dev/null differ
binary files /dev/null b/gfx/trade/poof.png differ
binary files a/gfx/trainers/beauty.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/beauty.2bpp.lz.c1c13787 differ
--- a/gfx/trainers/beauty.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 24, 17, 11
- RGB 08, 09, 17
-
binary files /dev/null b/gfx/trainers/beauty.png differ
binary files a/gfx/trainers/biker.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/biker.2bpp.lz.cb40f7cd differ
--- a/gfx/trainers/biker.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 20, 17, 09
- RGB 04, 03, 10
-
binary files /dev/null b/gfx/trainers/biker.png differ
binary files a/gfx/trainers/bird_keeper.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/bird_keeper.2bpp.lz.1e56954c differ
--- a/gfx/trainers/bird_keeper.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 22, 17
- RGB 06, 12, 26
-
binary files /dev/null b/gfx/trainers/bird_keeper.png differ
binary files a/gfx/trainers/blackbelt_t.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/blackbelt_t.2bpp.lz.4ef2481c differ
--- a/gfx/trainers/blackbelt_t.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 26, 15, 08
- RGB 13, 10, 12
-
binary files /dev/null b/gfx/trainers/blackbelt_t.png differ
binary files a/gfx/trainers/blaine.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/blaine.2bpp.lz.00a3b6f5 differ
--- a/gfx/trainers/blaine.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 20, 16
- RGB 07, 11, 12
-
binary files /dev/null b/gfx/trainers/blaine.png differ
binary files a/gfx/trainers/blue.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/blue.2bpp.lz.9fdbab8f differ
--- a/gfx/trainers/blue.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 31, 24, 08
- RGB 12, 09, 19
-
binary files /dev/null b/gfx/trainers/blue.png differ
binary files a/gfx/trainers/boarder.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/boarder.2bpp.lz.5d6881a8 differ
--- a/gfx/trainers/boarder.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 24, 19, 07
- RGB 13, 10, 19
-
binary files /dev/null b/gfx/trainers/boarder.png differ
binary files a/gfx/trainers/brock.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/brock.2bpp.lz.5bdeb7bf differ
--- a/gfx/trainers/brock.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 18, 14
- RGB 14, 07, 10
-
binary files /dev/null b/gfx/trainers/brock.png differ
binary files a/gfx/trainers/bruno.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/bruno.2bpp.lz.22f3c222 differ
--- a/gfx/trainers/bruno.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 25, 17, 12
- RGB 08, 10, 12
-
binary files /dev/null b/gfx/trainers/bruno.png differ
binary files a/gfx/trainers/bug_catcher.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/bug_catcher.2bpp.lz.43144f97 differ
--- a/gfx/trainers/bug_catcher.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 27, 17, 10
- RGB 06, 10, 18
-
binary files /dev/null b/gfx/trainers/bug_catcher.png differ
binary files a/gfx/trainers/bugsy.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/bugsy.2bpp.lz.c070450d differ
--- a/gfx/trainers/bugsy.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 26, 18, 15
- RGB 13, 21, 06
-
binary files /dev/null b/gfx/trainers/bugsy.png differ
binary files a/gfx/trainers/burglar.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/burglar.2bpp.lz.e063f42e differ
--- a/gfx/trainers/burglar.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 28, 16, 09
- RGB 12, 04, 23
-
binary files /dev/null b/gfx/trainers/burglar.png differ
binary files a/gfx/trainers/cal.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/cal.2bpp.lz.aac54a14 differ
--- a/gfx/trainers/cal.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 25, 18, 12
- RGB 22, 09, 05
-
binary files /dev/null b/gfx/trainers/cal.png differ
binary files a/gfx/trainers/camper.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/camper.2bpp.lz.cc2357ea differ
--- a/gfx/trainers/camper.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 31, 19, 08
- RGB 15, 25, 02
-
binary files /dev/null b/gfx/trainers/camper.png differ
binary files a/gfx/trainers/champion.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/champion.2bpp.lz.0175f5ea differ
--- a/gfx/trainers/champion.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 29, 19, 15
- RGB 21, 09, 05
-
binary files /dev/null b/gfx/trainers/champion.png differ
binary files a/gfx/trainers/chuck.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/chuck.2bpp.lz.cab13edd differ
--- a/gfx/trainers/chuck.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 25, 16, 12
- RGB 12, 08, 08
-
binary files /dev/null b/gfx/trainers/chuck.png differ
binary files a/gfx/trainers/clair.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/clair.2bpp.lz.a1771075 differ
--- a/gfx/trainers/clair.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 27, 18, 12
- RGB 08, 11, 16
-
binary files /dev/null b/gfx/trainers/clair.png differ
binary files a/gfx/trainers/cooltrainer_f.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/cooltrainer_f.2bpp.lz.6fb1e652 differ
--- a/gfx/trainers/cooltrainer_f.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 26, 18, 15
- RGB 22, 09, 03
-
binary files /dev/null b/gfx/trainers/cooltrainer_f.png differ
binary files a/gfx/trainers/cooltrainer_m.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/cooltrainer_m.2bpp.lz.0aa81882 differ
--- a/gfx/trainers/cooltrainer_m.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 26, 18, 15
- RGB 22, 09, 03
-
binary files /dev/null b/gfx/trainers/cooltrainer_m.png differ
binary files a/gfx/trainers/erika.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/erika.2bpp.lz.58985f01 differ
--- a/gfx/trainers/erika.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 31, 18, 13
- RGB 07, 15, 08
-
binary files /dev/null b/gfx/trainers/erika.png differ
binary files a/gfx/trainers/executive_f.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/executive_f.2bpp.lz.c8b5dc9c differ
--- a/gfx/trainers/executive_f.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 22, 17
- RGB 19, 05, 12
-
binary files /dev/null b/gfx/trainers/executive_f.png differ
binary files a/gfx/trainers/executive_m.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/executive_m.2bpp.lz.211746a6 differ
--- a/gfx/trainers/executive_m.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 25, 17, 05
- RGB 14, 05, 14
-
binary files /dev/null b/gfx/trainers/executive_m.png differ
binary files a/gfx/trainers/falkner.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/falkner.2bpp.lz.6ec6bbaf differ
--- a/gfx/trainers/falkner.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 27, 17, 14
- RGB 07, 05, 31
-
binary files /dev/null b/gfx/trainers/falkner.png differ
binary files a/gfx/trainers/firebreather.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/firebreather.2bpp.lz.a790feb1 differ
--- a/gfx/trainers/firebreather.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 27, 17, 11
- RGB 25, 05, 12
-
binary files /dev/null b/gfx/trainers/firebreather.png differ
binary files a/gfx/trainers/fisher.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/fisher.2bpp.lz.95bfbfd6 differ
--- a/gfx/trainers/fisher.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 17, 13
- RGB 07, 12, 15
-
binary files /dev/null b/gfx/trainers/fisher.png differ
binary files a/gfx/trainers/gentleman.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/gentleman.2bpp.lz.d3d78e00 differ
--- a/gfx/trainers/gentleman.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 25, 16, 12
- RGB 09, 09, 15
-
binary files /dev/null b/gfx/trainers/gentleman.png differ
binary files a/gfx/trainers/grunt_f.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/grunt_f.2bpp.lz.522aecd7 differ
--- a/gfx/trainers/grunt_f.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 31, 19, 13
- RGB 19, 06, 08
-
binary files /dev/null b/gfx/trainers/grunt_f.png differ
binary files a/gfx/trainers/grunt_m.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/grunt_m.2bpp.lz.916e09d2 differ
--- a/gfx/trainers/grunt_m.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 29, 17, 15
- RGB 20, 08, 05
-
binary files /dev/null b/gfx/trainers/grunt_m.png differ
binary files a/gfx/trainers/guitarist.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/guitarist.2bpp.lz.be5a9b71 differ
--- a/gfx/trainers/guitarist.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 31, 22, 19
- RGB 31, 08, 05
-
binary files /dev/null b/gfx/trainers/guitarist.png differ
binary files a/gfx/trainers/hiker.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/hiker.2bpp.lz.07a4e386 differ
--- a/gfx/trainers/hiker.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 23, 15, 09
- RGB 13, 08, 23
-
binary files /dev/null b/gfx/trainers/hiker.png differ
binary files a/gfx/trainers/janine.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/janine.2bpp.lz.5350f3ce differ
--- a/gfx/trainers/janine.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 18, 15
- RGB 15, 08, 23
-
binary files /dev/null b/gfx/trainers/janine.png differ
binary files a/gfx/trainers/jasmine.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/jasmine.2bpp.lz.dcd58308 differ
--- a/gfx/trainers/jasmine.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 26, 18, 10
- RGB 16, 09, 11
-
binary files /dev/null b/gfx/trainers/jasmine.png differ
binary files a/gfx/trainers/juggler.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/juggler.2bpp.lz.2d7625ba differ
--- a/gfx/trainers/juggler.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 26, 15, 10
- RGB 09, 06, 31
-
binary files /dev/null b/gfx/trainers/juggler.png differ
binary files a/gfx/trainers/karen.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/karen.2bpp.lz.7fc3d941 differ
--- a/gfx/trainers/karen.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 18, 14
- RGB 21, 08, 07
-
binary files /dev/null b/gfx/trainers/karen.png differ
binary files a/gfx/trainers/kimono_girl.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/kimono_girl.2bpp.lz.e8833d48 differ
--- a/gfx/trainers/kimono_girl.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 29, 19, 15
- RGB 26, 09, 06
-
binary files /dev/null b/gfx/trainers/kimono_girl.png differ
binary files a/gfx/trainers/koga.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/koga.2bpp.lz.7a066020 differ
--- a/gfx/trainers/koga.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 27, 18, 14
- RGB 12, 07, 13
-
binary files /dev/null b/gfx/trainers/koga.png differ
binary files a/gfx/trainers/lass.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/lass.2bpp.lz.e3726508 differ
--- a/gfx/trainers/lass.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 25, 17, 06
- RGB 13, 08, 25
-
binary files /dev/null b/gfx/trainers/lass.png differ
binary files a/gfx/trainers/lt_surge.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/lt_surge.2bpp.lz.4ac586d0 differ
--- a/gfx/trainers/lt_surge.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 25, 17, 14
- RGB 09, 14, 10
-
binary files /dev/null b/gfx/trainers/lt_surge.png differ
binary files a/gfx/trainers/medium.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/medium.2bpp.lz.db642b9e differ
--- a/gfx/trainers/medium.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 25, 17, 12
- RGB 09, 09, 14
-
binary files /dev/null b/gfx/trainers/medium.png differ
binary files a/gfx/trainers/misty.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/misty.2bpp.lz.2ded1a10 differ
--- a/gfx/trainers/misty.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 29, 19, 16
- RGB 20, 10, 05
-
binary files /dev/null b/gfx/trainers/misty.png differ
binary files a/gfx/trainers/morty.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/morty.2bpp.lz.aec5773b differ
--- a/gfx/trainers/morty.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 29, 17, 12
- RGB 12, 07, 22
-
binary files /dev/null b/gfx/trainers/morty.png differ
binary files a/gfx/trainers/mysticalman.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/mysticalman.2bpp.lz.35d01215 differ
--- a/gfx/trainers/mysticalman.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 28, 20, 12
- RGB 16, 07, 16
-
binary files /dev/null b/gfx/trainers/mysticalman.png differ
binary files a/gfx/trainers/oak.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/oak.2bpp.lz.91a27df3 differ
--- a/gfx/trainers/oak.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 24, 19, 11
- RGB 13, 16, 00
-
binary files /dev/null b/gfx/trainers/oak.png differ
binary files a/gfx/trainers/officer.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/officer.2bpp.lz.630b057a differ
--- a/gfx/trainers/officer.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 24, 08
- RGB 12, 09, 19
-
binary files /dev/null b/gfx/trainers/officer.png differ
binary files a/gfx/trainers/picnicker.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/picnicker.2bpp.lz.6842b86a differ
--- a/gfx/trainers/picnicker.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 31, 19, 08
- RGB 10, 20, 02
-
binary files /dev/null b/gfx/trainers/picnicker.png differ
binary files a/gfx/trainers/pokefan_f.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/pokefan_f.2bpp.lz.9cbd3f20 differ
--- a/gfx/trainers/pokefan_f.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 17, 14
- RGB 15, 04, 15
-
binary files /dev/null b/gfx/trainers/pokefan_f.png differ
binary files a/gfx/trainers/pokefan_m.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/pokefan_m.2bpp.lz.5bc5a3e1 differ
--- a/gfx/trainers/pokefan_m.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 29, 19, 13
- RGB 21, 08, 08
-
binary files /dev/null b/gfx/trainers/pokefan_m.png differ
binary files a/gfx/trainers/pokemaniac.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/pokemaniac.2bpp.lz.786c5fce differ
--- a/gfx/trainers/pokemaniac.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 28, 20, 13
- RGB 13, 05, 18
-
binary files /dev/null b/gfx/trainers/pokemaniac.png differ
binary files a/gfx/trainers/pryce.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/pryce.2bpp.lz.1a98cae8 differ
--- a/gfx/trainers/pryce.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 31, 18, 16
- RGB 12, 09, 08
-
binary files /dev/null b/gfx/trainers/pryce.png differ
binary files a/gfx/trainers/psychic_t.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/psychic_t.2bpp.lz.ecd603f4 differ
--- a/gfx/trainers/psychic_t.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 22, 17
- RGB 10, 12, 19
-
binary files /dev/null b/gfx/trainers/psychic_t.png differ
binary files a/gfx/trainers/red.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/red.2bpp.lz.51104ac6 differ
--- a/gfx/trainers/red.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 28, 18, 17
- RGB 22, 07, 08
-
binary files /dev/null b/gfx/trainers/red.png differ
binary files a/gfx/trainers/rival1.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/rival1.2bpp.lz.e43b32ef differ
--- a/gfx/trainers/rival1.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 27, 18, 07
- RGB 26, 04, 09
-
binary files /dev/null b/gfx/trainers/rival1.png differ
binary files a/gfx/trainers/rival2.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/rival2.2bpp.lz.562de263 differ
--- a/gfx/trainers/rival2.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 27, 18, 07
- RGB 26, 04, 09
-
binary files /dev/null b/gfx/trainers/rival2.png differ
binary files a/gfx/trainers/sabrina.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/sabrina.2bpp.lz.d09a2b46 differ
--- a/gfx/trainers/sabrina.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 22, 17
- RGB 24, 07, 09
-
binary files /dev/null b/gfx/trainers/sabrina.png differ
binary files a/gfx/trainers/sage.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/sage.2bpp.lz.2038324b differ
--- a/gfx/trainers/sage.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 22, 17
- RGB 08, 08, 20
-
binary files /dev/null b/gfx/trainers/sage.png differ
binary files a/gfx/trainers/sailor.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/sailor.2bpp.lz.0f7f3386 differ
--- a/gfx/trainers/sailor.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 24, 14, 07
- RGB 03, 07, 13
-
binary files /dev/null b/gfx/trainers/sailor.png differ
binary files a/gfx/trainers/schoolboy.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/schoolboy.2bpp.lz.6d26b31b differ
--- a/gfx/trainers/schoolboy.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 25, 16, 11
- RGB 13, 10, 24
-
binary files /dev/null b/gfx/trainers/schoolboy.png differ
binary files a/gfx/trainers/scientist.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/scientist.2bpp.lz.2ef10474 differ
--- a/gfx/trainers/scientist.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 24, 19, 11
- RGB 10, 13, 17
-
binary files /dev/null b/gfx/trainers/scientist.png differ
binary files a/gfx/trainers/skier.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/skier.2bpp.lz.399d4240 differ
--- a/gfx/trainers/skier.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 28, 19, 15
- RGB 24, 06, 14
-
binary files /dev/null b/gfx/trainers/skier.png differ
binary files a/gfx/trainers/super_nerd.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/super_nerd.2bpp.lz.c5362664 differ
--- a/gfx/trainers/super_nerd.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 30, 22, 17
- RGB 11, 09, 10
-
binary files /dev/null b/gfx/trainers/super_nerd.png differ
binary files a/gfx/trainers/swimmer_f.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/swimmer_f.2bpp.lz.c60d0ad6 differ
--- a/gfx/trainers/swimmer_f.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 25, 16, 05
- RGB 06, 14, 04
-
binary files /dev/null b/gfx/trainers/swimmer_f.png differ
binary files a/gfx/trainers/swimmer_m.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/swimmer_m.2bpp.lz.2c1a716e differ
--- a/gfx/trainers/swimmer_m.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 03, 04, 09
- RGB 21, 13, 01
-
binary files /dev/null b/gfx/trainers/swimmer_m.png differ
binary files a/gfx/trainers/teacher.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/teacher.2bpp.lz.1d131210 differ
--- a/gfx/trainers/teacher.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 31, 20, 16
- RGB 08, 11, 07
-
binary files /dev/null b/gfx/trainers/teacher.png differ
binary files a/gfx/trainers/twins.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/twins.2bpp.lz.462fd733 differ
--- a/gfx/trainers/twins.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 31, 22, 08
- RGB 28, 03, 21
-
binary files /dev/null b/gfx/trainers/twins.png differ
binary files a/gfx/trainers/whitney.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/whitney.2bpp.lz.dcb46ea6 differ
--- a/gfx/trainers/whitney.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 28, 18, 09
- RGB 21, 07, 02
-
binary files /dev/null b/gfx/trainers/whitney.png differ
binary files a/gfx/trainers/will.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/will.2bpp.lz.842af358 differ
--- a/gfx/trainers/will.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 23, 15, 09
- RGB 26, 04, 02
-
binary files /dev/null b/gfx/trainers/will.png differ
binary files a/gfx/trainers/youngster.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/trainers/youngster.2bpp.lz.4bef139d differ
--- a/gfx/trainers/youngster.pal
+++ /dev/null
@@ -1,4 +1,0 @@
-
- RGB 28, 20, 09
- RGB 09, 12, 23
-
binary files /dev/null b/gfx/trainers/youngster.png differ
binary files a/gfx/unknown/011cb7.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/011cb7.png differ
binary files a/gfx/unknown/011cc7.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/011cc7.png differ
--- a/gfx/unknown/011e5d.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����
\ No newline at end of file
binary files /dev/null b/gfx/unknown/011e5d.png differ
binary files a/gfx/unknown/011e65.1bpp /dev/null differ
binary files /dev/null b/gfx/unknown/011e65.png differ
binary files a/gfx/unknown/011e6d.1bpp /dev/null differ
binary files /dev/null b/gfx/unknown/011e6d.png differ
binary files a/gfx/unknown/0123fc.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/0123fc.png differ
binary files a/gfx/unknown/016d9c.1bpp /dev/null differ
binary files /dev/null b/gfx/unknown/016d9c.png differ
binary files a/gfx/unknown/016da4.1bpp /dev/null differ
binary files /dev/null b/gfx/unknown/016da4.png differ
--- a/gfx/unknown/017393.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- @@?1A������~~<<
\ No newline at end of file
binary files /dev/null b/gfx/unknown/017393.png differ
binary files a/gfx/unknown/029f54.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/029f54.png differ
binary files a/gfx/unknown/0488c3.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/0488c3.png differ
binary files a/gfx/unknown/0488cb.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/0488cb.png differ
binary files a/gfx/unknown/049c0c.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/049c0c.png differ
binary files a/gfx/unknown/08940b.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/08940b.png differ
binary files a/gfx/unknown/08c893.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/08c893.png differ
--- a/gfx/unknown/0908fb.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����
\ No newline at end of file
binary files /dev/null b/gfx/unknown/0908fb.png differ
binary files a/gfx/unknown/090903.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/090903.png differ
binary files a/gfx/unknown/09090b.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/09090b.png differ
binary files a/gfx/unknown/0e0cdb.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unknown/0e0cdb.2bpp.lz.53679db7 differ
binary files /dev/null b/gfx/unknown/0e0cdb.png differ
--- a/gfx/unknown/0e0cf6.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-��������������
\ No newline at end of file
binary files /dev/null b/gfx/unknown/0e0cf6.png differ
--- a/gfx/unknown/0e0d06.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-����ÁÁÁÁ��
\ No newline at end of file
binary files /dev/null b/gfx/unknown/0e0d06.png differ
binary files a/gfx/unknown/0e0d16.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unknown/0e0d16.2bpp.lz.86f267e8 differ
binary files /dev/null b/gfx/unknown/0e0d16.png differ
binary files a/gfx/unknown/0e0ea8.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unknown/0e0ea8.2bpp.lz.6a6c671d differ
binary files /dev/null b/gfx/unknown/0e0ea8.png differ
binary files a/gfx/unknown/0e2221.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unknown/0e2221.2bpp.lz.821ba441 differ
binary files /dev/null b/gfx/unknown/0e2221.png differ
binary files a/gfx/unknown/0f89b0.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/0f89b0.png differ
binary files a/gfx/unknown/0f8aa0.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/0f8aa0.png differ
binary files a/gfx/unknown/0f8ea4.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/0f8ea4.png differ
binary files /dev/null b/gfx/unknown/0f8f34.png differ
binary files a/gfx/unknown/0f8f34.w64.1bpp /dev/null differ
binary files a/gfx/unknown/0f9424.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/0f9424.png differ
binary files a/gfx/unknown/0fbbbb.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/0fbbbb.png differ
binary files a/gfx/unknown/1032a2.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/1032a2.png differ
binary files a/gfx/unknown/106514.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/106514.png differ
binary files a/gfx/unknown/1065ad.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/1065ad.png differ
binary files /dev/null b/gfx/unknown/106dad.png differ
binary files a/gfx/unknown/108d27.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unknown/108d27.2bpp.lz.eef1e11d differ
binary files /dev/null b/gfx/unknown/108d27.png differ
binary files a/gfx/unknown/108da7.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unknown/108da7.2bpp.lz.aad8592b differ
binary files /dev/null b/gfx/unknown/108da7.png differ
binary files /dev/null b/gfx/unknown/108fe7.tilemap differ
binary files a/gfx/unknown/108fe7.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/unknown/108fe7.tilemap.lz.12882d37 differ
binary files /dev/null b/gfx/unknown/1090a7.tilemap differ
binary files a/gfx/unknown/1090a7.tilemap.lz /dev/null differ
binary files /dev/null b/gfx/unknown/1090a7.tilemap.lz.ea4f2cbe differ
binary files a/gfx/unknown/1091c7.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/1091c7.png differ
binary files a/gfx/unknown/1092c7.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/1092c7.png differ
binary files a/gfx/unknown/11601a.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/11601a.png differ
binary files a/gfx/unknown/16c173.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/16c173.png differ
binary files a/gfx/unknown/16cca3.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/16cca3.png differ
binary files a/gfx/unknown/16cfc1.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/16cfc1.png differ
binary files a/gfx/unknown/170d16.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unknown/170d16.2bpp.lz.5d6d2ad4 differ
binary files /dev/null b/gfx/unknown/170d16.png differ
binary files a/gfx/unknown/1715a4.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unknown/1715a4.2bpp.lz.3eaf004f differ
binary files /dev/null b/gfx/unknown/1715a4.png differ
binary files /dev/null b/gfx/unknown/1715a4_nonmatching.png differ
binary files a/gfx/unknown/171848.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/171848.png differ
binary files a/gfx/unknown/171db1.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/171db1.png differ
binary files a/gfx/unknown/172f1f.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/172f1f.png differ
binary files a/gfx/unknown/17afa5.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/17afa5.png differ
binary files a/gfx/unknown/17eb7e.2bpp /dev/null differ
binary files /dev/null b/gfx/unknown/17eb7e.png differ
binary files a/gfx/unknown/1dd805.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unknown/1dd805.2bpp.lz.7b56f7e5 differ
binary files /dev/null b/gfx/unknown/1dd805.png differ
binary files a/gfx/unown_puzzle/aerodactyl.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unown_puzzle/aerodactyl.2bpp.lz.f546fb5e differ
binary files /dev/null b/gfx/unown_puzzle/aerodactyl.png differ
binary files a/gfx/unown_puzzle/cursor.2bpp /dev/null differ
binary files /dev/null b/gfx/unown_puzzle/cursor.png differ
binary files a/gfx/unown_puzzle/hooh.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unown_puzzle/hooh.2bpp.lz.e440a572 differ
binary files /dev/null b/gfx/unown_puzzle/hooh.png differ
binary files a/gfx/unown_puzzle/kabuto.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unown_puzzle/kabuto.2bpp.lz.0ed9882d differ
binary files /dev/null b/gfx/unown_puzzle/kabuto.png differ
binary files a/gfx/unown_puzzle/omanyte.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unown_puzzle/omanyte.2bpp.lz.27bfcbde differ
binary files /dev/null b/gfx/unown_puzzle/omanyte.png differ
binary files a/gfx/unown_puzzle/start_cancel.2bpp.lz /dev/null differ
binary files /dev/null b/gfx/unown_puzzle/start_cancel.2bpp.lz.e07fe7bd differ
binary files /dev/null b/gfx/unown_puzzle/start_cancel.png differ
binary files a/gfx/unown_puzzle/tile_borders.2bpp /dev/null differ
binary files /dev/null b/gfx/unown_puzzle/tile_borders.png differ
--- a/home.asm
+++ b/home.asm
@@ -152,7 +152,7 @@
; Register aliases
_hl_:: ; 2fec
- jp [hl]
+ jp hl
; 2fed
_de_:: ; 2fed
--- a/home/battle.asm
+++ b/home/battle.asm
@@ -227,7 +227,7 @@
dw wPlayerMoveStructPower, wEnemyMoveStructPower
dw wPlayerMoveStructType, wEnemyMoveStructType
dw CurPlayerMove, CurEnemyMove
- dw LastEnemyCounterMove, LastPlayerCounterMove
+ dw LastPlayerCounterMove, LastEnemyCounterMove
dw LastPlayerMove, LastEnemyMove
; 3a90
--- a/home/farcall.asm
+++ b/home/farcall.asm
@@ -50,5 +50,5 @@
; 2d82
FarJump_hl:: ; 2d82
- jp [hl]
+ jp hl
; 2d83
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -337,7 +337,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 1eff
InitMenuCursorAndButtonPermissions:: ; 1eff
@@ -470,7 +470,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 1fb1
GetMenuDataPointerTableEntry:: ; 1fb1
--- a/home/text.asm
+++ b/home/text.asm
@@ -943,7 +943,7 @@
bit 7, h
jr nz, .not_rom
- jp [hl]
+ jp hl
.not_rom
ld a, "@"
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -263,7 +263,7 @@
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]
--- a/macros.asm
+++ b/macros.asm
@@ -281,7 +281,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
endm
maskbits: macro
--- a/main.asm
+++ b/main.asm
@@ -1178,10 +1178,10 @@
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]
@@ -3214,7 +3214,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.dw ; 4e564 (13:6564)
dw .DudeTutorial
@@ -4664,7 +4664,7 @@
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 @@
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 @@
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 @@
ret
KrisBackpic: ; 88ed6
-INCBIN "gfx/misc/kris_back.6x6.2bpp"
+INCBIN "gfx/misc/kris_back.2bpp"
String_89116:
db "-----@"
--- a/misc/battle_tower_5c.asm
+++ b/misc/battle_tower_5c.asm
@@ -222,7 +222,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 170249
.dw ; 170249
@@ -692,7 +692,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 17051f
.dw ; 17051f
@@ -947,7 +947,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 170696
@@ -1443,7 +1443,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.invalid
ld a, $5
--- a/misc/fixed_words.asm
+++ b/misc/fixed_words.asm
@@ -2516,7 +2516,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
dw .zero
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -145,5 +145,5 @@
GBCOnlyGFX: ; 4eb76
-INCBIN "gfx/misc/gbc_only.w112.2bpp.lz"
+INCBIN "gfx/misc/gbc_only.2bpp.lz"
; 4f0bc
--- a/misc/gfx_41.asm
+++ b/misc/gfx_41.asm
@@ -240,7 +240,7 @@
; 10419c
._hl_ ; 10419c
- jp [hl]
+ jp hl
; 10419d
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -1116,16 +1116,18 @@
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"
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -377,7 +377,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 10828a
.Jumptable: ; 10828a
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -146,7 +146,7 @@
ld h, [hl]
ld l, a
pop de
- jp [hl]
+ jp hl
; 11425c
@@ -5397,7 +5397,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 1165af
@@ -6931,7 +6931,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
Jumptable_117728: ; 117728 (45:7728)
dw Function117738
@@ -7419,7 +7419,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable: ; 0x117af8
dw Function117b06
--- a/misc/mobile_45_sprite_engine.asm
+++ b/misc/mobile_45_sprite_engine.asm
@@ -380,7 +380,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 1161c7
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -5874,7 +5874,7 @@
ld a, [wJumptableIndex]
ld hl, Jumptable_11ad78
call Function11b239
- jp [hl]
+ jp hl
; 11ad78
Jumptable_11ad78: ; 11ad78
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -206,7 +206,7 @@
; 170c8b
Function170c8b: ; 170c8b
- ld hl, LastPlayerCounterMove
+ ld hl, LastEnemyCounterMove
ld b, $5
.asm_170c90
ld a, [hl]
@@ -373,7 +373,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
Jumptable_171a45: ; 171a45 (5c:5a45)
dw Function171a95
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -1146,7 +1146,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
asm_17d721
call Function17e5af
@@ -3746,7 +3746,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.finished
scf
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -25,7 +25,7 @@
ld l, a
ld de, .ReturnFromJumpTable
push de
- jp [hl]
+ jp hl
; 8d79
.ReturnFromJumpTable: ; 8d79
@@ -491,7 +491,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 912d
Jumptable_912d: ; 912d
--- a/predef/crystal.asm
+++ b/predef/crystal.asm
@@ -17,7 +17,7 @@
ld l, a
ld de, .done
push de
- jp [hl]
+ jp hl
.done
ret
; 49330 (12:5330)
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -20,7 +20,7 @@
ld l, a
ld de, .Finish
push de
- jp [hl]
+ jp hl
; 866f
.Jumptable: ; 866f
--- a/roms.md5
+++ /dev/null
@@ -1,2 +1,0 @@
-9f2922b235a5eeb78d65594e82ef5dde pokecrystal.gbc
-301899b8087289a6436b0a241fbbb474 pokecrystal11.gbc
--- /dev/null
+++ b/roms.sha1
@@ -1,0 +1,2 @@
+f4cd194bdee0d04ca4eac29e09b8e4e9d818c133 *pokecrystal.gbc
+f2f52230b536214ef7c9924f483392993e226cfb *pokecrystal11.gbc
--- a/rst.asm
+++ b/rst.asm
@@ -28,7 +28,7 @@
ld h, [hl]
ld l, a
pop de
- jp [hl]
+ jp hl
; SECTION "rst30",ROM0[$30]
; rst30 is midst rst28
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -32,7 +32,7 @@
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; fc01b
Tileset00Anim: ; 0xfc01b
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,5 +1,7 @@
.PHONY: all clean
+CFLAGS := -std=c99
+
tools := \
lzcomp \
png_dimensions \
@@ -6,8 +8,9 @@
scan_includes \
palette \
pokemon_animation \
- pokemon_animation_graphics
-
+ pokemon_animation_graphics \
+ gfx \
+ md5
all: $(tools)
@:
@@ -15,4 +18,4 @@
rm -f $(tools)
%: %.c
- $(CC) -o $@ $<
+ $(CC) $(CFLAGS) -o $@ $<
--- /dev/null
+++ b/tools/common.h
@@ -1,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
--- /dev/null
+++ b/tools/gfx.c
@@ -1,0 +1,271 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <getopt.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "common.h"
+
+static void usage(void) {+ fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [-w width] [-d depth] [-h] [-o outfile] infile\n");
+}
+
+static void error(char *message) {+ fputs(message, stderr);
+ fputs("\n", stderr);+}
+
+struct Options {+ int trim_whitespace;
+ int remove_whitespace;
+ int help;
+ char *outfile;
+ int depth;
+ int interleave;
+ int width;
+ int remove_duplicates;
+ int keep_whitespace;
+ int remove_xflip;
+ int remove_yflip;
+};
+
+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},+ {"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},+ {"remove-yflip", no_argument, &Options.remove_yflip, 1},+ {"width", required_argument, 0, 'w'},+ {"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 'w':
+ Options.width = strtoul(optarg, NULL, 0);
+ break;
+ case 0:
+ case -1:
+ break;
+ default:
+ usage();
+ exit(1);
+ break;
+ }
+ }
+}
+
+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++) {+ if (tile[i] != WHITESPACE) {+ return false;
+ }
+ }
+ return true;
+}
+
+void trim_whitespace(struct Graphic *graphic) {+ int tile_size = Options.depth * 8;
+ 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;
+ }
+ }
+}
+
+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);
+ }
+ }
+ 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 ^ 1);
+ if (Options.interleave && i < half_size) {+ byte = half_size - 1 - (i ^ 1);
+ }
+ }
+ if (xflip) {+ 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;
+}
+
+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 (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;
+ }
+ 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;
+ 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);
+ }
+ graphic->size = num_tiles * tile_size;
+ memcpy(graphic->data, interleaved, graphic->size);
+ free(interleaved);
+}
+
+
+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];
+ struct Graphic graphic;
+ graphic.data = read_u8(infile, &graphic.size);
+ 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.remove_duplicates) {+ remove_duplicates(&graphic);
+ }
+ if (Options.remove_xflip) {+ 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);
+ }
+ if (Options.outfile) {+ write_u8(Options.outfile, graphic.data, graphic.size);
+ }
+ free(graphic.data);
+ return 0;
+}
--- /dev/null
+++ b/tools/md5.c
@@ -1,0 +1,128 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#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");+}
--- a/tools/palette.c
+++ b/tools/palette.c
@@ -3,6 +3,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <stdbool.h>
+#include <getopt.h>
void usage(void) { printf("Usage: palette palfile\n");--- a/tools/pokemon_animation.c
+++ b/tools/pokemon_animation.c
@@ -4,6 +4,7 @@
#include <string.h>
#include <stdint.h>
#include <stdbool.h>
+#include <getopt.h>
struct Frame {uint8_t* data;
--- a/trainers/read_party.asm
+++ b/trainers/read_party.asm
@@ -68,7 +68,7 @@
ld l, a
ld bc, .done
push bc
- jp [hl]
+ jp hl
.done
jp ComputeTrainerReward
--- a/wram.asm
+++ b/wram.asm
@@ -635,9 +635,9 @@
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
--
⑨