diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-05 20:15:21 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-05 20:15:21 -0400 |
| commit | 5ecda4d2741cc8f43a0b172aefc8299e44687832 (patch) | |
| tree | 7fbac7a8f1be0bcd6a877ea47ec73fd5dfbbc211 /constants/type_constants.asm | |
| parent | 139e117d0717c69ae4c47a8d1a040267ee28d91d (diff) | |
| parent | d48ea223eaad84af95e4f29043c279b56aa4ae88 (diff) | |
Merge git://github.com/dannye/pokeyellow into dannye-master
Conflicts:
constants/connection_constants.asm
constants/evolution_constants.asm
constants/list_constants.asm
constants/oam_constants.asm
constants/sprite_constants.asm
constants/type_constants.asm
engine/bank3d/random.asm
engine/bank3f/main.asm
home.asm
home/overworld.asm
home/serial.asm
macros.asm
main.asm
wram.asm
Diffstat (limited to 'constants/type_constants.asm')
| -rwxr-xr-x | constants/type_constants.asm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 66085f8d..095a3d28 100755 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -13,4 +13,8 @@ GRASS EQU $16 ELECTRIC EQU $17 PSYCHIC EQU $18 ICE EQU $19 -DRAGON EQU $1A
\ No newline at end of file +<<<<<<< HEAD +DRAGON EQU $1A +======= +DRAGON EQU $1A +>>>>>>> d48ea223eaad84af95e4f29043c279b56aa4ae88 |