diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 12:30:16 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 12:30:16 -0400 |
| commit | ad3fca33d3532f5dcffd22e5b88d3169675f43d0 (patch) | |
| tree | db2e88ba1efa00c9957c688109a589294ba280b3 /constants/type_constants.asm | |
| parent | More bank1c documentation. (diff) | |
| download | pokeyellow-ad3fca33d3532f5dcffd22e5b88d3169675f43d0.tar.gz pokeyellow-ad3fca33d3532f5dcffd22e5b88d3169675f43d0.tar.xz pokeyellow-ad3fca33d3532f5dcffd22e5b88d3169675f43d0.zip | |
Attempt to make yellow buildable.
Building Errors: Segmentation Error.
Diffstat (limited to 'constants/type_constants.asm')
| -rwxr-xr-x | constants/type_constants.asm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 095a3d28..66085f8d 100755 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -13,8 +13,4 @@ GRASS EQU $16 ELECTRIC EQU $17 PSYCHIC EQU $18 ICE EQU $19 -<<<<<<< HEAD -DRAGON EQU $1A -======= -DRAGON EQU $1A ->>>>>>> d48ea223eaad84af95e4f29043c279b56aa4ae88 +DRAGON EQU $1A
\ No newline at end of file |