diff options
| author | klektron <klektron@users.noreply.github.com> | 2021-01-03 17:31:10 +0100 |
|---|---|---|
| committer | klektron <klektron@users.noreply.github.com> | 2021-01-03 17:31:10 +0100 |
| commit | 779c7ddaa2613e41ce86e10893ee1b94ecc5b899 (patch) | |
| tree | 286b04873ddce3f576d02a4ad58c843686fb80df /constants | |
| parent | a20ca92534f9cc6922f40e5f736a22862754db4b (diff) | |
| parent | 21908ba30a8bae5c5e1c86b1164402ec95da0220 (diff) | |
Merge last changes from pret
Diffstat (limited to 'constants')
| -rw-r--r--[-rwxr-xr-x] | constants/event_constants.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | constants/hide_show_constants.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | constants/item_constants.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | constants/list_constants.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | constants/map_data_constants.asm | 16 | ||||
| -rw-r--r--[-rwxr-xr-x] | constants/oam_constants.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | constants/palette_constants.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | constants/pokemon_data_constants.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | constants/sprite_constants.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | constants/trainer_constants.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | constants/type_constants.asm | 0 |
11 files changed, 8 insertions, 8 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 4f169880..4f169880 100755..100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 82e80bae..82e80bae 100755..100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 67416600..67416600 100755..100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm diff --git a/constants/list_constants.asm b/constants/list_constants.asm index 840856df..840856df 100755..100644 --- a/constants/list_constants.asm +++ b/constants/list_constants.asm diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 5efd9928..605e7013 100755..100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -4,13 +4,13 @@ MAP_BORDER EQU 3 ; connection directions const_def - shift_const EAST ; 1 - shift_const WEST ; 2 - shift_const SOUTH ; 4 - shift_const NORTH ; 8 + shift_const EAST ; 1 + shift_const WEST ; 2 + shift_const SOUTH ; 4 + shift_const NORTH ; 8 -; tileset environments +; flower and water tile animations const_def - const INDOOR ; 0 - const CAVE ; 1 - const OUTDOOR ; 2 + const TILEANIM_NONE ; 0 + const TILEANIM_WATER ; 1 + const TILEANIM_WATER_FLOWER ; 2 diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm index be63dc24..be63dc24 100755..100644 --- a/constants/oam_constants.asm +++ b/constants/oam_constants.asm diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index 177f8b81..177f8b81 100755..100644 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index a0e5b257..a0e5b257 100755..100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index a4354996..a4354996 100755..100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 6fdc5d4e..6fdc5d4e 100755..100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 6ae3408d..6ae3408d 100755..100644 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm |