diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
| commit | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (patch) | |
| tree | 7b51d7b9cb9a370fe1dd9db8eeadc23089ba1328 /src/data/pokemon_graphics | |
| parent | fa9d1759bd7fa17ced37225bd31d46466da857c6 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
# asm/shop.s
Diffstat (limited to 'src/data/pokemon_graphics')
| -rw-r--r-- | src/data/pokemon_graphics/back_pic_coordinates.h | 2 | ||||
| -rw-r--r-- | src/data/pokemon_graphics/unknown_anims.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index f54b409e4..877bf3475 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1,4 +1,4 @@ -const struct MonCoords gUnknown_083021D8[] = +const struct MonCoords gMonBackPicCoords[] = { {0x88, 0x00}, // SPECIES_NONE {0x64, 0x10}, // SPECIES_BULBASAUR diff --git a/src/data/pokemon_graphics/unknown_anims.h b/src/data/pokemon_graphics/unknown_anims.h index a4ae43eb6..313e7ae35 100644 --- a/src/data/pokemon_graphics/unknown_anims.h +++ b/src/data/pokemon_graphics/unknown_anims.h @@ -1902,7 +1902,7 @@ const union AnimCmd *const gUnknown_0830064C[] = {gAnimCmd_General_Frame0}; const union AnimCmd *const gUnknown_08300650[] = {gAnimCmd_General_Frame0}; const union AnimCmd *const gUnknown_08300654[] = {gAnimCmd_General_Frame0}; -const union AnimCmd *const *const gUnknownAnimationsSpriteAnimsPtrTable[] = +const union AnimCmd *const *const gUnusedTrainerFrontAnimsPtrTable[] = { gUnknown_082FFDCC, gUnknown_082FFDD0, |