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 /constants/card_constants.asm | |
| parent | 125bc94a0542a6948aef485aa10fd73ff3f95fe6 (diff) | |
| parent | ba5c5e4e62c68bef335685d15d967ff3044eb82f (diff) | |
Merge http://github.com/dannye/tcg
Conflicts:
wram.asm
Diffstat (limited to 'constants/card_constants.asm')
| -rwxr-xr-x | constants/card_constants.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/constants/card_constants.asm b/constants/card_constants.asm index f56b45c..bef5f3f 100755 --- a/constants/card_constants.asm +++ b/constants/card_constants.asm @@ -197,7 +197,7 @@ IMPOSTER_PROFESSOR_OAK EQU $C4 BILL EQU $C5 MR_FUJI EQU $C6 LASS EQU $C7 -IMAKUNI EQU $C8 +IMAKUNI_CARD EQU $C8 POKEMON_TRADER EQU $C9 POKEMON_BREEDER EQU $CA CLEFAIRY_DOLL EQU $CB |