diff options
| author | Jonas Höglund <firefly@firefly.nu> | 2014-07-26 12:02:57 +0200 |
|---|---|---|
| committer | Jonas Höglund <firefly@firefly.nu> | 2014-07-26 12:04:02 +0200 |
| commit | 7819cfecca89160914984544ec9c20e7247c94e2 (patch) | |
| tree | 3933e93a0feeb58c7ce0549cf3f8910f0d623087 /data | |
| parent | 125bc94a0542a6948aef485aa10fd73ff3f95fe6 (diff) | |
| parent | ba5c5e4e62c68bef335685d15d967ff3044eb82f (diff) | |
Merge http://github.com/dannye/tcg
Conflicts:
wram.asm
Diffstat (limited to 'data')
| -rwxr-xr-x | data/cards.asm | 2 | ||||
| -rwxr-xr-x | data/decks.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/cards.asm b/data/cards.asm index 9653ad7..23450a8 100755 --- a/data/cards.asm +++ b/data/cards.asm @@ -10653,7 +10653,7 @@ ImakuniCard: ; 33e4b (c:7e4b) dw $b72 ; name db PROMOSTAR ; rarity db PROMOTIONAL | PRO ; set - db IMAKUNI + db IMAKUNI_CARD dw $4e7c ; function dw $b73 ; description dw 0 diff --git a/data/decks.asm b/data/decks.asm index 696d75c..cb29df4 100755 --- a/data/decks.asm +++ b/data/decks.asm @@ -64,7 +64,7 @@ UnnamedDeck: ; 30070 (c:4070) db 2, PIDGEOT2 db 2, PIDGEOTTO db 4, PIDGEY - db 2, IMAKUNI + db 2, IMAKUNI_CARD db 2, GAMBLER db 2, PROFESSOR_OAK db 2, ENERGY_REMOVAL @@ -1823,7 +1823,7 @@ ImakuniDeck: ; 30c3d (c:4c3d) db 4, DROWZEE db 3, HYPNO db 4, FARFETCHD - db 4, IMAKUNI + db 4, IMAKUNI_CARD db 2, MAINTENANCE db 2, POKEMON_FLUTE db 1, GAMBLER |