diff options
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/connection_constants.asm | 2 | ||||
| -rwxr-xr-x | constants/evolution_constants.asm | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | constants/item_constants.asm | 2 | ||||
| -rwxr-xr-x | constants/list_constants.asm | 2 | ||||
| -rwxr-xr-x | constants/oam_constants.asm | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | constants/palette_constants.asm | 2 | ||||
| -rwxr-xr-x | constants/sprite_constants.asm | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | constants/trainer_constants.asm | 2 | ||||
| -rwxr-xr-x | constants/type_constants.asm | 6 |
9 files changed, 13 insertions, 9 deletions
diff --git a/constants/connection_constants.asm b/constants/connection_constants.asm index 9b24ef6b..916d6c4f 100755 --- a/constants/connection_constants.asm +++ b/constants/connection_constants.asm @@ -2,4 +2,4 @@ EAST EQU 1 WEST EQU 2 SOUTH EQU 4 -NORTH EQU 8
\ No newline at end of file +NORTH EQU 8 diff --git a/constants/evolution_constants.asm b/constants/evolution_constants.asm index 879b2c2a..2e3f3613 100755 --- a/constants/evolution_constants.asm +++ b/constants/evolution_constants.asm @@ -1,4 +1,4 @@ ; Evolution types EV_LEVEL EQU 1 EV_ITEM EQU 2 -EV_TRADE EQU 3
\ No newline at end of file +EV_TRADE EQU 3 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index be320371..be251e62 100644..100755 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -138,4 +138,4 @@ TM_46 EQU $F6 TM_47 EQU $F7 TM_48 EQU $F8 TM_49 EQU $F9 -TM_50 EQU $FA
\ No newline at end of file +TM_50 EQU $FA diff --git a/constants/list_constants.asm b/constants/list_constants.asm index a8f016ae..aab542ec 100755 --- a/constants/list_constants.asm +++ b/constants/list_constants.asm @@ -11,4 +11,4 @@ MOVE_NAME EQU 2 ITEM_NAME EQU 4 PLAYEROT_NAME EQU 5 ENEMYOT_NAME EQU 6 -TRAINER_NAME EQU 7
\ No newline at end of file +TRAINER_NAME EQU 7 diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm index 02ffee01..ddf95648 100755 --- a/constants/oam_constants.asm +++ b/constants/oam_constants.asm @@ -6,4 +6,4 @@ OAMFLAG_VFLIPPED EQU %00100000 ; OAM flag flips the sprite vertically. ; OAM attribute flags OAM_HFLIP EQU %00100000 ; horizontal flip -OAM_VFLIP EQU %01000000 ; vertical flip
\ No newline at end of file +OAM_VFLIP EQU %01000000 ; vertical flip diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index 669c5296..981f621d 100644..100755 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -35,4 +35,4 @@ PAL_YELLOWBAR EQU $20 PAL_REDBAR EQU $21 PAL_BADGE EQU $22 PAL_CAVE EQU $23 -PAL_GAMEFREAK EQU $24
\ No newline at end of file +PAL_GAMEFREAK EQU $24 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 92abfe3e..dc249d59 100755 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -94,4 +94,4 @@ BOULDER_MOVEMENT_BYTE_2 EQU $10 SPRITE_FACING_DOWN EQU $00 SPRITE_FACING_UP EQU $04 SPRITE_FACING_LEFT EQU $08 -SPRITE_FACING_RIGHT EQU $0C
\ No newline at end of file +SPRITE_FACING_RIGHT EQU $0C diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 37a51376..f98352f9 100644..100755 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -45,4 +45,4 @@ SONY3 EQU $2B LORELEI EQU $2C CHANNELER EQU $2D AGATHA EQU $2E -LANCE EQU $2F
\ No newline at end of file +LANCE EQU $2F 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 |