From 404468ee06cd8f949bb48ca44336ee2010524f5a Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 4 Dec 2025 22:19:27 -0500 Subject: [PATCH] Moved IQ_GROUP_SKILLS to C --- asm/include/main_rodata_020A1BB0.inc | 1 - asm/include/main_rodata_020A20B1.inc | 1 + asm/main_rodata_020A1BB0.s | 181 ----------- asm/main_rodata_020A20B1.s | 157 ++++++++++ include/iq_skills.h | 6 + main.lsf | 2 + src/iq_skills.c | 447 +++++++++++++++++++++++++++ src/type_matchup_table.c | 3 +- 8 files changed, 615 insertions(+), 183 deletions(-) create mode 100644 asm/include/main_rodata_020A20B1.inc create mode 100644 asm/main_rodata_020A20B1.s create mode 100644 include/iq_skills.h create mode 100644 src/iq_skills.c diff --git a/asm/include/main_rodata_020A1BB0.inc b/asm/include/main_rodata_020A1BB0.inc index 3f59c932..6f70f09b 100644 --- a/asm/include/main_rodata_020A1BB0.inc +++ b/asm/include/main_rodata_020A1BB0.inc @@ -1,2 +1 @@ #pragma once - diff --git a/asm/include/main_rodata_020A20B1.inc b/asm/include/main_rodata_020A20B1.inc new file mode 100644 index 00000000..6f70f09b --- /dev/null +++ b/asm/include/main_rodata_020A20B1.inc @@ -0,0 +1 @@ +#pragma once diff --git a/asm/main_rodata_020A1BB0.s b/asm/main_rodata_020A1BB0.s index 957570e7..8f61c4c3 100644 --- a/asm/main_rodata_020A1BB0.s +++ b/asm/main_rodata_020A1BB0.s @@ -38,184 +38,3 @@ IQ_SKILLS: .byte 0xB6, 0x03, 0x00, 0x00, 0x54, 0x01, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00, 0x0F, 0x27, 0x00, 0x00 .byte 0x5E, 0x01, 0x00, 0x00, 0x68, 0x01, 0x00, 0x00, 0xB8, 0x01, 0x00, 0x00, 0x44, 0x02, 0x00, 0x00 .byte 0x52, 0x03, 0x00, 0x00, 0x72, 0x01, 0x00, 0x00, 0x0F, 0x27, 0x00, 0x00 - .global IQ_GROUP_SKILLS -IQ_GROUP_SKILLS: - .byte 0x18, 0x1A, 0x1B, 0x1F - .byte 0x25, 0x26, 0x36, 0x39, 0x3E, 0x41, 0x42, 0x43, 0x16, 0x03, 0x07, 0x08, 0x01, 0x17, 0x15, 0x0C - .byte 0x0F, 0x14, 0x02, 0x11, 0xFF, 0x18, 0x1B, 0x1E, 0x20, 0x26, 0x2E, 0x32, 0x33, 0x34, 0x37, 0x3E - .byte 0x42, 0x16, 0x03, 0x07, 0x08, 0x01, 0x17, 0x15, 0x0F, 0x13, 0x02, 0x11, 0x14, 0xFF, 0x18, 0x22 - .byte 0x24, 0x25, 0x28, 0x2C, 0x2F, 0x30, 0x31, 0x38, 0x3B, 0x3C, 0x3F, 0x42, 0x16, 0x03, 0x07, 0x08 - .byte 0x01, 0x17, 0x09, 0x02, 0x11, 0x14, 0xFF, 0x18, 0x1A, 0x1D, 0x1F, 0x27, 0x28, 0x2B, 0x2E, 0x30 - .byte 0x3C, 0x3F, 0x40, 0x16, 0x03, 0x07, 0x08, 0x17, 0x15, 0x0E, 0x12, 0x13, 0x02, 0x05, 0x14, 0xFF - .byte 0x18, 0x20, 0x23, 0x24, 0x25, 0x27, 0x2D, 0x2F, 0x32, 0x34, 0x35, 0x37, 0x38, 0x16, 0x03, 0x07 - .byte 0x08, 0x04, 0x17, 0x0A, 0x0F, 0x02, 0x10, 0x14, 0xFF, 0x18, 0x1A, 0x1C, 0x1D, 0x1F, 0x26, 0x29 - .byte 0x2C, 0x2D, 0x2E, 0x39, 0x42, 0x16, 0x03, 0x07, 0x08, 0x01, 0x17, 0x0B, 0x0C, 0x0F, 0x12, 0x14 - .byte 0x02, 0xFF, 0x18, 0x1A, 0x1C, 0x1F, 0x29, 0x2B, 0x35, 0x36, 0x3B, 0x3C, 0x40, 0x41, 0x16, 0x03 - .byte 0x07, 0x08, 0x17, 0x09, 0x0E, 0x12, 0x13, 0x02, 0x05, 0x14, 0xFF, 0x18, 0x1B, 0x1E, 0x20, 0x26 - .byte 0x2D, 0x33, 0x34, 0x35, 0x37, 0x38, 0x40, 0x16, 0x03, 0x07, 0x08, 0x17, 0x0A, 0x0C, 0x0F, 0x12 - .byte 0x14, 0x02, 0x05, 0xFF, 0x18, 0x16, 0x03, 0x07, 0x08, 0x17, 0x02, 0x14, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x18, 0x16, 0x03 - .byte 0x07, 0x08, 0x17, 0x02, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x18, 0x1D, 0x22, 0x24, 0x25, 0x28, 0x1F, 0x2F, 0x35, 0x37 - .byte 0x3A, 0x3C, 0x16, 0x03, 0x07, 0x08, 0x17, 0x09, 0x0C, 0x0F, 0x12, 0x14, 0x02, 0x05, 0xFF, 0x18 - .byte 0x1A, 0x1F, 0x23, 0x24, 0x29, 0x2D, 0x2E, 0x30, 0x39, 0x3C, 0x41, 0x16, 0x03, 0x07, 0x08, 0x04 - .byte 0x17, 0x0B, 0x0D, 0x0F, 0x14, 0x02, 0x10, 0xFF, 0x18, 0x16, 0x03, 0x07, 0x08, 0x17, 0x02, 0x14 - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0xFF, 0x18, 0x16, 0x03, 0x07, 0x08, 0x17, 0x02, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x18, 0x16, 0x03, 0x07, 0x08, 0x17 - .byte 0x02, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0xFF, 0xFF, 0xFF, 0x18, 0x16, 0x03, 0x07, 0x08, 0x17, 0x02, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .global MONEY_QUANTITY_TABLE -MONEY_QUANTITY_TABLE: - .byte 0x02, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x0D, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00 - .byte 0x2B, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x3B, 0x00, 0x00, 0x00 - .byte 0x3E, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00 - .byte 0x50, 0x00, 0x00, 0x00, 0x53, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00 - .byte 0x65, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x00, 0x00 - .byte 0x71, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00, 0x00 - .byte 0x8B, 0x00, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00, 0x9D, 0x00, 0x00, 0x00 - .byte 0xA3, 0x00, 0x00, 0x00, 0xA8, 0x00, 0x00, 0x00, 0xAD, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00 - .byte 0xB4, 0x00, 0x00, 0x00, 0xBE, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0x00, 0xC5, 0x00, 0x00, 0x00 - .byte 0xC7, 0x00, 0x00, 0x00, 0xD4, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0xE3, 0x00, 0x00, 0x00 - .byte 0xE6, 0x00, 0x00, 0x00, 0xE9, 0x00, 0x00, 0x00, 0xEE, 0x00, 0x00, 0x00, 0xF1, 0x00, 0x00, 0x00 - .byte 0xFA, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x07, 0x01, 0x00, 0x00, 0x0D, 0x01, 0x00, 0x00 - .byte 0x10, 0x01, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0x1A, 0x01, 0x00, 0x00, 0x1C, 0x01, 0x00, 0x00 - .byte 0x25, 0x01, 0x00, 0x00, 0x33, 0x01, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, 0x39, 0x01, 0x00, 0x00 - .byte 0x3D, 0x01, 0x00, 0x00, 0x4C, 0x01, 0x00, 0x00, 0x51, 0x01, 0x00, 0x00, 0x5C, 0x01, 0x00, 0x00 - .byte 0x5D, 0x01, 0x00, 0x00, 0x62, 0x01, 0x00, 0x00, 0x67, 0x01, 0x00, 0x00, 0x6F, 0x01, 0x00, 0x00 - .byte 0x76, 0x01, 0x00, 0x00, 0x7B, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x86, 0x01, 0x00, 0x00 - .byte 0x8D, 0x01, 0x00, 0x00, 0x91, 0x01, 0x00, 0x00, 0x9A, 0x01, 0x00, 0x00, 0xA3, 0x01, 0x00, 0x00 - .byte 0xA5, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB3, 0x01, 0x00, 0x00, 0xB8, 0x01, 0x00, 0x00 - .byte 0xBB, 0x01, 0x00, 0x00, 0xC2, 0x01, 0x00, 0x00, 0xC9, 0x01, 0x00, 0x00, 0xCE, 0x01, 0x00, 0x00 - .byte 0xD0, 0x01, 0x00, 0x00, 0xD3, 0x01, 0x00, 0x00, 0xDF, 0x01, 0x00, 0x00, 0xE8, 0x01, 0x00, 0x00 - .byte 0xEB, 0x01, 0x00, 0x00, 0xF3, 0x01, 0x00, 0x00, 0xF4, 0x01, 0x00, 0x00, 0x26, 0x02, 0x00, 0x00 - .byte 0x8A, 0x02, 0x00, 0x00, 0xEE, 0x02, 0x00, 0x00, 0x10, 0x27, 0x00, 0x00 - .global ARM9_UNKNOWN_TABLE__NA_20A20B0 -ARM9_UNKNOWN_TABLE__NA_20A20B0: - .byte 0x00 - .global _020A20B1 -_020A20B1: - .byte 0x00, 0x01, 0x01 - .byte 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x08, 0x08, 0x09, 0x09 - .byte 0x0A, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F, 0x10, 0x10, 0x11, 0x11 - .byte 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17, 0x18, 0x18, 0x19, 0x19 - .byte 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F, 0x20, 0x20, 0x21, 0x21 - .byte 0x22, 0x22, 0x23, 0x23, 0x24, 0x24, 0x25, 0x25, 0x26, 0x26, 0x27, 0x27, 0x28, 0x28, 0x29, 0x29 - .byte 0x2A, 0x2A, 0x2B, 0x2B, 0x2C, 0x2C, 0x2D, 0x2D, 0x2E, 0x2E, 0x2F, 0x2F, 0x30, 0x30, 0x31, 0x31 - .byte 0x32, 0x32, 0x33, 0x33, 0x34, 0x34, 0x35, 0x35, 0x36, 0x36, 0x37, 0x37, 0x38, 0x38, 0x39, 0x39 - .byte 0x3A, 0x3A, 0x3B, 0x3B, 0x3C, 0x3C, 0x3D, 0x3D, 0x3E, 0x3E, 0x3F, 0x3F, 0x40, 0x40, 0x41, 0x41 - .byte 0x42, 0x42, 0x43, 0x43, 0x44, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x47, 0x48, 0x48, 0x49, 0x49 - .byte 0x4A, 0x4A, 0x4B, 0x4B, 0x4C, 0x4C, 0x4D, 0x4D, 0x4E, 0x4E, 0x4F, 0x4F, 0x50, 0x50, 0x51, 0x51 - .byte 0x52, 0x52, 0x53, 0x53, 0x54, 0x54, 0x55, 0x55, 0x56, 0x56, 0x57, 0x57, 0x58, 0x58, 0x59, 0x59 - .byte 0x5A, 0x5A, 0x5B, 0x5B, 0x5C, 0x5C, 0x5D, 0x5D, 0x5E, 0x5E, 0x5F, 0x5F, 0x60, 0x60, 0x61, 0x61 - .byte 0x62, 0x62, 0x63, 0x63, 0x64, 0x64, 0x65, 0x65, 0x66, 0x66, 0x67, 0xFF, 0x68, 0xFF, 0x69, 0xB3 - .byte 0x6A, 0xFF, 0x6B, 0xFF, 0x6C, 0xFF, 0x6D, 0xFF, 0x6E, 0xFF, 0x6F, 0xFF, 0x70, 0xFF, 0x71, 0xFF - .byte 0x72, 0xFF, 0x73, 0xFF, 0x74, 0xFF, 0x75, 0xFF, 0x76, 0xFF, 0x77, 0xFF, 0x78, 0xFF, 0x79, 0xFF - .byte 0x7A, 0xFF, 0x7B, 0xFF, 0x7C, 0xFF, 0x7D, 0xFF, 0x7E, 0xB1, 0x7F, 0xB2, 0x80, 0xB4, 0x81, 0xB5 - .byte 0x82, 0xB6, 0x83, 0xB7, 0x84, 0xB8, 0x85, 0xB9, 0x86, 0xBA, 0x87, 0xBB, 0x88, 0xBC, 0x89, 0xBD - .byte 0x8A, 0xBE, 0x8B, 0xBF, 0x8C, 0xC0, 0x8D, 0xC1, 0x8E, 0xC2, 0x8F, 0xC3, 0x90, 0xC4, 0x91, 0xC5 - .byte 0x92, 0xC6, 0x93, 0xC7, 0x94, 0xC8, 0x95, 0xC9, 0x96, 0xCA, 0x97, 0xCB, 0x98, 0xCC, 0x99, 0xCD - .byte 0x9A, 0xCE, 0x9B, 0xCF, 0x9C, 0xD0, 0x9D, 0xD1, 0x9E, 0xD2, 0x9F, 0xD3, 0xA0, 0xD4, 0xA1, 0xD5 - .byte 0xA2, 0xD6, 0xA3, 0xD7, 0xA4, 0xD8, 0xA5, 0xD9, 0xA6, 0xDA, 0xA7, 0xDB, 0xA8, 0xDC, 0xA9, 0xDD - .byte 0xAA, 0xDE, 0xAB, 0xF1, 0xAC, 0xF2, 0xAD, 0xF7, 0xAE, 0xF8, 0xAF, 0xF9, 0xB0, 0xFA, 0xB1, 0xFF - .byte 0xB2, 0xFF, 0xB3, 0xFF, 0xB4, 0xFF, 0xB5, 0xFF, 0xB6, 0xFF, 0xB7, 0xFF, 0xB8, 0xFF, 0xB9, 0xFF - .byte 0xBA, 0xFF, 0xBB, 0xFF, 0xBC, 0xFF, 0xBD, 0xFF, 0xBE, 0xFF, 0xBF, 0xFF, 0xC0, 0xFF, 0xC1, 0xFF - .byte 0xC2, 0xFF, 0xC3, 0xFF, 0xC4, 0xFF, 0xC5, 0xFF, 0xC6, 0xFF, 0xC7, 0xFF, 0xC8, 0xFF, 0xC9, 0xFF - .byte 0xCA, 0xFF, 0xCB, 0xFF, 0xCC, 0xFF, 0xCD, 0xFF, 0xCE, 0xFF, 0xCF, 0xFF, 0xD0, 0xFF, 0xD1, 0xFF - .byte 0xD2, 0xFF, 0xD3, 0xFF, 0xD4, 0xFF, 0xD5, 0xFF, 0xD6, 0xFF, 0xD7, 0xFF, 0xD8, 0xFF, 0xD9, 0xFF - .byte 0xDA, 0xFF, 0xDB, 0xFF, 0xDC, 0xFF, 0xDD, 0xFF, 0xDE, 0xFF, 0xDF, 0xFF, 0xE0, 0xFF, 0xE1, 0xFF - .byte 0xE2, 0xFF, 0xE3, 0xFF, 0xE4, 0xFF, 0xE5, 0xFF, 0xE6, 0xFF, 0xE7, 0xFF, 0xE8, 0xFF, 0xE9, 0xFF - .byte 0xEA, 0xFF, 0xEB, 0xFF, 0xEC, 0xFF, 0xED, 0xFF, 0xEE, 0xFF, 0xEF, 0xFF, 0xF0, 0xFF, 0xF1, 0xFF - .byte 0xF2, 0xFF, 0xF3, 0xFF, 0xF4, 0xFF, 0xF5, 0xFF, 0xF6, 0xFF, 0xF7, 0xFF, 0xF8, 0xFF, 0xF9, 0xFF - .byte 0xFA, 0xFF, 0xFB, 0xFF, 0xFC, 0xFF, 0xFD, 0xFF, 0xFE, 0xFE, 0xFF, 0xFF - .global IQ_GUMMI_GAIN_TABLE -IQ_GUMMI_GAIN_TABLE: - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x01, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00 - .byte 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x05, 0x00 - .byte 0x04, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00 - .byte 0x04, 0x00, 0x02, 0x00, 0x05, 0x00, 0x02, 0x00, 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x02, 0x00 - .byte 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x05, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x04, 0x00 - .byte 0x02, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x05, 0x00, 0x04, 0x00 - .byte 0x03, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x03, 0x00 - .byte 0x02, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 - .byte 0x04, 0x00, 0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x05, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00 - .byte 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00 - .byte 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00 - .byte 0x04, 0x00, 0x03, 0x00, 0x05, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00 - .byte 0x02, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00 - .byte 0x05, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x02, 0x00 - .byte 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x01, 0x00, 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00 - .byte 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 - .byte 0x01, 0x00, 0x04, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 - .byte 0x02, 0x00, 0x05, 0x00 - .global GUMMI_BELLY_RESTORE_TABLE -GUMMI_BELLY_RESTORE_TABLE: - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x05, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00 - .byte 0x1E, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00 - .byte 0x00, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x14, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x0A, 0x00 - .byte 0x14, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0F, 0x00 - .byte 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00 - .byte 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x1E, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x0F, 0x00 - .byte 0x0A, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00 - .byte 0x14, 0x00, 0x05, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x05, 0x00 - .byte 0x1E, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 - .byte 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00 - .byte 0x14, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x14, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x14, 0x00 - .byte 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x00, 0x00, 0x05, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x05, 0x00, 0x0A, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00 - .byte 0x00, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x1E, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 - .byte 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x05, 0x00, 0x14, 0x00, 0x0F, 0x00 - .byte 0x0A, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00 - .byte 0x0A, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x05, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0A, 0x00 - .byte 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x1E, 0x00 diff --git a/asm/main_rodata_020A20B1.s b/asm/main_rodata_020A20B1.s new file mode 100644 index 00000000..99af67b0 --- /dev/null +++ b/asm/main_rodata_020A20B1.s @@ -0,0 +1,157 @@ + .include "asm/macros.inc" + .include "main_rodata_020A20B1.inc" + + .rodata + .global MONEY_QUANTITY_TABLE +MONEY_QUANTITY_TABLE: + .byte 0x02, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 + .byte 0x0D, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00 + .byte 0x1D, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00 + .byte 0x2B, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x3B, 0x00, 0x00, 0x00 + .byte 0x3E, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00 + .byte 0x50, 0x00, 0x00, 0x00, 0x53, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00 + .byte 0x65, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x00, 0x00 + .byte 0x71, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00, 0x00 + .byte 0x8B, 0x00, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00, 0x9D, 0x00, 0x00, 0x00 + .byte 0xA3, 0x00, 0x00, 0x00, 0xA8, 0x00, 0x00, 0x00, 0xAD, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00 + .byte 0xB4, 0x00, 0x00, 0x00, 0xBE, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0x00, 0xC5, 0x00, 0x00, 0x00 + .byte 0xC7, 0x00, 0x00, 0x00, 0xD4, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0xE3, 0x00, 0x00, 0x00 + .byte 0xE6, 0x00, 0x00, 0x00, 0xE9, 0x00, 0x00, 0x00, 0xEE, 0x00, 0x00, 0x00, 0xF1, 0x00, 0x00, 0x00 + .byte 0xFA, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x07, 0x01, 0x00, 0x00, 0x0D, 0x01, 0x00, 0x00 + .byte 0x10, 0x01, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0x1A, 0x01, 0x00, 0x00, 0x1C, 0x01, 0x00, 0x00 + .byte 0x25, 0x01, 0x00, 0x00, 0x33, 0x01, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, 0x39, 0x01, 0x00, 0x00 + .byte 0x3D, 0x01, 0x00, 0x00, 0x4C, 0x01, 0x00, 0x00, 0x51, 0x01, 0x00, 0x00, 0x5C, 0x01, 0x00, 0x00 + .byte 0x5D, 0x01, 0x00, 0x00, 0x62, 0x01, 0x00, 0x00, 0x67, 0x01, 0x00, 0x00, 0x6F, 0x01, 0x00, 0x00 + .byte 0x76, 0x01, 0x00, 0x00, 0x7B, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x86, 0x01, 0x00, 0x00 + .byte 0x8D, 0x01, 0x00, 0x00, 0x91, 0x01, 0x00, 0x00, 0x9A, 0x01, 0x00, 0x00, 0xA3, 0x01, 0x00, 0x00 + .byte 0xA5, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB3, 0x01, 0x00, 0x00, 0xB8, 0x01, 0x00, 0x00 + .byte 0xBB, 0x01, 0x00, 0x00, 0xC2, 0x01, 0x00, 0x00, 0xC9, 0x01, 0x00, 0x00, 0xCE, 0x01, 0x00, 0x00 + .byte 0xD0, 0x01, 0x00, 0x00, 0xD3, 0x01, 0x00, 0x00, 0xDF, 0x01, 0x00, 0x00, 0xE8, 0x01, 0x00, 0x00 + .byte 0xEB, 0x01, 0x00, 0x00, 0xF3, 0x01, 0x00, 0x00, 0xF4, 0x01, 0x00, 0x00, 0x26, 0x02, 0x00, 0x00 + .byte 0x8A, 0x02, 0x00, 0x00, 0xEE, 0x02, 0x00, 0x00, 0x10, 0x27, 0x00, 0x00 + .global ARM9_UNKNOWN_TABLE__NA_20A20B0 +ARM9_UNKNOWN_TABLE__NA_20A20B0: + .byte 0x00 + .global _020A20B1 +_020A20B1: + .byte 0x00, 0x01, 0x01 + .byte 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x08, 0x08, 0x09, 0x09 + .byte 0x0A, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F, 0x10, 0x10, 0x11, 0x11 + .byte 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17, 0x18, 0x18, 0x19, 0x19 + .byte 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F, 0x20, 0x20, 0x21, 0x21 + .byte 0x22, 0x22, 0x23, 0x23, 0x24, 0x24, 0x25, 0x25, 0x26, 0x26, 0x27, 0x27, 0x28, 0x28, 0x29, 0x29 + .byte 0x2A, 0x2A, 0x2B, 0x2B, 0x2C, 0x2C, 0x2D, 0x2D, 0x2E, 0x2E, 0x2F, 0x2F, 0x30, 0x30, 0x31, 0x31 + .byte 0x32, 0x32, 0x33, 0x33, 0x34, 0x34, 0x35, 0x35, 0x36, 0x36, 0x37, 0x37, 0x38, 0x38, 0x39, 0x39 + .byte 0x3A, 0x3A, 0x3B, 0x3B, 0x3C, 0x3C, 0x3D, 0x3D, 0x3E, 0x3E, 0x3F, 0x3F, 0x40, 0x40, 0x41, 0x41 + .byte 0x42, 0x42, 0x43, 0x43, 0x44, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x47, 0x48, 0x48, 0x49, 0x49 + .byte 0x4A, 0x4A, 0x4B, 0x4B, 0x4C, 0x4C, 0x4D, 0x4D, 0x4E, 0x4E, 0x4F, 0x4F, 0x50, 0x50, 0x51, 0x51 + .byte 0x52, 0x52, 0x53, 0x53, 0x54, 0x54, 0x55, 0x55, 0x56, 0x56, 0x57, 0x57, 0x58, 0x58, 0x59, 0x59 + .byte 0x5A, 0x5A, 0x5B, 0x5B, 0x5C, 0x5C, 0x5D, 0x5D, 0x5E, 0x5E, 0x5F, 0x5F, 0x60, 0x60, 0x61, 0x61 + .byte 0x62, 0x62, 0x63, 0x63, 0x64, 0x64, 0x65, 0x65, 0x66, 0x66, 0x67, 0xFF, 0x68, 0xFF, 0x69, 0xB3 + .byte 0x6A, 0xFF, 0x6B, 0xFF, 0x6C, 0xFF, 0x6D, 0xFF, 0x6E, 0xFF, 0x6F, 0xFF, 0x70, 0xFF, 0x71, 0xFF + .byte 0x72, 0xFF, 0x73, 0xFF, 0x74, 0xFF, 0x75, 0xFF, 0x76, 0xFF, 0x77, 0xFF, 0x78, 0xFF, 0x79, 0xFF + .byte 0x7A, 0xFF, 0x7B, 0xFF, 0x7C, 0xFF, 0x7D, 0xFF, 0x7E, 0xB1, 0x7F, 0xB2, 0x80, 0xB4, 0x81, 0xB5 + .byte 0x82, 0xB6, 0x83, 0xB7, 0x84, 0xB8, 0x85, 0xB9, 0x86, 0xBA, 0x87, 0xBB, 0x88, 0xBC, 0x89, 0xBD + .byte 0x8A, 0xBE, 0x8B, 0xBF, 0x8C, 0xC0, 0x8D, 0xC1, 0x8E, 0xC2, 0x8F, 0xC3, 0x90, 0xC4, 0x91, 0xC5 + .byte 0x92, 0xC6, 0x93, 0xC7, 0x94, 0xC8, 0x95, 0xC9, 0x96, 0xCA, 0x97, 0xCB, 0x98, 0xCC, 0x99, 0xCD + .byte 0x9A, 0xCE, 0x9B, 0xCF, 0x9C, 0xD0, 0x9D, 0xD1, 0x9E, 0xD2, 0x9F, 0xD3, 0xA0, 0xD4, 0xA1, 0xD5 + .byte 0xA2, 0xD6, 0xA3, 0xD7, 0xA4, 0xD8, 0xA5, 0xD9, 0xA6, 0xDA, 0xA7, 0xDB, 0xA8, 0xDC, 0xA9, 0xDD + .byte 0xAA, 0xDE, 0xAB, 0xF1, 0xAC, 0xF2, 0xAD, 0xF7, 0xAE, 0xF8, 0xAF, 0xF9, 0xB0, 0xFA, 0xB1, 0xFF + .byte 0xB2, 0xFF, 0xB3, 0xFF, 0xB4, 0xFF, 0xB5, 0xFF, 0xB6, 0xFF, 0xB7, 0xFF, 0xB8, 0xFF, 0xB9, 0xFF + .byte 0xBA, 0xFF, 0xBB, 0xFF, 0xBC, 0xFF, 0xBD, 0xFF, 0xBE, 0xFF, 0xBF, 0xFF, 0xC0, 0xFF, 0xC1, 0xFF + .byte 0xC2, 0xFF, 0xC3, 0xFF, 0xC4, 0xFF, 0xC5, 0xFF, 0xC6, 0xFF, 0xC7, 0xFF, 0xC8, 0xFF, 0xC9, 0xFF + .byte 0xCA, 0xFF, 0xCB, 0xFF, 0xCC, 0xFF, 0xCD, 0xFF, 0xCE, 0xFF, 0xCF, 0xFF, 0xD0, 0xFF, 0xD1, 0xFF + .byte 0xD2, 0xFF, 0xD3, 0xFF, 0xD4, 0xFF, 0xD5, 0xFF, 0xD6, 0xFF, 0xD7, 0xFF, 0xD8, 0xFF, 0xD9, 0xFF + .byte 0xDA, 0xFF, 0xDB, 0xFF, 0xDC, 0xFF, 0xDD, 0xFF, 0xDE, 0xFF, 0xDF, 0xFF, 0xE0, 0xFF, 0xE1, 0xFF + .byte 0xE2, 0xFF, 0xE3, 0xFF, 0xE4, 0xFF, 0xE5, 0xFF, 0xE6, 0xFF, 0xE7, 0xFF, 0xE8, 0xFF, 0xE9, 0xFF + .byte 0xEA, 0xFF, 0xEB, 0xFF, 0xEC, 0xFF, 0xED, 0xFF, 0xEE, 0xFF, 0xEF, 0xFF, 0xF0, 0xFF, 0xF1, 0xFF + .byte 0xF2, 0xFF, 0xF3, 0xFF, 0xF4, 0xFF, 0xF5, 0xFF, 0xF6, 0xFF, 0xF7, 0xFF, 0xF8, 0xFF, 0xF9, 0xFF + .byte 0xFA, 0xFF, 0xFB, 0xFF, 0xFC, 0xFF, 0xFD, 0xFF, 0xFE, 0xFE, 0xFF, 0xFF + .global IQ_GUMMI_GAIN_TABLE +IQ_GUMMI_GAIN_TABLE: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x01, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00 + .byte 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x05, 0x00 + .byte 0x04, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00 + .byte 0x04, 0x00, 0x02, 0x00, 0x05, 0x00, 0x02, 0x00, 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x02, 0x00 + .byte 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x05, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x04, 0x00 + .byte 0x02, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x05, 0x00, 0x04, 0x00 + .byte 0x03, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x03, 0x00 + .byte 0x02, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 + .byte 0x04, 0x00, 0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x05, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00 + .byte 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00 + .byte 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00 + .byte 0x04, 0x00, 0x03, 0x00, 0x05, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00 + .byte 0x02, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x02, 0x00, 0x03, 0x00 + .byte 0x05, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x02, 0x00 + .byte 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x01, 0x00, 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00 + .byte 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 + .byte 0x01, 0x00, 0x04, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 + .byte 0x02, 0x00, 0x05, 0x00 + .global GUMMI_BELLY_RESTORE_TABLE +GUMMI_BELLY_RESTORE_TABLE: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x05, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00 + .byte 0x1E, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00 + .byte 0x00, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x14, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x0A, 0x00 + .byte 0x14, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0F, 0x00 + .byte 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00 + .byte 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x1E, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x0F, 0x00 + .byte 0x0A, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00 + .byte 0x14, 0x00, 0x05, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x05, 0x00 + .byte 0x1E, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 + .byte 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0A, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00 + .byte 0x14, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x14, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x14, 0x00 + .byte 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x00, 0x00, 0x05, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x05, 0x00, 0x0A, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00 + .byte 0x00, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x1E, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 + .byte 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x05, 0x00, 0x14, 0x00, 0x0F, 0x00 + .byte 0x0A, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x0F, 0x00 + .byte 0x0A, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x05, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0A, 0x00 + .byte 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x1E, 0x00 diff --git a/include/iq_skills.h b/include/iq_skills.h new file mode 100644 index 00000000..17b5ba4a --- /dev/null +++ b/include/iq_skills.h @@ -0,0 +1,6 @@ +#ifndef PMDSKY_IQ_SKILLS_H +#define PMDSKY_IQ_SKILLS_H + +extern const u8 IQ_GROUP_SKILLS[16][25]; + +#endif //PMDSKY_IQ_SKILLS_H diff --git a/main.lsf b/main.lsf index c5caabcd..8b3d3af7 100644 --- a/main.lsf +++ b/main.lsf @@ -110,6 +110,8 @@ Static main Object asm/main_rodata_020A190C.o Object src/secondary_terrain_types.o Object asm/main_rodata_020A1BB0.o + Object src/iq_skills.o + Object asm/main_rodata_020A20B1.o Object src/main_020517D4.o Object asm/main_020517F4.o Object src/main_020526EC.o diff --git a/src/iq_skills.c b/src/iq_skills.c new file mode 100644 index 00000000..a6021cb8 --- /dev/null +++ b/src/iq_skills.c @@ -0,0 +1,447 @@ +#include "iq_skills.h" +#include "enums.h" + +const u8 IQ_GROUP_SKILLS[16][25] = +{ + // Group A + { + IQ_ESCAPIST, + IQ_STAIR_SENSOR, + IQ_COIN_WATCHER, + IQ_PP_SAVER, + IQ_SURVIVALIST, + IQ_TRAP_BUSTER, + IQ_ACUTE_SNIFFER, + IQ_MULTITALENT, + IQ_HAGGLER, + IQ_MAP_SURVEYOR, + IQ_PIERCE_HURLER, + IQ_COLLECTOR, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_TYPE_ADVANTAGE_MASTER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_DEDICATED_TRAVELER, + IQ_ALL_TERRAIN_HIKER, + IQ_HOUSE_AVOIDER, + IQ_LAVA_EVADER, + IQ_ITEM_CATCHER, + IQ_NONSLEEPER, + IQ_NONE_2 + }, + // Group B + { + IQ_ESCAPIST, + IQ_COIN_WATCHER, + IQ_FAST_FRIEND, + IQ_BODYGUARD, + IQ_TRAP_BUSTER, + IQ_GAP_PROBER, + IQ_CHEERLEADER, + IQ_NATURE_GIFTER, + IQ_WISE_HEALER, + IQ_DEEP_BREATHER, + IQ_HAGGLER, + IQ_PIERCE_HURLER, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_TYPE_ADVANTAGE_MASTER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_DEDICATED_TRAVELER, + IQ_HOUSE_AVOIDER, + IQ_TRAP_SEER, + IQ_ITEM_CATCHER, + IQ_NONSLEEPER, + IQ_LAVA_EVADER, + IQ_NONE_2 + }, + // Group C + { + IQ_ESCAPIST, + IQ_AGGRESSOR, + IQ_INTIMIDATOR, + IQ_SURVIVALIST, + IQ_EXTRA_STRIKER, + IQ_NO_CHARGER, + IQ_POWER_PITCHER, + IQ_CONCENTRATOR, + IQ_COUNTER_BASHER, + IQ_BRICK_TOUGH, + IQ_ERRATIC_PLAYER, + IQ_PRACTICE_SWINGER, + IQ_CLUTCH_PERFORMER, + IQ_PIERCE_HURLER, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_TYPE_ADVANTAGE_MASTER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_EXP_GO_GETTER, + IQ_ITEM_CATCHER, + IQ_NONSLEEPER, + IQ_LAVA_EVADER, + IQ_NONE_2 + }, + // Group D + { + IQ_ESCAPIST, + IQ_STAIR_SENSOR, + IQ_SHARPSHOOTER, + IQ_PP_SAVER, + IQ_COUNTER_HITTER, + IQ_EXTRA_STRIKER, + IQ_QUICK_STRIKER, + IQ_GAP_PROBER, + IQ_CONCENTRATOR, + IQ_PRACTICE_SWINGER, + IQ_CLUTCH_PERFORMER, + IQ_CRITICAL_DODGER, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_DEDICATED_TRAVELER, + IQ_TRAP_AVOIDER, + IQ_SELF_CURER, + IQ_TRAP_SEER, + IQ_ITEM_CATCHER, + IQ_QUICK_DODGER, + IQ_LAVA_EVADER, + IQ_NONE_2 + }, + // Group E + { + IQ_ESCAPIST, + IQ_BODYGUARD, + IQ_DEFENDER, + IQ_INTIMIDATOR, + IQ_SURVIVALIST, + IQ_COUNTER_HITTER, + IQ_WARY_FIGHTER, + IQ_POWER_PITCHER, + IQ_CHEERLEADER, + IQ_WISE_HEALER, + IQ_QUICK_HEALER, + IQ_DEEP_BREATHER, + IQ_BRICK_TOUGH, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_SURE_HIT_ATTACKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_EFFICIENCY_EXPERT, + IQ_HOUSE_AVOIDER, + IQ_ITEM_CATCHER, + IQ_ENERGY_SAVER, + IQ_LAVA_EVADER, + IQ_NONE_2 + }, + // Group F + { + IQ_ESCAPIST, + IQ_STAIR_SENSOR, + IQ_EXP_ELITE, + IQ_SHARPSHOOTER, + IQ_PP_SAVER, + IQ_TRAP_BUSTER, + IQ_HIT_AND_RUNNER, + IQ_NO_CHARGER, + IQ_WARY_FIGHTER, + IQ_GAP_PROBER, + IQ_MULTITALENT, + IQ_PIERCE_HURLER, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_TYPE_ADVANTAGE_MASTER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_WEAK_TYPE_PICKER, + IQ_ALL_TERRAIN_HIKER, + IQ_HOUSE_AVOIDER, + IQ_SELF_CURER, + IQ_LAVA_EVADER, + IQ_ITEM_CATCHER, + IQ_NONE_2 + }, + // Group G + { + IQ_ESCAPIST, + IQ_STAIR_SENSOR, + IQ_EXP_ELITE, + IQ_PP_SAVER, + IQ_HIT_AND_RUNNER, + IQ_QUICK_STRIKER, + IQ_QUICK_HEALER, + IQ_ACUTE_SNIFFER, + IQ_ERRATIC_PLAYER, + IQ_PRACTICE_SWINGER, + IQ_CRITICAL_DODGER, + IQ_MAP_SURVEYOR, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_EXP_GO_GETTER, + IQ_TRAP_AVOIDER, + IQ_SELF_CURER, + IQ_TRAP_SEER, + IQ_ITEM_CATCHER, + IQ_QUICK_DODGER, + IQ_LAVA_EVADER, + IQ_NONE_2 + }, + // Group H + { + IQ_ESCAPIST, + IQ_COIN_WATCHER, + IQ_FAST_FRIEND, + IQ_BODYGUARD, + IQ_TRAP_BUSTER, + IQ_WARY_FIGHTER, + IQ_NATURE_GIFTER, + IQ_WISE_HEALER, + IQ_QUICK_HEALER, + IQ_DEEP_BREATHER, + IQ_BRICK_TOUGH, + IQ_CRITICAL_DODGER, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_EFFICIENCY_EXPERT, + IQ_ALL_TERRAIN_HIKER, + IQ_HOUSE_AVOIDER, + IQ_SELF_CURER, + IQ_LAVA_EVADER, + IQ_ITEM_CATCHER, + IQ_QUICK_DODGER, + IQ_NONE_2 + }, + { + IQ_ESCAPIST, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_ITEM_CATCHER, + IQ_LAVA_EVADER, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2 + }, + { + IQ_ESCAPIST, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_ITEM_CATCHER, + IQ_LAVA_EVADER, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2 + }, + // Group I + { + IQ_ESCAPIST, + IQ_SHARPSHOOTER, + IQ_AGGRESSOR, + IQ_INTIMIDATOR, + IQ_SURVIVALIST, + IQ_EXTRA_STRIKER, + IQ_PP_SAVER, + IQ_POWER_PITCHER, + IQ_QUICK_HEALER, + IQ_DEEP_BREATHER, + IQ_TIME_TRIPPER, + IQ_PRACTICE_SWINGER, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_EXP_GO_GETTER, + IQ_ALL_TERRAIN_HIKER, + IQ_HOUSE_AVOIDER, + IQ_SELF_CURER, + IQ_LAVA_EVADER, + IQ_ITEM_CATCHER, + IQ_QUICK_DODGER, + IQ_NONE_2 + }, + // Group J + { + IQ_ESCAPIST, + IQ_STAIR_SENSOR, + IQ_PP_SAVER, + IQ_DEFENDER, + IQ_INTIMIDATOR, + IQ_HIT_AND_RUNNER, + IQ_WARY_FIGHTER, + IQ_GAP_PROBER, + IQ_CONCENTRATOR, + IQ_MULTITALENT, + IQ_PRACTICE_SWINGER, + IQ_MAP_SURVEYOR, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_SURE_HIT_ATTACKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_WEAK_TYPE_PICKER, + IQ_ABSOLUTE_MOVER, + IQ_HOUSE_AVOIDER, + IQ_LAVA_EVADER, + IQ_ITEM_CATCHER, + IQ_ENERGY_SAVER, + IQ_NONE_2 + }, + { + IQ_ESCAPIST, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_ITEM_CATCHER, + IQ_LAVA_EVADER, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2 + }, + { + IQ_ESCAPIST, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_ITEM_CATCHER, + IQ_LAVA_EVADER, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2 + }, + { + IQ_ESCAPIST, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_ITEM_CATCHER, + IQ_LAVA_EVADER, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2 + }, + { + IQ_ESCAPIST, + IQ_ITEM_MASTER, + IQ_COURSE_CHECKER, + IQ_NONTRAITOR, + IQ_STATUS_CHECKER, + IQ_EXCLUSIVE_MOVE_USER, + IQ_ITEM_CATCHER, + IQ_LAVA_EVADER, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2, + IQ_NONE_2} +}; diff --git a/src/type_matchup_table.c b/src/type_matchup_table.c index cc50ba4e..75385383 100644 --- a/src/type_matchup_table.c +++ b/src/type_matchup_table.c @@ -6,7 +6,8 @@ #define NEUTRAL MATCHUP_NEUTRAL #define SUPER MATCHUP_SUPER_EFFECTIVE -const struct type_matchup_table TYPE_MATCHUP_TABLE = { +const struct type_matchup_table TYPE_MATCHUP_TABLE = +{ { // NONE NORMAL FIRE WATER GRASS ELECTRIC ICE FIGHTING POISON GROUND FLYING PSYCHIC BUG ROCK GHOST DRAGON DARK STEEL [TYPE_NONE] = {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL},