diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-16 17:54:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 17:54:44 -0500 |
| commit | 0ea1e7620cc5fea1e651974442052ba9c52cdd13 (patch) | |
| tree | 63a6a57d8bc1e4dc2e40322385da1742f5766203 /src/debug | |
| parent | c7bbd485c3103c6a51d15f6e0081922d3c14d42d (diff) | |
| parent | a1138223e9a88d68666cf361a1adfa7cb3776929 (diff) | |
Merge pull request #820 from Deokishisu/master
Mirror pokeemerald PR#1329 & PR#1335 to pokeruby
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/taya_debug_window.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index b76e5f794..ca66ca01a 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -182,15 +182,15 @@ const struct { {gUnknown_Debug_083C50A7, MON_DATA_ARTIST_RIBBON} }, { {gUnknown_Debug_083C50AF, MON_DATA_EFFORT_RIBBON}, - {gUnknown_Debug_083C50B8, MON_DATA_GIFT_RIBBON_1}, - {gUnknown_Debug_083C50BF, MON_DATA_GIFT_RIBBON_2} + {gUnknown_Debug_083C50B8, MON_DATA_MARINE_RIBBON}, + {gUnknown_Debug_083C50BF, MON_DATA_LAND_RIBBON} }, { - {gUnknown_Debug_083C50C4, MON_DATA_GIFT_RIBBON_3}, - {gUnknown_Debug_083C50C8, MON_DATA_GIFT_RIBBON_4}, - {gUnknown_Debug_083C50D0, MON_DATA_GIFT_RIBBON_5} + {gUnknown_Debug_083C50C4, MON_DATA_SKY_RIBBON}, + {gUnknown_Debug_083C50C8, MON_DATA_COUNTRY_RIBBON}, + {gUnknown_Debug_083C50D0, MON_DATA_NATIONAL_RIBBON} }, { - {gUnknown_Debug_083C50D9, MON_DATA_GIFT_RIBBON_6}, - {gUnknown_Debug_083C50DF, MON_DATA_GIFT_RIBBON_7}, + {gUnknown_Debug_083C50D9, MON_DATA_EARTH_RIBBON}, + {gUnknown_Debug_083C50DF, MON_DATA_WORLD_RIBBON}, {gUnknown_Debug_083C50E5, 0 /* sentinel */} } }; @@ -619,25 +619,25 @@ bool8 TayaDebugMenu_PokenavD(void) SetBoxMonData(boxPokemon, MON_DATA_EFFORT_RIBBON, &otId); otId = Random() & 1; - SetBoxMonData(boxPokemon, MON_DATA_GIFT_RIBBON_1, &otId); + SetBoxMonData(boxPokemon, MON_DATA_MARINE_RIBBON, &otId); otId = Random() & 1; - SetBoxMonData(boxPokemon, MON_DATA_GIFT_RIBBON_2, &otId); + SetBoxMonData(boxPokemon, MON_DATA_LAND_RIBBON, &otId); otId = Random() & 1; - SetBoxMonData(boxPokemon, MON_DATA_GIFT_RIBBON_3, &otId); + SetBoxMonData(boxPokemon, MON_DATA_SKY_RIBBON, &otId); otId = Random() & 1; - SetBoxMonData(boxPokemon, MON_DATA_GIFT_RIBBON_4, &otId); + SetBoxMonData(boxPokemon, MON_DATA_COUNTRY_RIBBON, &otId); otId = Random() & 1; - SetBoxMonData(boxPokemon, MON_DATA_GIFT_RIBBON_5, &otId); + SetBoxMonData(boxPokemon, MON_DATA_NATIONAL_RIBBON, &otId); otId = Random() & 1; - SetBoxMonData(boxPokemon, MON_DATA_GIFT_RIBBON_6, &otId); + SetBoxMonData(boxPokemon, MON_DATA_EARTH_RIBBON, &otId); otId = Random() & 1; - SetBoxMonData(boxPokemon, MON_DATA_GIFT_RIBBON_7, &otId); + SetBoxMonData(boxPokemon, MON_DATA_WORLD_RIBBON, &otId); } } TayaDebugMenu_TownFlags(); |