diff options
| author | dannye <33dannye@gmail.com> | 2020-11-14 21:46:05 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-11-14 21:54:23 -0600 |
| commit | 48dc6a8cf4da512273e79e49346b35dcc225f773 (patch) | |
| tree | 52ca406cccaf728156d4d0f43d77b93ba0d75da4 /data/pokemon | |
| parent | Add constants for player and rival starters (diff) | |
| parent | Fix file modes (diff) | |
| download | pokeyellow-48dc6a8cf4da512273e79e49346b35dcc225f773.tar.gz pokeyellow-48dc6a8cf4da512273e79e49346b35dcc225f773.tar.xz pokeyellow-48dc6a8cf4da512273e79e49346b35dcc225f773.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/pokemon')
| -rw-r--r--[-rwxr-xr-x] | data/pokemon/base_stats.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pokemon/cries.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pokemon/dex_entries.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pokemon/dex_order.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pokemon/evos_moves.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pokemon/menu_icons.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pokemon/names.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pokemon/palettes.asm | 0 |
8 files changed, 0 insertions, 0 deletions
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index b4360286..b4360286 100755..100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index e4bf07d9..e4bf07d9 100755..100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 5b9acf27..5b9acf27 100755..100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index 0e293946..0e293946 100755..100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 19016d14..19016d14 100755..100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 0fbc9260..0fbc9260 100755..100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 83a45b77..83a45b77 100755..100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 8c4d0bc0..8c4d0bc0 100755..100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm |