diff options
| author | garak <garakmon@gmail.com> | 2019-07-29 12:07:18 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-07-29 12:07:18 -0400 |
| commit | e1854c665dab1234ef272fedc1b61a926f7bcdc0 (patch) | |
| tree | 767d37b55f4b439c299ee5a05de52a9b5b24993f /src/pokenav_before.c | |
| parent | e74b92a581e8293ca56e5a2809be51810fc74492 (diff) | |
name trainers eye messages, use constants in some pokenav rodata
Diffstat (limited to 'src/pokenav_before.c')
| -rw-r--r-- | src/pokenav_before.c | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/src/pokenav_before.c b/src/pokenav_before.c index d339fbffc..c9390a070 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -26,6 +26,7 @@ #include "pokemon_summary_screen.h" #include "use_pokeblock.h" #include "constants/game_stat.h" +#include "pokemon.h" struct UnknownPokenav0 { @@ -232,22 +233,22 @@ const u16 Palette_3E42D8[] = INCBIN_U16("graphics/pokenav/83E42D8.gbapal"); const u16 gUnknown_083E42F8[] = { - 0x408, - 0x408, - 0x507, - 0x507, - 0x606, - 0x606, - 0x805, - 0x805, - 0xA04, - 0xA04, - 0xC03, - 0xC03, - 0xE02, - 0xE02, - 0x1000, - 0x1000, + BLDALPHA_BLEND(8, 4), + BLDALPHA_BLEND(8, 4), + BLDALPHA_BLEND(7, 5), + BLDALPHA_BLEND(7, 5), + BLDALPHA_BLEND(6, 6), + BLDALPHA_BLEND(6, 6), + BLDALPHA_BLEND(5, 8), + BLDALPHA_BLEND(5, 8), + BLDALPHA_BLEND(4, 10), + BLDALPHA_BLEND(4, 10), + BLDALPHA_BLEND(3, 12), + BLDALPHA_BLEND(3, 12), + BLDALPHA_BLEND(2, 14), + BLDALPHA_BLEND(2, 14), + BLDALPHA_BLEND(0, 16), + BLDALPHA_BLEND(0, 16), }; const struct OamData gOamData_83E4318 = @@ -1095,23 +1096,23 @@ const struct ScanlineEffectParams gUnknown_083E4990 = const u16 gUnknown_083E499C[] = { - 0x43, - 0x32, - 0x33, - 0x34, - 0x35, - 0x36, - 0x44, - 0x45, - 0x46, - 0x47, - 0x48, - 0x49, - 0x4A, - 0x4B, - 0x4C, - 0x4D, - 0x4E, + MON_DATA_CHAMPION_RIBBON, + MON_DATA_COOL_RIBBON, + MON_DATA_BEAUTY_RIBBON, + MON_DATA_CUTE_RIBBON, + MON_DATA_SMART_RIBBON, + MON_DATA_TOUGH_RIBBON, + MON_DATA_WINNING_RIBBON, + MON_DATA_VICTORY_RIBBON, + MON_DATA_ARTIST_RIBBON, + MON_DATA_EFFORT_RIBBON, + MON_DATA_GIFT_RIBBON_1, + MON_DATA_GIFT_RIBBON_2, + MON_DATA_GIFT_RIBBON_3, + MON_DATA_GIFT_RIBBON_4, + MON_DATA_GIFT_RIBBON_5, + MON_DATA_GIFT_RIBBON_6, + MON_DATA_GIFT_RIBBON_7, }; void sub_80EBA5C() |