From 669837eb5cfc69838686059779c8e4446fee4781 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Aug 2020 10:43:20 -0400 Subject: Decompile unk_0207FC5C.s --- arm9/src/unk_0207FC5C.c | 532 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 532 insertions(+) create mode 100644 arm9/src/unk_0207FC5C.c (limited to 'arm9/src') diff --git a/arm9/src/unk_0207FC5C.c b/arm9/src/unk_0207FC5C.c new file mode 100644 index 00000000..f72008b9 --- /dev/null +++ b/arm9/src/unk_0207FC5C.c @@ -0,0 +1,532 @@ +#include "global.h" +#include "unk_0207FC5C.h" + +#pragma thumb on + +struct UnkStruct_020FB788 +{ + u32 unk_0; + u16 unk_4; + u16 unk_6; + u16 unk_8; + u16 unk_A; +}; + +const struct UnkStruct_020FB788 UNK_020FB788[] = { + { + 0x00000062, + 0x0048, + 0x0000, + 0x0000, + 0x0050 + }, { + 0x0000004E, + 0x0049, + 0x0000, + 0x0001, + 0x0051 + }, { + 0x0000004F, + 0x004A, + 0x0000, + 0x0002, + 0x0052 + }, { + 0x00000050, + 0x004B, + 0x0000, + 0x0003, + 0x0053 + }, { + 0x00000051, + 0x004C, + 0x0000, + 0x0004, + 0x0054 + }, { + 0x00000052, + 0x0049, + 0x0001, + 0x0005, + 0x0055 + }, { + 0x00000053, + 0x004A, + 0x0001, + 0x0006, + 0x0056 + }, { + 0x00000054, + 0x004B, + 0x0001, + 0x0007, + 0x0057 + }, { + 0x00000055, + 0x004C, + 0x0001, + 0x0008, + 0x0058 + }, { + 0x00000056, + 0x0049, + 0x0002, + 0x0009, + 0x0059 + }, { + 0x00000057, + 0x004A, + 0x0002, + 0x000A, + 0x005A + }, { + 0x00000058, + 0x004B, + 0x0002, + 0x000B, + 0x005B + }, { + 0x00000059, + 0x004C, + 0x0002, + 0x000C, + 0x005C + }, { + 0x0000005A, + 0x0049, + 0x0003, + 0x000D, + 0x005D + }, { + 0x0000005B, + 0x004A, + 0x0003, + 0x000E, + 0x005E + }, { + 0x0000005C, + 0x004B, + 0x0003, + 0x000F, + 0x005F + }, { + 0x0000005D, + 0x004C, + 0x0003, + 0x0010, + 0x0060 + }, { + 0x0000005E, + 0x0049, + 0x0004, + 0x0011, + 0x0061 + }, { + 0x0000005F, + 0x004A, + 0x0004, + 0x0012, + 0x0062 + }, { + 0x00000060, + 0x004B, + 0x0004, + 0x0013, + 0x0063 + }, { + 0x00000061, + 0x004C, + 0x0004, + 0x0014, + 0x0064 + }, { + 0x00000063, + 0x004E, + 0x0000, + 0x0015, + 0x0065 + }, { + 0x00000064, + 0x004D, + 0x0000, + 0x0016, + 0x0066 + }, { + 0x00000065, + 0x004F, + 0x0001, + 0x0017, + 0x0067 + }, { + 0x00000066, + 0x0050, + 0x0002, + 0x0018, + 0x0068 + }, { + 0x00000067, + 0x0051, + 0x0001, + 0x0019, + 0x8000 + }, { + 0x00000068, + 0x0051, + 0x0003, + 0x001A, + 0x8001 + }, { + 0x00000069, + 0x0051, + 0x0004, + 0x001B, + 0x8002 + }, { + 0x0000006A, + 0x0052, + 0x0003, + 0x001C, + 0x00B2 + }, { + 0x0000006B, + 0x0052, + 0x0004, + 0x001D, + 0x00BE + }, { + 0x0000006C, + 0x0053, + 0x0000, + 0x001E, + 0x00BF + }, { + 0x0000006D, + 0x0053, + 0x0001, + 0x001F, + 0x00B2 + }, { + 0x00000019, + 0x0058, + 0x0000, + 0x0020, + 0x0069 + }, { + 0x0000007A, + 0x0059, + 0x0000, + 0x0021, + 0x006A + }, { + 0x0000007B, + 0x005A, + 0x0000, + 0x0022, + 0x006B + }, { + 0x0000007C, + 0x005B, + 0x0000, + 0x0023, + 0x006C + }, { + 0x0000007D, + 0x005C, + 0x0000, + 0x0024, + 0x006D + }, { + 0x0000007E, + 0x0059, + 0x0001, + 0x0025, + 0x006E + }, { + 0x0000007F, + 0x005A, + 0x0001, + 0x0026, + 0x006F + }, { + 0x00000080, + 0x005B, + 0x0001, + 0x0027, + 0x0070 + }, { + 0x00000081, + 0x005C, + 0x0001, + 0x0028, + 0x0071 + }, { + 0x00000082, + 0x0059, + 0x0002, + 0x0029, + 0x0072 + }, { + 0x00000083, + 0x005A, + 0x0002, + 0x002A, + 0x0073 + }, { + 0x00000084, + 0x005B, + 0x0002, + 0x002B, + 0x0074 + }, { + 0x00000085, + 0x005C, + 0x0002, + 0x002C, + 0x0075 + }, { + 0x00000086, + 0x0059, + 0x0003, + 0x002D, + 0x0076 + }, { + 0x00000087, + 0x005A, + 0x0003, + 0x002E, + 0x0077 + }, { + 0x00000088, + 0x005B, + 0x0003, + 0x002F, + 0x0078 + }, { + 0x00000089, + 0x005C, + 0x0003, + 0x0030, + 0x0079 + }, { + 0x0000008A, + 0x0059, + 0x0004, + 0x0031, + 0x007A + }, { + 0x0000008B, + 0x005A, + 0x0004, + 0x0032, + 0x007B + }, { + 0x0000008C, + 0x005B, + 0x0004, + 0x0033, + 0x007C + }, { + 0x0000008D, + 0x005C, + 0x0004, + 0x0034, + 0x007D + }, { + 0x0000001A, + 0x005D, + 0x0000, + 0x0035, + 0x007E + }, { + 0x0000001B, + 0x005E, + 0x0000, + 0x0036, + 0x007F + }, { + 0x0000001C, + 0x005F, + 0x0000, + 0x0037, + 0x0080 + }, { + 0x0000001D, + 0x0060, + 0x0000, + 0x0038, + 0x0081 + }, { + 0x0000001E, + 0x0061, + 0x0000, + 0x0039, + 0x0082 + }, { + 0x0000001F, + 0x0062, + 0x0000, + 0x003A, + 0x0083 + }, { + 0x00000020, + 0x0063, + 0x0002, + 0x003B, + 0x0084 + }, { + 0x00000021, + 0x0064, + 0x0000, + 0x003C, + 0x0085 + }, { + 0x00000022, + 0x0065, + 0x0001, + 0x003D, + 0x0086 + }, { + 0x00000023, + 0x0066, + 0x0002, + 0x003E, + 0x0087 + }, { + 0x00000024, + 0x0067, + 0x0003, + 0x003F, + 0x0088 + }, { + 0x00000025, + 0x0068, + 0x0000, + 0x0040, + 0x0089 + }, { + 0x00000026, + 0x0069, + 0x0002, + 0x0041, + 0x008A + }, { + 0x00000027, + 0x006A, + 0x0001, + 0x0042, + 0x008B + }, { + 0x00000028, + 0x006B, + 0x0003, + 0x0043, + 0x008C + }, { + 0x00000029, + 0x006C, + 0x0000, + 0x0044, + 0x008D + }, { + 0x0000002A, + 0x006D, + 0x0000, + 0x0045, + 0x008E + }, { + 0x0000002B, + 0x006E, + 0x0001, + 0x0046, + 0x008F + }, { + 0x0000002C, + 0x006F, + 0x0003, + 0x0047, + 0x0090 + }, { + 0x0000002D, + 0x0070, + 0x0000, + 0x0048, + 0x0091 + }, { + 0x0000002E, + 0x0071, + 0x0000, + 0x0049, + 0x8007 + }, { + 0x0000002F, + 0x0072, + 0x0003, + 0x004A, + 0x8008 + }, { + 0x00000030, + 0x0073, + 0x0001, + 0x004B, + 0x8009 + }, { + 0x00000031, + 0x0074, + 0x0001, + 0x004C, + 0x800A + }, { + 0x00000032, + 0x0075, + 0x0000, + 0x004D, + 0x800B + }, { + 0x00000033, + 0x0076, + 0x0001, + 0x004E, + 0x800C + }, { + 0x00000034, + 0x0077, + 0x0000, + 0x004F, + 0x800D + } +}; + +u32 FUN_0207FC5C(u8 a0, u32 a1) +{ + switch (a1) + { + case 0: + return UNK_020FB788[a0].unk_0; + case 1: + return UNK_020FB788[a0].unk_4; + case 2: + return UNK_020FB788[a0].unk_6; + case 3: + return UNK_020FB788[a0].unk_8; + case 4: + return UNK_020FB788[a0].unk_A; + default: + return 0; + } +} + +int FUN_0207FCC0(u8 * a0, u32 a1) +{ + int ret = (int)UNK_020FB788[a1].unk_A; + if (ret & 0x8000) + ret = a0[(u8)ret] + 0x92; + return ret; +} + +u8 FUN_0207FCE0(u32 a0) +{ + int ret = (int)UNK_020FB788[a0].unk_A; + if (ret & 0x8000) + return (u8)ret; + return 0xFF; +} -- cgit v1.2.3 From f5fbbf5b64488ce597cbb7fe7a47f902aca87fd4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Aug 2020 11:22:07 -0400 Subject: Copy over MON_DATA consts to unk_0207FC5C --- arm9/src/unk_0207FC5C.c | 161 ++++++++++++++++++++++++------------------------ 1 file changed, 81 insertions(+), 80 deletions(-) (limited to 'arm9/src') diff --git a/arm9/src/unk_0207FC5C.c b/arm9/src/unk_0207FC5C.c index f72008b9..e3749139 100644 --- a/arm9/src/unk_0207FC5C.c +++ b/arm9/src/unk_0207FC5C.c @@ -1,5 +1,6 @@ #include "global.h" #include "unk_0207FC5C.h" +#include "constants/pokemon.h" #pragma thumb on @@ -14,481 +15,481 @@ struct UnkStruct_020FB788 const struct UnkStruct_020FB788 UNK_020FB788[] = { { - 0x00000062, + MON_DATA_HOENN_RIBBON_98, 0x0048, 0x0000, 0x0000, 0x0050 }, { - 0x0000004E, + MON_DATA_COOL_RIBBON, 0x0049, 0x0000, 0x0001, 0x0051 }, { - 0x0000004F, + MON_DATA_HOENN_RIBBON_79, 0x004A, 0x0000, 0x0002, 0x0052 }, { - 0x00000050, + MON_DATA_HOENN_RIBBON_80, 0x004B, 0x0000, 0x0003, 0x0053 }, { - 0x00000051, + MON_DATA_HOENN_RIBBON_81, 0x004C, 0x0000, 0x0004, 0x0054 }, { - 0x00000052, + MON_DATA_HOENN_RIBBON_82, 0x0049, 0x0001, 0x0005, 0x0055 }, { - 0x00000053, + MON_DATA_HOENN_RIBBON_83, 0x004A, 0x0001, 0x0006, 0x0056 }, { - 0x00000054, + MON_DATA_HOENN_RIBBON_84, 0x004B, 0x0001, 0x0007, 0x0057 }, { - 0x00000055, + MON_DATA_HOENN_RIBBON_85, 0x004C, 0x0001, 0x0008, 0x0058 }, { - 0x00000056, + MON_DATA_HOENN_RIBBON_86, 0x0049, 0x0002, 0x0009, 0x0059 }, { - 0x00000057, + MON_DATA_HOENN_RIBBON_87, 0x004A, 0x0002, 0x000A, 0x005A }, { - 0x00000058, + MON_DATA_HOENN_RIBBON_88, 0x004B, 0x0002, 0x000B, 0x005B }, { - 0x00000059, + MON_DATA_HOENN_RIBBON_89, 0x004C, 0x0002, 0x000C, 0x005C }, { - 0x0000005A, + MON_DATA_HOENN_RIBBON_90, 0x0049, 0x0003, 0x000D, 0x005D }, { - 0x0000005B, + MON_DATA_HOENN_RIBBON_91, 0x004A, 0x0003, 0x000E, 0x005E }, { - 0x0000005C, + MON_DATA_HOENN_RIBBON_92, 0x004B, 0x0003, 0x000F, 0x005F }, { - 0x0000005D, + MON_DATA_HOENN_RIBBON_93, 0x004C, 0x0003, 0x0010, 0x0060 }, { - 0x0000005E, + MON_DATA_HOENN_RIBBON_94, 0x0049, 0x0004, 0x0011, 0x0061 }, { - 0x0000005F, + MON_DATA_HOENN_RIBBON_95, 0x004A, 0x0004, 0x0012, 0x0062 }, { - 0x00000060, + MON_DATA_HOENN_RIBBON_96, 0x004B, 0x0004, 0x0013, 0x0063 }, { - 0x00000061, + MON_DATA_HOENN_RIBBON_97, 0x004C, 0x0004, 0x0014, 0x0064 }, { - 0x00000063, + MON_DATA_HOENN_RIBBON_99, 0x004E, 0x0000, 0x0015, 0x0065 }, { - 0x00000064, + MON_DATA_HOENN_RIBBON_100, 0x004D, 0x0000, 0x0016, 0x0066 }, { - 0x00000065, + MON_DATA_HOENN_RIBBON_101, 0x004F, 0x0001, 0x0017, 0x0067 }, { - 0x00000066, + MON_DATA_HOENN_RIBBON_102, 0x0050, 0x0002, 0x0018, 0x0068 }, { - 0x00000067, + MON_DATA_HOENN_RIBBON_103, 0x0051, 0x0001, 0x0019, 0x8000 }, { - 0x00000068, + MON_DATA_HOENN_RIBBON_104, 0x0051, 0x0003, 0x001A, 0x8001 }, { - 0x00000069, + MON_DATA_HOENN_RIBBON_105, 0x0051, 0x0004, 0x001B, 0x8002 }, { - 0x0000006A, + MON_DATA_HOENN_RIBBON_106, 0x0052, 0x0003, 0x001C, 0x00B2 }, { - 0x0000006B, + MON_DATA_HOENN_RIBBON_107, 0x0052, 0x0004, 0x001D, 0x00BE }, { - 0x0000006C, + MON_DATA_HOENN_RIBBON_108, 0x0053, 0x0000, 0x001E, 0x00BF }, { - 0x0000006D, + MON_DATA_HOENN_RIBBON_109, 0x0053, 0x0001, 0x001F, 0x00B2 }, { - 0x00000019, + MON_DATA_SINNOH_CHAMP_RIBBON, 0x0058, 0x0000, 0x0020, 0x0069 }, { - 0x0000007A, + MON_DATA_SINNOH_RIBBON_122, 0x0059, 0x0000, 0x0021, 0x006A }, { - 0x0000007B, + MON_DATA_SINNOH_RIBBON_123, 0x005A, 0x0000, 0x0022, 0x006B }, { - 0x0000007C, + MON_DATA_SINNOH_RIBBON_124, 0x005B, 0x0000, 0x0023, 0x006C }, { - 0x0000007D, + MON_DATA_SINNOH_RIBBON_125, 0x005C, 0x0000, 0x0024, 0x006D }, { - 0x0000007E, + MON_DATA_SINNOH_RIBBON_126, 0x0059, 0x0001, 0x0025, 0x006E }, { - 0x0000007F, + MON_DATA_SINNOH_RIBBON_127, 0x005A, 0x0001, 0x0026, 0x006F }, { - 0x00000080, + MON_DATA_SINNOH_RIBBON_128, 0x005B, 0x0001, 0x0027, 0x0070 }, { - 0x00000081, + MON_DATA_SINNOH_RIBBON_129, 0x005C, 0x0001, 0x0028, 0x0071 }, { - 0x00000082, + MON_DATA_SINNOH_RIBBON_130, 0x0059, 0x0002, 0x0029, 0x0072 }, { - 0x00000083, + MON_DATA_SINNOH_RIBBON_131, 0x005A, 0x0002, 0x002A, 0x0073 }, { - 0x00000084, + MON_DATA_SINNOH_RIBBON_132, 0x005B, 0x0002, 0x002B, 0x0074 }, { - 0x00000085, + MON_DATA_SINNOH_RIBBON_133, 0x005C, 0x0002, 0x002C, 0x0075 }, { - 0x00000086, + MON_DATA_SINNOH_RIBBON_134, 0x0059, 0x0003, 0x002D, 0x0076 }, { - 0x00000087, + MON_DATA_SINNOH_RIBBON_135, 0x005A, 0x0003, 0x002E, 0x0077 }, { - 0x00000088, + MON_DATA_SINNOH_RIBBON_136, 0x005B, 0x0003, 0x002F, 0x0078 }, { - 0x00000089, + MON_DATA_SINNOH_RIBBON_137, 0x005C, 0x0003, 0x0030, 0x0079 }, { - 0x0000008A, + MON_DATA_SINNOH_RIBBON_138, 0x0059, 0x0004, 0x0031, 0x007A }, { - 0x0000008B, + MON_DATA_SINNOH_RIBBON_139, 0x005A, 0x0004, 0x0032, 0x007B }, { - 0x0000008C, + MON_DATA_SINNOH_RIBBON_140, 0x005B, 0x0004, 0x0033, 0x007C }, { - 0x0000008D, + MON_DATA_SINNOH_RIBBON_141, 0x005C, 0x0004, 0x0034, 0x007D }, { - 0x0000001A, + MON_DATA_SINNOH_RIBBON_26, 0x005D, 0x0000, 0x0035, 0x007E }, { - 0x0000001B, + MON_DATA_SINNOH_RIBBON_27, 0x005E, 0x0000, 0x0036, 0x007F }, { - 0x0000001C, + MON_DATA_SINNOH_RIBBON_28, 0x005F, 0x0000, 0x0037, 0x0080 }, { - 0x0000001D, + MON_DATA_SINNOH_RIBBON_29, 0x0060, 0x0000, 0x0038, 0x0081 }, { - 0x0000001E, + MON_DATA_SINNOH_RIBBON_30, 0x0061, 0x0000, 0x0039, 0x0082 }, { - 0x0000001F, + MON_DATA_SINNOH_RIBBON_31, 0x0062, 0x0000, 0x003A, 0x0083 }, { - 0x00000020, + MON_DATA_SINNOH_RIBBON_32, 0x0063, 0x0002, 0x003B, 0x0084 }, { - 0x00000021, + MON_DATA_SINNOH_RIBBON_33, 0x0064, 0x0000, 0x003C, 0x0085 }, { - 0x00000022, + MON_DATA_SINNOH_RIBBON_34, 0x0065, 0x0001, 0x003D, 0x0086 }, { - 0x00000023, + MON_DATA_SINNOH_RIBBON_35, 0x0066, 0x0002, 0x003E, 0x0087 }, { - 0x00000024, + MON_DATA_SINNOH_RIBBON_36, 0x0067, 0x0003, 0x003F, 0x0088 }, { - 0x00000025, + MON_DATA_SINNOH_RIBBON_37, 0x0068, 0x0000, 0x0040, 0x0089 }, { - 0x00000026, + MON_DATA_SINNOH_RIBBON_38, 0x0069, 0x0002, 0x0041, 0x008A }, { - 0x00000027, + MON_DATA_SINNOH_RIBBON_39, 0x006A, 0x0001, 0x0042, 0x008B }, { - 0x00000028, + MON_DATA_SINNOH_RIBBON_40, 0x006B, 0x0003, 0x0043, 0x008C }, { - 0x00000029, + MON_DATA_SINNOH_RIBBON_41, 0x006C, 0x0000, 0x0044, 0x008D }, { - 0x0000002A, + MON_DATA_SINNOH_RIBBON_42, 0x006D, 0x0000, 0x0045, 0x008E }, { - 0x0000002B, + MON_DATA_SINNOH_RIBBON_43, 0x006E, 0x0001, 0x0046, 0x008F }, { - 0x0000002C, + MON_DATA_SINNOH_RIBBON_44, 0x006F, 0x0003, 0x0047, 0x0090 }, { - 0x0000002D, + MON_DATA_SINNOH_RIBBON_45, 0x0070, 0x0000, 0x0048, 0x0091 }, { - 0x0000002E, + MON_DATA_SINNOH_RIBBON_46, 0x0071, 0x0000, 0x0049, 0x8007 }, { - 0x0000002F, + MON_DATA_SINNOH_RIBBON_47, 0x0072, 0x0003, 0x004A, 0x8008 }, { - 0x00000030, + MON_DATA_SINNOH_RIBBON_48, 0x0073, 0x0001, 0x004B, 0x8009 }, { - 0x00000031, + MON_DATA_SINNOH_RIBBON_49, 0x0074, 0x0001, 0x004C, 0x800A }, { - 0x00000032, + MON_DATA_SINNOH_RIBBON_50, 0x0075, 0x0000, 0x004D, 0x800B }, { - 0x00000033, + MON_DATA_SINNOH_RIBBON_51, 0x0076, 0x0001, 0x004E, 0x800C }, { - 0x00000034, + MON_DATA_SINNOH_RIBBON_52, 0x0077, 0x0000, 0x004F, -- cgit v1.2.3 From 5277dde7a325e75a45c559510331f6fb61f34aa9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Aug 2020 13:37:57 -0400 Subject: Name ribbon flags --- arm9/src/pokemon.c | 482 ++++++++++++------------ arm9/src/unk_0207FC5C.c | 978 ++++++++++++++++++++++++------------------------ 2 files changed, 730 insertions(+), 730 deletions(-) (limited to 'arm9/src') diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index dbf86d8a..20784ff6 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -701,33 +701,33 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest) ret = blockA->sheen; break; case MON_DATA_SINNOH_CHAMP_RIBBON: - case MON_DATA_SINNOH_RIBBON_26: - case MON_DATA_SINNOH_RIBBON_27: - case MON_DATA_SINNOH_RIBBON_28: - case MON_DATA_SINNOH_RIBBON_29: - case MON_DATA_SINNOH_RIBBON_30: - case MON_DATA_SINNOH_RIBBON_31: - case MON_DATA_SINNOH_RIBBON_32: - case MON_DATA_SINNOH_RIBBON_33: - case MON_DATA_SINNOH_RIBBON_34: - case MON_DATA_SINNOH_RIBBON_35: - case MON_DATA_SINNOH_RIBBON_36: - case MON_DATA_SINNOH_RIBBON_37: - case MON_DATA_SINNOH_RIBBON_38: - case MON_DATA_SINNOH_RIBBON_39: - case MON_DATA_SINNOH_RIBBON_40: - case MON_DATA_SINNOH_RIBBON_41: - case MON_DATA_SINNOH_RIBBON_42: - case MON_DATA_SINNOH_RIBBON_43: - case MON_DATA_SINNOH_RIBBON_44: - case MON_DATA_SINNOH_RIBBON_45: - case MON_DATA_SINNOH_RIBBON_46: - case MON_DATA_SINNOH_RIBBON_47: - case MON_DATA_SINNOH_RIBBON_48: - case MON_DATA_SINNOH_RIBBON_49: - case MON_DATA_SINNOH_RIBBON_50: - case MON_DATA_SINNOH_RIBBON_51: - case MON_DATA_SINNOH_RIBBON_52: + case MON_DATA_ABILITY_RIBBON: + case MON_DATA_GREAT_ABILITY_RIBBON: + case MON_DATA_DOUBLE_ABILITY_RIBBON: + case MON_DATA_MULTI_ABILITY_RIBBON: + case MON_DATA_PAIR_ABILITY_RIBBON: + case MON_DATA_WORLD_ABILITY_RIBBON: + case MON_DATA_ALERT_RIBBON: + case MON_DATA_SHOCK_RIBBON: + case MON_DATA_DOWNCAST_RIBBON: + case MON_DATA_CARELESS_RIBBON: + case MON_DATA_RELAX_RIBBON: + case MON_DATA_SNOOZE_RIBBON: + case MON_DATA_SMILE_RIBBON: + case MON_DATA_GORGEOUS_RIBBON: + case MON_DATA_ROYAL_RIBBON: + case MON_DATA_GORGEOUS_ROYAL_RIBBON: + case MON_DATA_FOOTPRINT_RIBBON: + case MON_DATA_RECORD_RIBBON: + case MON_DATA_HISTORY_RIBBON: + case MON_DATA_LEGEND_RIBBON: + case MON_DATA_RED_RIBBON: + case MON_DATA_GREEN_RIBBON: + case MON_DATA_BLUE_RIBBON: + case MON_DATA_FESTIVAL_RIBBON: + case MON_DATA_CARNIVAL_RIBBON: + case MON_DATA_CLASSIC_RIBBON: + case MON_DATA_PREMIER_RIBBON: case MON_DATA_SINNOH_RIBBON_53: { if (blockA->sinnohRibbons & (1ll << (attr - MON_DATA_SINNOH_CHAMP_RIBBON))) @@ -790,39 +790,39 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest) case MON_DATA_HAS_NICKNAME: ret = blockB->isNicknamed; break; - case MON_DATA_COOL_RIBBON: - case MON_DATA_HOENN_RIBBON_79: - case MON_DATA_HOENN_RIBBON_80: - case MON_DATA_HOENN_RIBBON_81: - case MON_DATA_HOENN_RIBBON_82: - case MON_DATA_HOENN_RIBBON_83: - case MON_DATA_HOENN_RIBBON_84: - case MON_DATA_HOENN_RIBBON_85: - case MON_DATA_HOENN_RIBBON_86: - case MON_DATA_HOENN_RIBBON_87: - case MON_DATA_HOENN_RIBBON_88: - case MON_DATA_HOENN_RIBBON_89: - case MON_DATA_HOENN_RIBBON_90: - case MON_DATA_HOENN_RIBBON_91: - case MON_DATA_HOENN_RIBBON_92: - case MON_DATA_HOENN_RIBBON_93: - case MON_DATA_HOENN_RIBBON_94: - case MON_DATA_HOENN_RIBBON_95: - case MON_DATA_HOENN_RIBBON_96: - case MON_DATA_HOENN_RIBBON_97: - case MON_DATA_HOENN_RIBBON_98: - case MON_DATA_HOENN_RIBBON_99: - case MON_DATA_HOENN_RIBBON_100: - case MON_DATA_HOENN_RIBBON_101: - case MON_DATA_HOENN_RIBBON_102: - case MON_DATA_HOENN_RIBBON_103: - case MON_DATA_HOENN_RIBBON_104: - case MON_DATA_HOENN_RIBBON_105: - case MON_DATA_HOENN_RIBBON_106: - case MON_DATA_HOENN_RIBBON_107: - case MON_DATA_HOENN_RIBBON_108: - case MON_DATA_HOENN_RIBBON_109: - if (blockB->ribbonFlags & (1ll << (attr - MON_DATA_COOL_RIBBON))) + case MON_DATA_HOENN_COOL_RIBBON: + case MON_DATA_HOENN_COOL_RIBBON_SUPER: + case MON_DATA_HOENN_COOL_RIBBON_HYPER: + case MON_DATA_HOENN_COOL_RIBBON_MASTER: + case MON_DATA_HOENN_BEAUTY_RIBBON: + case MON_DATA_HOENN_BEAUTY_RIBBON_SUPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_HYPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_MASTER: + case MON_DATA_HOENN_CUTE_RIBBON: + case MON_DATA_HOENN_CUTE_RIBBON_SUPER: + case MON_DATA_HOENN_CUTE_RIBBON_HYPER: + case MON_DATA_HOENN_CUTE_RIBBON_MASTER: + case MON_DATA_HOENN_SMART_RIBBON: + case MON_DATA_HOENN_SMART_RIBBON_SUPER: + case MON_DATA_HOENN_SMART_RIBBON_HYPER: + case MON_DATA_HOENN_SMART_RIBBON_MASTER: + case MON_DATA_HOENN_TOUGH_RIBBON: + case MON_DATA_HOENN_TOUGH_RIBBON_SUPER: + case MON_DATA_HOENN_TOUGH_RIBBON_HYPER: + case MON_DATA_HOENN_TOUGH_RIBBON_MASTER: + case MON_DATA_HOENN_CHAMPION_RIBBON: + case MON_DATA_HOENN_WINNING_RIBBON: + case MON_DATA_HOENN_VICTORY_RIBBON: + case MON_DATA_HOENN_ARTIST_RIBBON: + case MON_DATA_HOENN_EFFORT_RIBBON: + case MON_DATA_HOENN_MARINE_RIBBON: + case MON_DATA_HOENN_LAND_RIBBON: + case MON_DATA_HOENN_SKY_RIBBON: + case MON_DATA_HOENN_COUNTRY_RIBBON: + case MON_DATA_HOENN_NATIONAL_RIBBON: + case MON_DATA_HOENN_EARTH_RIBBON: + case MON_DATA_HOENN_WORLD_RIBBON: + if (blockB->ribbonFlags & (1ll << (attr - MON_DATA_HOENN_COOL_RIBBON))) ret = TRUE; else ret = FALSE; @@ -876,28 +876,28 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest) case MON_DATA_GAME_VERSION: ret = blockC->originGame; break; - case MON_DATA_SINNOH_RIBBON_122: - case MON_DATA_SINNOH_RIBBON_123: - case MON_DATA_SINNOH_RIBBON_124: - case MON_DATA_SINNOH_RIBBON_125: - case MON_DATA_SINNOH_RIBBON_126: - case MON_DATA_SINNOH_RIBBON_127: - case MON_DATA_SINNOH_RIBBON_128: - case MON_DATA_SINNOH_RIBBON_129: - case MON_DATA_SINNOH_RIBBON_130: - case MON_DATA_SINNOH_RIBBON_131: - case MON_DATA_SINNOH_RIBBON_132: - case MON_DATA_SINNOH_RIBBON_133: - case MON_DATA_SINNOH_RIBBON_134: - case MON_DATA_SINNOH_RIBBON_135: - case MON_DATA_SINNOH_RIBBON_136: - case MON_DATA_SINNOH_RIBBON_137: - case MON_DATA_SINNOH_RIBBON_138: - case MON_DATA_SINNOH_RIBBON_139: - case MON_DATA_SINNOH_RIBBON_140: - case MON_DATA_SINNOH_RIBBON_141: + case MON_DATA_COOL_RIBBON: + case MON_DATA_COOL_RIBBON_GREAT: + case MON_DATA_COOL_RIBBON_ULTRA: + case MON_DATA_COOL_RIBBON_MASTER: + case MON_DATA_BEAUTY_RIBBON: + case MON_DATA_BEAUTY_RIBBON_GREAT: + case MON_DATA_BEAUTY_RIBBON_ULTRA: + case MON_DATA_BEAUTY_RIBBON_MASTER: + case MON_DATA_CUTE_RIBBON: + case MON_DATA_CUTE_RIBBON_GREAT: + case MON_DATA_CUTE_RIBBON_ULTRA: + case MON_DATA_CUTE_RIBBON_MASTER: + case MON_DATA_SMART_RIBBON: + case MON_DATA_SMART_RIBBON_GREAT: + case MON_DATA_SMART_RIBBON_ULTRA: + case MON_DATA_SMART_RIBBON_MASTER: + case MON_DATA_TOUGH_RIBBON: + case MON_DATA_TOUGH_RIBBON_GREAT: + case MON_DATA_TOUGH_RIBBON_ULTRA: + case MON_DATA_TOUGH_RIBBON_MASTER: case MON_DATA_SINNOH_RIBBON_142: - if (blockC->sinnohRibbons2 & (1ll << (attr - MON_DATA_SINNOH_RIBBON_122))) + if (blockC->sinnohRibbons2 & (1ll << (attr - MON_DATA_COOL_RIBBON))) ret = TRUE; else ret = FALSE; @@ -1178,33 +1178,33 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value) blockA->sheen = VALUE(u8); break; case MON_DATA_SINNOH_CHAMP_RIBBON: - case MON_DATA_SINNOH_RIBBON_26: - case MON_DATA_SINNOH_RIBBON_27: - case MON_DATA_SINNOH_RIBBON_28: - case MON_DATA_SINNOH_RIBBON_29: - case MON_DATA_SINNOH_RIBBON_30: - case MON_DATA_SINNOH_RIBBON_31: - case MON_DATA_SINNOH_RIBBON_32: - case MON_DATA_SINNOH_RIBBON_33: - case MON_DATA_SINNOH_RIBBON_34: - case MON_DATA_SINNOH_RIBBON_35: - case MON_DATA_SINNOH_RIBBON_36: - case MON_DATA_SINNOH_RIBBON_37: - case MON_DATA_SINNOH_RIBBON_38: - case MON_DATA_SINNOH_RIBBON_39: - case MON_DATA_SINNOH_RIBBON_40: - case MON_DATA_SINNOH_RIBBON_41: - case MON_DATA_SINNOH_RIBBON_42: - case MON_DATA_SINNOH_RIBBON_43: - case MON_DATA_SINNOH_RIBBON_44: - case MON_DATA_SINNOH_RIBBON_45: - case MON_DATA_SINNOH_RIBBON_46: - case MON_DATA_SINNOH_RIBBON_47: - case MON_DATA_SINNOH_RIBBON_48: - case MON_DATA_SINNOH_RIBBON_49: - case MON_DATA_SINNOH_RIBBON_50: - case MON_DATA_SINNOH_RIBBON_51: - case MON_DATA_SINNOH_RIBBON_52: + case MON_DATA_ABILITY_RIBBON: + case MON_DATA_GREAT_ABILITY_RIBBON: + case MON_DATA_DOUBLE_ABILITY_RIBBON: + case MON_DATA_MULTI_ABILITY_RIBBON: + case MON_DATA_PAIR_ABILITY_RIBBON: + case MON_DATA_WORLD_ABILITY_RIBBON: + case MON_DATA_ALERT_RIBBON: + case MON_DATA_SHOCK_RIBBON: + case MON_DATA_DOWNCAST_RIBBON: + case MON_DATA_CARELESS_RIBBON: + case MON_DATA_RELAX_RIBBON: + case MON_DATA_SNOOZE_RIBBON: + case MON_DATA_SMILE_RIBBON: + case MON_DATA_GORGEOUS_RIBBON: + case MON_DATA_ROYAL_RIBBON: + case MON_DATA_GORGEOUS_ROYAL_RIBBON: + case MON_DATA_FOOTPRINT_RIBBON: + case MON_DATA_RECORD_RIBBON: + case MON_DATA_HISTORY_RIBBON: + case MON_DATA_LEGEND_RIBBON: + case MON_DATA_RED_RIBBON: + case MON_DATA_GREEN_RIBBON: + case MON_DATA_BLUE_RIBBON: + case MON_DATA_FESTIVAL_RIBBON: + case MON_DATA_CARNIVAL_RIBBON: + case MON_DATA_CLASSIC_RIBBON: + case MON_DATA_PREMIER_RIBBON: case MON_DATA_SINNOH_RIBBON_53: flag = VALUE(u8); mask = (u64)flag << (attr - MON_DATA_SINNOH_CHAMP_RIBBON); @@ -1255,40 +1255,40 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value) case MON_DATA_HAS_NICKNAME: blockB->isNicknamed = VALUE(u8); break; - case MON_DATA_COOL_RIBBON: - case MON_DATA_HOENN_RIBBON_79: - case MON_DATA_HOENN_RIBBON_80: - case MON_DATA_HOENN_RIBBON_81: - case MON_DATA_HOENN_RIBBON_82: - case MON_DATA_HOENN_RIBBON_83: - case MON_DATA_HOENN_RIBBON_84: - case MON_DATA_HOENN_RIBBON_85: - case MON_DATA_HOENN_RIBBON_86: - case MON_DATA_HOENN_RIBBON_87: - case MON_DATA_HOENN_RIBBON_88: - case MON_DATA_HOENN_RIBBON_89: - case MON_DATA_HOENN_RIBBON_90: - case MON_DATA_HOENN_RIBBON_91: - case MON_DATA_HOENN_RIBBON_92: - case MON_DATA_HOENN_RIBBON_93: - case MON_DATA_HOENN_RIBBON_94: - case MON_DATA_HOENN_RIBBON_95: - case MON_DATA_HOENN_RIBBON_96: - case MON_DATA_HOENN_RIBBON_97: - case MON_DATA_HOENN_RIBBON_98: - case MON_DATA_HOENN_RIBBON_99: - case MON_DATA_HOENN_RIBBON_100: - case MON_DATA_HOENN_RIBBON_101: - case MON_DATA_HOENN_RIBBON_102: - case MON_DATA_HOENN_RIBBON_103: - case MON_DATA_HOENN_RIBBON_104: - case MON_DATA_HOENN_RIBBON_105: - case MON_DATA_HOENN_RIBBON_106: - case MON_DATA_HOENN_RIBBON_107: - case MON_DATA_HOENN_RIBBON_108: - case MON_DATA_HOENN_RIBBON_109: + case MON_DATA_HOENN_COOL_RIBBON: + case MON_DATA_HOENN_COOL_RIBBON_SUPER: + case MON_DATA_HOENN_COOL_RIBBON_HYPER: + case MON_DATA_HOENN_COOL_RIBBON_MASTER: + case MON_DATA_HOENN_BEAUTY_RIBBON: + case MON_DATA_HOENN_BEAUTY_RIBBON_SUPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_HYPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_MASTER: + case MON_DATA_HOENN_CUTE_RIBBON: + case MON_DATA_HOENN_CUTE_RIBBON_SUPER: + case MON_DATA_HOENN_CUTE_RIBBON_HYPER: + case MON_DATA_HOENN_CUTE_RIBBON_MASTER: + case MON_DATA_HOENN_SMART_RIBBON: + case MON_DATA_HOENN_SMART_RIBBON_SUPER: + case MON_DATA_HOENN_SMART_RIBBON_HYPER: + case MON_DATA_HOENN_SMART_RIBBON_MASTER: + case MON_DATA_HOENN_TOUGH_RIBBON: + case MON_DATA_HOENN_TOUGH_RIBBON_SUPER: + case MON_DATA_HOENN_TOUGH_RIBBON_HYPER: + case MON_DATA_HOENN_TOUGH_RIBBON_MASTER: + case MON_DATA_HOENN_CHAMPION_RIBBON: + case MON_DATA_HOENN_WINNING_RIBBON: + case MON_DATA_HOENN_VICTORY_RIBBON: + case MON_DATA_HOENN_ARTIST_RIBBON: + case MON_DATA_HOENN_EFFORT_RIBBON: + case MON_DATA_HOENN_MARINE_RIBBON: + case MON_DATA_HOENN_LAND_RIBBON: + case MON_DATA_HOENN_SKY_RIBBON: + case MON_DATA_HOENN_COUNTRY_RIBBON: + case MON_DATA_HOENN_NATIONAL_RIBBON: + case MON_DATA_HOENN_EARTH_RIBBON: + case MON_DATA_HOENN_WORLD_RIBBON: flag = VALUE(u8); - mask = (u64)flag << (attr - MON_DATA_COOL_RIBBON); + mask = (u64)flag << (attr - MON_DATA_HOENN_COOL_RIBBON); if (flag) blockB->ribbonFlags |= mask; else @@ -1333,29 +1333,29 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value) case MON_DATA_GAME_VERSION: blockC->originGame = VALUE(u8); break; - case MON_DATA_SINNOH_RIBBON_122: - case MON_DATA_SINNOH_RIBBON_123: - case MON_DATA_SINNOH_RIBBON_124: - case MON_DATA_SINNOH_RIBBON_125: - case MON_DATA_SINNOH_RIBBON_126: - case MON_DATA_SINNOH_RIBBON_127: - case MON_DATA_SINNOH_RIBBON_128: - case MON_DATA_SINNOH_RIBBON_129: - case MON_DATA_SINNOH_RIBBON_130: - case MON_DATA_SINNOH_RIBBON_131: - case MON_DATA_SINNOH_RIBBON_132: - case MON_DATA_SINNOH_RIBBON_133: - case MON_DATA_SINNOH_RIBBON_134: - case MON_DATA_SINNOH_RIBBON_135: - case MON_DATA_SINNOH_RIBBON_136: - case MON_DATA_SINNOH_RIBBON_137: - case MON_DATA_SINNOH_RIBBON_138: - case MON_DATA_SINNOH_RIBBON_139: - case MON_DATA_SINNOH_RIBBON_140: - case MON_DATA_SINNOH_RIBBON_141: + case MON_DATA_COOL_RIBBON: + case MON_DATA_COOL_RIBBON_GREAT: + case MON_DATA_COOL_RIBBON_ULTRA: + case MON_DATA_COOL_RIBBON_MASTER: + case MON_DATA_BEAUTY_RIBBON: + case MON_DATA_BEAUTY_RIBBON_GREAT: + case MON_DATA_BEAUTY_RIBBON_ULTRA: + case MON_DATA_BEAUTY_RIBBON_MASTER: + case MON_DATA_CUTE_RIBBON: + case MON_DATA_CUTE_RIBBON_GREAT: + case MON_DATA_CUTE_RIBBON_ULTRA: + case MON_DATA_CUTE_RIBBON_MASTER: + case MON_DATA_SMART_RIBBON: + case MON_DATA_SMART_RIBBON_GREAT: + case MON_DATA_SMART_RIBBON_ULTRA: + case MON_DATA_SMART_RIBBON_MASTER: + case MON_DATA_TOUGH_RIBBON: + case MON_DATA_TOUGH_RIBBON_GREAT: + case MON_DATA_TOUGH_RIBBON_ULTRA: + case MON_DATA_TOUGH_RIBBON_MASTER: case MON_DATA_SINNOH_RIBBON_142: flag = VALUE(u8); - mask = (u64)flag << (attr - MON_DATA_SINNOH_RIBBON_122); + mask = (u64)flag << (attr - MON_DATA_COOL_RIBBON); if (flag) blockC->sinnohRibbons2 |= mask; else @@ -1630,33 +1630,33 @@ void AddBoxMonData(struct BoxPokemon * boxmon, int attr, int value) case MON_DATA_MARKINGS: case MON_DATA_GAME_LANGUAGE: case MON_DATA_SINNOH_CHAMP_RIBBON: - case MON_DATA_SINNOH_RIBBON_26: - case MON_DATA_SINNOH_RIBBON_27: - case MON_DATA_SINNOH_RIBBON_28: - case MON_DATA_SINNOH_RIBBON_29: - case MON_DATA_SINNOH_RIBBON_30: - case MON_DATA_SINNOH_RIBBON_31: - case MON_DATA_SINNOH_RIBBON_32: - case MON_DATA_SINNOH_RIBBON_33: - case MON_DATA_SINNOH_RIBBON_34: - case MON_DATA_SINNOH_RIBBON_35: - case MON_DATA_SINNOH_RIBBON_36: - case MON_DATA_SINNOH_RIBBON_37: - case MON_DATA_SINNOH_RIBBON_38: - case MON_DATA_SINNOH_RIBBON_39: - case MON_DATA_SINNOH_RIBBON_40: - case MON_DATA_SINNOH_RIBBON_41: - case MON_DATA_SINNOH_RIBBON_42: - case MON_DATA_SINNOH_RIBBON_43: - case MON_DATA_SINNOH_RIBBON_44: - case MON_DATA_SINNOH_RIBBON_45: - case MON_DATA_SINNOH_RIBBON_46: - case MON_DATA_SINNOH_RIBBON_47: - case MON_DATA_SINNOH_RIBBON_48: - case MON_DATA_SINNOH_RIBBON_49: - case MON_DATA_SINNOH_RIBBON_50: - case MON_DATA_SINNOH_RIBBON_51: - case MON_DATA_SINNOH_RIBBON_52: + case MON_DATA_ABILITY_RIBBON: + case MON_DATA_GREAT_ABILITY_RIBBON: + case MON_DATA_DOUBLE_ABILITY_RIBBON: + case MON_DATA_MULTI_ABILITY_RIBBON: + case MON_DATA_PAIR_ABILITY_RIBBON: + case MON_DATA_WORLD_ABILITY_RIBBON: + case MON_DATA_ALERT_RIBBON: + case MON_DATA_SHOCK_RIBBON: + case MON_DATA_DOWNCAST_RIBBON: + case MON_DATA_CARELESS_RIBBON: + case MON_DATA_RELAX_RIBBON: + case MON_DATA_SNOOZE_RIBBON: + case MON_DATA_SMILE_RIBBON: + case MON_DATA_GORGEOUS_RIBBON: + case MON_DATA_ROYAL_RIBBON: + case MON_DATA_GORGEOUS_ROYAL_RIBBON: + case MON_DATA_FOOTPRINT_RIBBON: + case MON_DATA_RECORD_RIBBON: + case MON_DATA_HISTORY_RIBBON: + case MON_DATA_LEGEND_RIBBON: + case MON_DATA_RED_RIBBON: + case MON_DATA_GREEN_RIBBON: + case MON_DATA_BLUE_RIBBON: + case MON_DATA_FESTIVAL_RIBBON: + case MON_DATA_CARNIVAL_RIBBON: + case MON_DATA_CLASSIC_RIBBON: + case MON_DATA_PREMIER_RIBBON: case MON_DATA_SINNOH_RIBBON_53: case MON_DATA_MOVE1: case MON_DATA_MOVE2: @@ -1664,38 +1664,38 @@ void AddBoxMonData(struct BoxPokemon * boxmon, int attr, int value) case MON_DATA_MOVE4: case MON_DATA_IS_EGG: case MON_DATA_HAS_NICKNAME: - case MON_DATA_COOL_RIBBON: - case MON_DATA_HOENN_RIBBON_79: - case MON_DATA_HOENN_RIBBON_80: - case MON_DATA_HOENN_RIBBON_81: - case MON_DATA_HOENN_RIBBON_82: - case MON_DATA_HOENN_RIBBON_83: - case MON_DATA_HOENN_RIBBON_84: - case MON_DATA_HOENN_RIBBON_85: - case MON_DATA_HOENN_RIBBON_86: - case MON_DATA_HOENN_RIBBON_87: - case MON_DATA_HOENN_RIBBON_88: - case MON_DATA_HOENN_RIBBON_89: - case MON_DATA_HOENN_RIBBON_90: - case MON_DATA_HOENN_RIBBON_91: - case MON_DATA_HOENN_RIBBON_92: - case MON_DATA_HOENN_RIBBON_93: - case MON_DATA_HOENN_RIBBON_94: - case MON_DATA_HOENN_RIBBON_95: - case MON_DATA_HOENN_RIBBON_96: - case MON_DATA_HOENN_RIBBON_97: - case MON_DATA_HOENN_RIBBON_98: - case MON_DATA_HOENN_RIBBON_99: - case MON_DATA_HOENN_RIBBON_100: - case MON_DATA_HOENN_RIBBON_101: - case MON_DATA_HOENN_RIBBON_102: - case MON_DATA_HOENN_RIBBON_103: - case MON_DATA_HOENN_RIBBON_104: - case MON_DATA_HOENN_RIBBON_105: - case MON_DATA_HOENN_RIBBON_106: - case MON_DATA_HOENN_RIBBON_107: - case MON_DATA_HOENN_RIBBON_108: - case MON_DATA_HOENN_RIBBON_109: + case MON_DATA_HOENN_COOL_RIBBON: + case MON_DATA_HOENN_COOL_RIBBON_SUPER: + case MON_DATA_HOENN_COOL_RIBBON_HYPER: + case MON_DATA_HOENN_COOL_RIBBON_MASTER: + case MON_DATA_HOENN_BEAUTY_RIBBON: + case MON_DATA_HOENN_BEAUTY_RIBBON_SUPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_HYPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_MASTER: + case MON_DATA_HOENN_CUTE_RIBBON: + case MON_DATA_HOENN_CUTE_RIBBON_SUPER: + case MON_DATA_HOENN_CUTE_RIBBON_HYPER: + case MON_DATA_HOENN_CUTE_RIBBON_MASTER: + case MON_DATA_HOENN_SMART_RIBBON: + case MON_DATA_HOENN_SMART_RIBBON_SUPER: + case MON_DATA_HOENN_SMART_RIBBON_HYPER: + case MON_DATA_HOENN_SMART_RIBBON_MASTER: + case MON_DATA_HOENN_TOUGH_RIBBON: + case MON_DATA_HOENN_TOUGH_RIBBON_SUPER: + case MON_DATA_HOENN_TOUGH_RIBBON_HYPER: + case MON_DATA_HOENN_TOUGH_RIBBON_MASTER: + case MON_DATA_HOENN_CHAMPION_RIBBON: + case MON_DATA_HOENN_WINNING_RIBBON: + case MON_DATA_HOENN_VICTORY_RIBBON: + case MON_DATA_HOENN_ARTIST_RIBBON: + case MON_DATA_HOENN_EFFORT_RIBBON: + case MON_DATA_HOENN_MARINE_RIBBON: + case MON_DATA_HOENN_LAND_RIBBON: + case MON_DATA_HOENN_SKY_RIBBON: + case MON_DATA_HOENN_COUNTRY_RIBBON: + case MON_DATA_HOENN_NATIONAL_RIBBON: + case MON_DATA_HOENN_EARTH_RIBBON: + case MON_DATA_HOENN_WORLD_RIBBON: case MON_DATA_FATEFUL_ENCOUNTER: case MON_DATA_GENDER: case MON_DATA_FORME: @@ -1708,26 +1708,26 @@ void AddBoxMonData(struct BoxPokemon * boxmon, int attr, int value) case MON_DATA_NICKNAME_4: case MON_DATA_UNK_120: case MON_DATA_GAME_VERSION: - case MON_DATA_SINNOH_RIBBON_122: - case MON_DATA_SINNOH_RIBBON_123: - case MON_DATA_SINNOH_RIBBON_124: - case MON_DATA_SINNOH_RIBBON_125: - case MON_DATA_SINNOH_RIBBON_126: - case MON_DATA_SINNOH_RIBBON_127: - case MON_DATA_SINNOH_RIBBON_128: - case MON_DATA_SINNOH_RIBBON_129: - case MON_DATA_SINNOH_RIBBON_130: - case MON_DATA_SINNOH_RIBBON_131: - case MON_DATA_SINNOH_RIBBON_132: - case MON_DATA_SINNOH_RIBBON_133: - case MON_DATA_SINNOH_RIBBON_134: - case MON_DATA_SINNOH_RIBBON_135: - case MON_DATA_SINNOH_RIBBON_136: - case MON_DATA_SINNOH_RIBBON_137: - case MON_DATA_SINNOH_RIBBON_138: - case MON_DATA_SINNOH_RIBBON_139: - case MON_DATA_SINNOH_RIBBON_140: - case MON_DATA_SINNOH_RIBBON_141: + case MON_DATA_COOL_RIBBON: + case MON_DATA_COOL_RIBBON_GREAT: + case MON_DATA_COOL_RIBBON_ULTRA: + case MON_DATA_COOL_RIBBON_MASTER: + case MON_DATA_BEAUTY_RIBBON: + case MON_DATA_BEAUTY_RIBBON_GREAT: + case MON_DATA_BEAUTY_RIBBON_ULTRA: + case MON_DATA_BEAUTY_RIBBON_MASTER: + case MON_DATA_CUTE_RIBBON: + case MON_DATA_CUTE_RIBBON_GREAT: + case MON_DATA_CUTE_RIBBON_ULTRA: + case MON_DATA_CUTE_RIBBON_MASTER: + case MON_DATA_SMART_RIBBON: + case MON_DATA_SMART_RIBBON_GREAT: + case MON_DATA_SMART_RIBBON_ULTRA: + case MON_DATA_SMART_RIBBON_MASTER: + case MON_DATA_TOUGH_RIBBON: + case MON_DATA_TOUGH_RIBBON_GREAT: + case MON_DATA_TOUGH_RIBBON_ULTRA: + case MON_DATA_TOUGH_RIBBON_MASTER: case MON_DATA_SINNOH_RIBBON_142: case MON_DATA_OT_NAME: case MON_DATA_OT_NAME_2: diff --git a/arm9/src/unk_0207FC5C.c b/arm9/src/unk_0207FC5C.c index e3749139..1f001de1 100644 --- a/arm9/src/unk_0207FC5C.c +++ b/arm9/src/unk_0207FC5C.c @@ -6,494 +6,494 @@ struct UnkStruct_020FB788 { - u32 unk_0; - u16 unk_4; - u16 unk_6; - u16 unk_8; - u16 unk_A; + u32 monDataId; + u16 gfxId; + u16 palId; + u16 nameIdx; + u16 descIdx; }; const struct UnkStruct_020FB788 UNK_020FB788[] = { { - MON_DATA_HOENN_RIBBON_98, - 0x0048, - 0x0000, - 0x0000, - 0x0050 - }, { - MON_DATA_COOL_RIBBON, - 0x0049, - 0x0000, - 0x0001, - 0x0051 - }, { - MON_DATA_HOENN_RIBBON_79, - 0x004A, - 0x0000, - 0x0002, - 0x0052 - }, { - MON_DATA_HOENN_RIBBON_80, - 0x004B, - 0x0000, - 0x0003, - 0x0053 - }, { - MON_DATA_HOENN_RIBBON_81, - 0x004C, - 0x0000, - 0x0004, - 0x0054 - }, { - MON_DATA_HOENN_RIBBON_82, - 0x0049, - 0x0001, - 0x0005, - 0x0055 - }, { - MON_DATA_HOENN_RIBBON_83, - 0x004A, - 0x0001, - 0x0006, - 0x0056 - }, { - MON_DATA_HOENN_RIBBON_84, - 0x004B, - 0x0001, - 0x0007, - 0x0057 - }, { - MON_DATA_HOENN_RIBBON_85, - 0x004C, - 0x0001, - 0x0008, - 0x0058 - }, { - MON_DATA_HOENN_RIBBON_86, - 0x0049, - 0x0002, - 0x0009, - 0x0059 - }, { - MON_DATA_HOENN_RIBBON_87, - 0x004A, - 0x0002, - 0x000A, - 0x005A - }, { - MON_DATA_HOENN_RIBBON_88, - 0x004B, - 0x0002, - 0x000B, - 0x005B - }, { - MON_DATA_HOENN_RIBBON_89, - 0x004C, - 0x0002, - 0x000C, - 0x005C - }, { - MON_DATA_HOENN_RIBBON_90, - 0x0049, - 0x0003, - 0x000D, - 0x005D - }, { - MON_DATA_HOENN_RIBBON_91, - 0x004A, - 0x0003, - 0x000E, - 0x005E - }, { - MON_DATA_HOENN_RIBBON_92, - 0x004B, - 0x0003, - 0x000F, - 0x005F - }, { - MON_DATA_HOENN_RIBBON_93, - 0x004C, - 0x0003, - 0x0010, - 0x0060 - }, { - MON_DATA_HOENN_RIBBON_94, - 0x0049, - 0x0004, - 0x0011, - 0x0061 - }, { - MON_DATA_HOENN_RIBBON_95, - 0x004A, - 0x0004, - 0x0012, - 0x0062 - }, { - MON_DATA_HOENN_RIBBON_96, - 0x004B, - 0x0004, - 0x0013, - 0x0063 - }, { - MON_DATA_HOENN_RIBBON_97, - 0x004C, - 0x0004, - 0x0014, - 0x0064 - }, { - MON_DATA_HOENN_RIBBON_99, - 0x004E, - 0x0000, - 0x0015, - 0x0065 - }, { - MON_DATA_HOENN_RIBBON_100, - 0x004D, - 0x0000, - 0x0016, - 0x0066 - }, { - MON_DATA_HOENN_RIBBON_101, - 0x004F, - 0x0001, - 0x0017, - 0x0067 - }, { - MON_DATA_HOENN_RIBBON_102, - 0x0050, - 0x0002, - 0x0018, - 0x0068 - }, { - MON_DATA_HOENN_RIBBON_103, - 0x0051, - 0x0001, - 0x0019, - 0x8000 - }, { - MON_DATA_HOENN_RIBBON_104, - 0x0051, - 0x0003, - 0x001A, - 0x8001 - }, { - MON_DATA_HOENN_RIBBON_105, - 0x0051, - 0x0004, - 0x001B, - 0x8002 - }, { - MON_DATA_HOENN_RIBBON_106, - 0x0052, - 0x0003, - 0x001C, - 0x00B2 - }, { - MON_DATA_HOENN_RIBBON_107, - 0x0052, - 0x0004, - 0x001D, - 0x00BE - }, { - MON_DATA_HOENN_RIBBON_108, - 0x0053, - 0x0000, - 0x001E, - 0x00BF - }, { - MON_DATA_HOENN_RIBBON_109, - 0x0053, - 0x0001, - 0x001F, - 0x00B2 + MON_DATA_HOENN_CHAMPION_RIBBON, + 72, + 0, + RIBBON_HOENN_CHAMPION, + 80 + }, { + MON_DATA_HOENN_COOL_RIBBON, + 73, + 0, + RIBBON_HOENN_COOL, + 81 + }, { + MON_DATA_HOENN_COOL_RIBBON_SUPER, + 74, + 0, + RIBBON_HOENN_COOL_SUPER, + 82 + }, { + MON_DATA_HOENN_COOL_RIBBON_HYPER, + 75, + 0, + RIBBON_HOENN_COOL_HYPER, + 83 + }, { + MON_DATA_HOENN_COOL_RIBBON_MASTER, + 76, + 0, + RIBBON_HOENN_COOL_MASTER, + 84 + }, { + MON_DATA_HOENN_BEAUTY_RIBBON, + 73, + 1, + RIBBON_HOENN_BEAUTY, + 85 + }, { + MON_DATA_HOENN_BEAUTY_RIBBON_SUPER, + 74, + 1, + RIBBON_HOENN_BEAUTY_SUPER, + 86 + }, { + MON_DATA_HOENN_BEAUTY_RIBBON_HYPER, + 75, + 1, + RIBBON_HOENN_BEAUTY_HYPER, + 87 + }, { + MON_DATA_HOENN_BEAUTY_RIBBON_MASTER, + 76, + 1, + RIBBON_HOENN_BEAUTY_MASTER, + 88 + }, { + MON_DATA_HOENN_CUTE_RIBBON, + 73, + 2, + RIBBON_HOENN_CUTE, + 89 + }, { + MON_DATA_HOENN_CUTE_RIBBON_SUPER, + 74, + 2, + RIBBON_HOENN_CUTE_SUPER, + 90 + }, { + MON_DATA_HOENN_CUTE_RIBBON_HYPER, + 75, + 2, + RIBBON_HOENN_CUTE_HYPER, + 91 + }, { + MON_DATA_HOENN_CUTE_RIBBON_MASTER, + 76, + 2, + RIBBON_HOENN_CUTE_MASTER, + 92 + }, { + MON_DATA_HOENN_SMART_RIBBON, + 73, + 3, + RIBBON_HOENN_SMART, + 93 + }, { + MON_DATA_HOENN_SMART_RIBBON_SUPER, + 74, + 3, + RIBBON_HOENN_SMART_SUPER, + 94 + }, { + MON_DATA_HOENN_SMART_RIBBON_HYPER, + 75, + 3, + RIBBON_HOENN_SMART_HYPER, + 95 + }, { + MON_DATA_HOENN_SMART_RIBBON_MASTER, + 76, + 3, + RIBBON_HOENN_SMART_MASTER, + 96 + }, { + MON_DATA_HOENN_TOUGH_RIBBON, + 73, + 4, + RIBBON_HOENN_TOUGH, + 97 + }, { + MON_DATA_HOENN_TOUGH_RIBBON_SUPER, + 74, + 4, + RIBBON_HOENN_TOUGH_SUPER, + 98 + }, { + MON_DATA_HOENN_TOUGH_RIBBON_HYPER, + 75, + 4, + RIBBON_HOENN_TOUGH_HYPER, + 99 + }, { + MON_DATA_HOENN_TOUGH_RIBBON_MASTER, + 76, + 4, + RIBBON_HOENN_TOUGH_MASTER, + 100 + }, { + MON_DATA_HOENN_WINNING_RIBBON, + 78, + 0, + RIBBON_HOENN_WINNING, + 101 + }, { + MON_DATA_HOENN_VICTORY_RIBBON, + 77, + 0, + RIBBON_HOENN_VICTORY, + 102 + }, { + MON_DATA_HOENN_ARTIST_RIBBON, + 79, + 1, + RIBBON_HOENN_ARTIST, + 103 + }, { + MON_DATA_HOENN_EFFORT_RIBBON, + 80, + 2, + RIBBON_HOENN_EFFORT, + 104 + }, { + MON_DATA_HOENN_MARINE_RIBBON, + 81, + 1, + RIBBON_HOENN_MARINE, + 0 | 0x8000 + }, { + MON_DATA_HOENN_LAND_RIBBON, + 81, + 3, + RIBBON_HOENN_LAND, + 1 | 0x8000 + }, { + MON_DATA_HOENN_SKY_RIBBON, + 81, + 4, + RIBBON_HOENN_SKY, + 2 | 0x8000 + }, { + MON_DATA_HOENN_COUNTRY_RIBBON, + 82, + 3, + RIBBON_HOENN_COUNTRY, + 178 + }, { + MON_DATA_HOENN_NATIONAL_RIBBON, + 82, + 4, + RIBBON_HOENN_NATIONAL, + 190 + }, { + MON_DATA_HOENN_EARTH_RIBBON, + 83, + 0, + RIBBON_HOENN_EARTH, + 191 + }, { + MON_DATA_HOENN_WORLD_RIBBON, + 83, + 1, + RIBBON_HOENN_WORLD, + 178 }, { MON_DATA_SINNOH_CHAMP_RIBBON, - 0x0058, - 0x0000, - 0x0020, - 0x0069 - }, { - MON_DATA_SINNOH_RIBBON_122, - 0x0059, - 0x0000, - 0x0021, - 0x006A - }, { - MON_DATA_SINNOH_RIBBON_123, - 0x005A, - 0x0000, - 0x0022, - 0x006B - }, { - MON_DATA_SINNOH_RIBBON_124, - 0x005B, - 0x0000, - 0x0023, - 0x006C - }, { - MON_DATA_SINNOH_RIBBON_125, - 0x005C, - 0x0000, - 0x0024, - 0x006D - }, { - MON_DATA_SINNOH_RIBBON_126, - 0x0059, - 0x0001, - 0x0025, - 0x006E - }, { - MON_DATA_SINNOH_RIBBON_127, - 0x005A, - 0x0001, - 0x0026, - 0x006F - }, { - MON_DATA_SINNOH_RIBBON_128, - 0x005B, - 0x0001, - 0x0027, - 0x0070 - }, { - MON_DATA_SINNOH_RIBBON_129, - 0x005C, - 0x0001, - 0x0028, - 0x0071 - }, { - MON_DATA_SINNOH_RIBBON_130, - 0x0059, - 0x0002, - 0x0029, - 0x0072 - }, { - MON_DATA_SINNOH_RIBBON_131, - 0x005A, - 0x0002, - 0x002A, - 0x0073 - }, { - MON_DATA_SINNOH_RIBBON_132, - 0x005B, - 0x0002, - 0x002B, - 0x0074 - }, { - MON_DATA_SINNOH_RIBBON_133, - 0x005C, - 0x0002, - 0x002C, - 0x0075 - }, { - MON_DATA_SINNOH_RIBBON_134, - 0x0059, - 0x0003, - 0x002D, - 0x0076 - }, { - MON_DATA_SINNOH_RIBBON_135, - 0x005A, - 0x0003, - 0x002E, - 0x0077 - }, { - MON_DATA_SINNOH_RIBBON_136, - 0x005B, - 0x0003, - 0x002F, - 0x0078 - }, { - MON_DATA_SINNOH_RIBBON_137, - 0x005C, - 0x0003, - 0x0030, - 0x0079 - }, { - MON_DATA_SINNOH_RIBBON_138, - 0x0059, - 0x0004, - 0x0031, - 0x007A - }, { - MON_DATA_SINNOH_RIBBON_139, - 0x005A, - 0x0004, - 0x0032, - 0x007B - }, { - MON_DATA_SINNOH_RIBBON_140, - 0x005B, - 0x0004, - 0x0033, - 0x007C - }, { - MON_DATA_SINNOH_RIBBON_141, - 0x005C, - 0x0004, - 0x0034, - 0x007D - }, { - MON_DATA_SINNOH_RIBBON_26, - 0x005D, - 0x0000, - 0x0035, - 0x007E - }, { - MON_DATA_SINNOH_RIBBON_27, - 0x005E, - 0x0000, - 0x0036, - 0x007F - }, { - MON_DATA_SINNOH_RIBBON_28, - 0x005F, - 0x0000, - 0x0037, - 0x0080 - }, { - MON_DATA_SINNOH_RIBBON_29, - 0x0060, - 0x0000, - 0x0038, - 0x0081 - }, { - MON_DATA_SINNOH_RIBBON_30, - 0x0061, - 0x0000, - 0x0039, - 0x0082 - }, { - MON_DATA_SINNOH_RIBBON_31, - 0x0062, - 0x0000, - 0x003A, - 0x0083 - }, { - MON_DATA_SINNOH_RIBBON_32, - 0x0063, - 0x0002, - 0x003B, - 0x0084 - }, { - MON_DATA_SINNOH_RIBBON_33, - 0x0064, - 0x0000, - 0x003C, - 0x0085 - }, { - MON_DATA_SINNOH_RIBBON_34, - 0x0065, - 0x0001, - 0x003D, - 0x0086 - }, { - MON_DATA_SINNOH_RIBBON_35, - 0x0066, - 0x0002, - 0x003E, - 0x0087 - }, { - MON_DATA_SINNOH_RIBBON_36, - 0x0067, - 0x0003, - 0x003F, - 0x0088 - }, { - MON_DATA_SINNOH_RIBBON_37, - 0x0068, - 0x0000, - 0x0040, - 0x0089 - }, { - MON_DATA_SINNOH_RIBBON_38, - 0x0069, - 0x0002, - 0x0041, - 0x008A - }, { - MON_DATA_SINNOH_RIBBON_39, - 0x006A, - 0x0001, - 0x0042, - 0x008B - }, { - MON_DATA_SINNOH_RIBBON_40, - 0x006B, - 0x0003, - 0x0043, - 0x008C - }, { - MON_DATA_SINNOH_RIBBON_41, - 0x006C, - 0x0000, - 0x0044, - 0x008D - }, { - MON_DATA_SINNOH_RIBBON_42, - 0x006D, - 0x0000, - 0x0045, - 0x008E - }, { - MON_DATA_SINNOH_RIBBON_43, - 0x006E, - 0x0001, - 0x0046, - 0x008F - }, { - MON_DATA_SINNOH_RIBBON_44, - 0x006F, - 0x0003, - 0x0047, - 0x0090 - }, { - MON_DATA_SINNOH_RIBBON_45, - 0x0070, - 0x0000, - 0x0048, - 0x0091 - }, { - MON_DATA_SINNOH_RIBBON_46, - 0x0071, - 0x0000, - 0x0049, - 0x8007 - }, { - MON_DATA_SINNOH_RIBBON_47, - 0x0072, - 0x0003, - 0x004A, - 0x8008 - }, { - MON_DATA_SINNOH_RIBBON_48, - 0x0073, - 0x0001, - 0x004B, - 0x8009 - }, { - MON_DATA_SINNOH_RIBBON_49, - 0x0074, - 0x0001, - 0x004C, - 0x800A - }, { - MON_DATA_SINNOH_RIBBON_50, - 0x0075, - 0x0000, - 0x004D, - 0x800B - }, { - MON_DATA_SINNOH_RIBBON_51, - 0x0076, - 0x0001, - 0x004E, - 0x800C - }, { - MON_DATA_SINNOH_RIBBON_52, - 0x0077, - 0x0000, - 0x004F, - 0x800D + 88, + 0, + RIBBON_SINNOH_CHAMP, + 105 + }, { + MON_DATA_COOL_RIBBON, + 89, + 0, + RIBBON_COOL, + 106 + }, { + MON_DATA_COOL_RIBBON_GREAT, + 90, + 0, + RIBBON_COOL_GREAT, + 107 + }, { + MON_DATA_COOL_RIBBON_ULTRA, + 91, + 0, + RIBBON_COOL_ULTRA, + 108 + }, { + MON_DATA_COOL_RIBBON_MASTER, + 92, + 0, + RIBBON_COOL_MASTER, + 109 + }, { + MON_DATA_BEAUTY_RIBBON, + 89, + 1, + RIBBON_BEAUTY, + 110 + }, { + MON_DATA_BEAUTY_RIBBON_GREAT, + 90, + 1, + RIBBON_BEAUTY_GREAT, + 111 + }, { + MON_DATA_BEAUTY_RIBBON_ULTRA, + 91, + 1, + RIBBON_BEAUTY_ULTRA, + 112 + }, { + MON_DATA_BEAUTY_RIBBON_MASTER, + 92, + 1, + RIBBON_BEAUTY_MASTER, + 113 + }, { + MON_DATA_CUTE_RIBBON, + 89, + 2, + RIBBON_CUTE, + 114 + }, { + MON_DATA_CUTE_RIBBON_GREAT, + 90, + 2, + RIBBON_CUTE_GREAT, + 115 + }, { + MON_DATA_CUTE_RIBBON_ULTRA, + 91, + 2, + RIBBON_CUTE_ULTRA, + 116 + }, { + MON_DATA_CUTE_RIBBON_MASTER, + 92, + 2, + RIBBON_CUTE_MASTER, + 117 + }, { + MON_DATA_SMART_RIBBON, + 89, + 3, + RIBBON_SMART, + 118 + }, { + MON_DATA_SMART_RIBBON_GREAT, + 90, + 3, + RIBBON_SMART_GREAT, + 119 + }, { + MON_DATA_SMART_RIBBON_ULTRA, + 91, + 3, + RIBBON_SMART_ULTRA, + 120 + }, { + MON_DATA_SMART_RIBBON_MASTER, + 92, + 3, + RIBBON_SMART_MASTER, + 121 + }, { + MON_DATA_TOUGH_RIBBON, + 89, + 4, + RIBBON_TOUGH, + 122 + }, { + MON_DATA_TOUGH_RIBBON_GREAT, + 90, + 4, + RIBBON_TOUGH_GREAT, + 123 + }, { + MON_DATA_TOUGH_RIBBON_ULTRA, + 91, + 4, + RIBBON_TOUGH_ULTRA, + 124 + }, { + MON_DATA_TOUGH_RIBBON_MASTER, + 92, + 4, + RIBBON_TOUGH_MASTER, + 125 + }, { + MON_DATA_ABILITY_RIBBON, + 93, + 0, + RIBBON_ABILITY, + 126 + }, { + MON_DATA_GREAT_ABILITY_RIBBON, + 94, + 0, + RIBBON_GREAT_ABILITY, + 127 + }, { + MON_DATA_DOUBLE_ABILITY_RIBBON, + 95, + 0, + RIBBON_DOUBLE_ABILITY, + 128 + }, { + MON_DATA_MULTI_ABILITY_RIBBON, + 96, + 0, + RIBBON_MULTI_ABILITY, + 129 + }, { + MON_DATA_PAIR_ABILITY_RIBBON, + 97, + 0, + RIBBON_PAIR_ABILITY, + 130 + }, { + MON_DATA_WORLD_ABILITY_RIBBON, + 98, + 0, + RIBBON_WORLD_ABILITY, + 131 + }, { + MON_DATA_ALERT_RIBBON, + 99, + 2, + RIBBON_ALERT, + 132 + }, { + MON_DATA_SHOCK_RIBBON, + 100, + 0, + RIBBON_SHOCK, + 133 + }, { + MON_DATA_DOWNCAST_RIBBON, + 101, + 1, + RIBBON_DOWNCAST, + 134 + }, { + MON_DATA_CARELESS_RIBBON, + 102, + 2, + RIBBON_CARELESS, + 135 + }, { + MON_DATA_RELAX_RIBBON, + 103, + 3, + RIBBON_RELAX, + 136 + }, { + MON_DATA_SNOOZE_RIBBON, + 104, + 0, + RIBBON_SNOOZE, + 137 + }, { + MON_DATA_SMILE_RIBBON, + 105, + 2, + RIBBON_SMILE, + 138 + }, { + MON_DATA_GORGEOUS_RIBBON, + 106, + 1, + RIBBON_GORGEOUS, + 139 + }, { + MON_DATA_ROYAL_RIBBON, + 107, + 3, + RIBBON_ROYAL, + 140 + }, { + MON_DATA_GORGEOUS_ROYAL_RIBBON, + 108, + 0, + RIBBON_GORGEOUS_ROYAL, + 141 + }, { + MON_DATA_FOOTPRINT_RIBBON, + 109, + 0, + RIBBON_FOOTPRINT, + 142 + }, { + MON_DATA_RECORD_RIBBON, + 110, + 1, + RIBBON_RECORD, + 143 + }, { + MON_DATA_HISTORY_RIBBON, + 111, + 3, + RIBBON_HISTORY, + 144 + }, { + MON_DATA_LEGEND_RIBBON, + 112, + 0, + RIBBON_LEGEND, + 145 + }, { + MON_DATA_RED_RIBBON, + 113, + 0, + RIBBON_RED, + 7 | 0x8000 + }, { + MON_DATA_GREEN_RIBBON, + 114, + 3, + RIBBON_GREEN, + 8 | 0x8000 + }, { + MON_DATA_BLUE_RIBBON, + 115, + 1, + RIBBON_BLUE, + 9 | 0x8000 + }, { + MON_DATA_FESTIVAL_RIBBON, + 116, + 1, + RIBBON_FESTIVAL, + 10 | 0x8000 + }, { + MON_DATA_CARNIVAL_RIBBON, + 117, + 0, + RIBBON_CARNIVAL, + 11 | 0x8000 + }, { + MON_DATA_CLASSIC_RIBBON, + 118, + 1, + RIBBON_CLASSIC, + 12 | 0x8000 + }, { + MON_DATA_PREMIER_RIBBON, + 119, + 0, + RIBBON_PREMIER, + 13 | 0x8000 } }; @@ -502,15 +502,15 @@ u32 FUN_0207FC5C(u8 a0, u32 a1) switch (a1) { case 0: - return UNK_020FB788[a0].unk_0; + return UNK_020FB788[a0].monDataId; case 1: - return UNK_020FB788[a0].unk_4; + return UNK_020FB788[a0].gfxId; case 2: - return UNK_020FB788[a0].unk_6; + return UNK_020FB788[a0].palId; case 3: - return UNK_020FB788[a0].unk_8; + return UNK_020FB788[a0].nameIdx; case 4: - return UNK_020FB788[a0].unk_A; + return UNK_020FB788[a0].descIdx; default: return 0; } @@ -518,7 +518,7 @@ u32 FUN_0207FC5C(u8 a0, u32 a1) int FUN_0207FCC0(u8 * a0, u32 a1) { - int ret = (int)UNK_020FB788[a1].unk_A; + int ret = (int)UNK_020FB788[a1].descIdx; if (ret & 0x8000) ret = a0[(u8)ret] + 0x92; return ret; @@ -526,7 +526,7 @@ int FUN_0207FCC0(u8 * a0, u32 a1) u8 FUN_0207FCE0(u32 a0) { - int ret = (int)UNK_020FB788[a0].unk_A; + int ret = (int)UNK_020FB788[a0].descIdx; if (ret & 0x8000) return (u8)ret; return 0xFF; -- cgit v1.2.3