diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-28 20:03:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-28 20:03:24 -0400 |
| commit | 975e28c01e70c63587c8633ffc3c50b7d1759dec (patch) | |
| tree | 361d94f24acc207803afb8bff6ed7887dbbf391e /data/graphics/trainers | |
| parent | d160ca467920d97245c012b8dd0cb8be6d06620a (diff) | |
| parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'data/graphics/trainers')
| -rw-r--r-- | data/graphics/trainers/back_pic_coords.inc | 10 | ||||
| -rw-r--r-- | data/graphics/trainers/back_pic_palette_table.inc (renamed from data/graphics/trainers/trainer_back_pic_palette_table.inc) | 0 | ||||
| -rw-r--r-- | data/graphics/trainers/back_pic_table.inc (renamed from data/graphics/trainers/trainer_back_pic_table.inc) | 0 | ||||
| -rw-r--r-- | data/graphics/trainers/front_pic_coords.inc | 95 | ||||
| -rw-r--r-- | data/graphics/trainers/front_pic_palette_table.inc (renamed from data/graphics/trainers/trainer_front_pic_palette_table.inc) | 0 | ||||
| -rw-r--r-- | data/graphics/trainers/front_pic_table.inc (renamed from data/graphics/trainers/trainer_front_pic_table.inc) | 0 | ||||
| -rw-r--r-- | data/graphics/trainers/graphics.inc (renamed from data/graphics/trainers/trainer_graphics.inc) | 0 |
7 files changed, 105 insertions, 0 deletions
diff --git a/data/graphics/trainers/back_pic_coords.inc b/data/graphics/trainers/back_pic_coords.inc new file mode 100644 index 000000000..57a45c71e --- /dev/null +++ b/data/graphics/trainers/back_pic_coords.inc @@ -0,0 +1,10 @@ + .align 2 +gTrainerBackPicCoords:: @ 8305D2C + .byte 0x08, 0x04, 0x00, 0x00 + .byte 0x08, 0x04, 0x00, 0x00 + .byte 0x08, 0x05, 0x00, 0x00 + .byte 0x08, 0x05, 0x00, 0x00 + .byte 0x08, 0x04, 0x00, 0x00 + .byte 0x08, 0x04, 0x00, 0x00 + .byte 0x08, 0x04, 0x00, 0x00 + .byte 0x08, 0x04, 0x00, 0x00 diff --git a/data/graphics/trainers/trainer_back_pic_palette_table.inc b/data/graphics/trainers/back_pic_palette_table.inc index 46e56f2ac..46e56f2ac 100644 --- a/data/graphics/trainers/trainer_back_pic_palette_table.inc +++ b/data/graphics/trainers/back_pic_palette_table.inc diff --git a/data/graphics/trainers/trainer_back_pic_table.inc b/data/graphics/trainers/back_pic_table.inc index e67c2a073..e67c2a073 100644 --- a/data/graphics/trainers/trainer_back_pic_table.inc +++ b/data/graphics/trainers/back_pic_table.inc diff --git a/data/graphics/trainers/front_pic_coords.inc b/data/graphics/trainers/front_pic_coords.inc new file mode 100644 index 000000000..8d20f0a9e --- /dev/null +++ b/data/graphics/trainers/front_pic_coords.inc @@ -0,0 +1,95 @@ + .align 2 +gTrainerFrontPicCoords:: @ 83054E0 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x02, 0x00, 0x00 + .byte 0x08, 0x02, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x02, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x02, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x02, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x02, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 + .byte 0x08, 0x01, 0x00, 0x00 diff --git a/data/graphics/trainers/trainer_front_pic_palette_table.inc b/data/graphics/trainers/front_pic_palette_table.inc index 44cf98dab..44cf98dab 100644 --- a/data/graphics/trainers/trainer_front_pic_palette_table.inc +++ b/data/graphics/trainers/front_pic_palette_table.inc diff --git a/data/graphics/trainers/trainer_front_pic_table.inc b/data/graphics/trainers/front_pic_table.inc index 91294d170..91294d170 100644 --- a/data/graphics/trainers/trainer_front_pic_table.inc +++ b/data/graphics/trainers/front_pic_table.inc diff --git a/data/graphics/trainers/trainer_graphics.inc b/data/graphics/trainers/graphics.inc index 897cb9ffb..897cb9ffb 100644 --- a/data/graphics/trainers/trainer_graphics.inc +++ b/data/graphics/trainers/graphics.inc |