diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-09-06 09:21:29 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-09-06 09:21:29 -0400 |
| commit | 217fcecda5c9ed46ea274b57465d85b9b59eb86b (patch) | |
| tree | 8182cc4ca1a96841183c6c2ad3aa2c1be887d232 /arm9/src | |
| parent | 0d9bae230d89aae4872911ebdd66cf3c8ff4a220 (diff) | |
Use naix in unk_020139D8
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/unk_020139D8.c | 23 | ||||
| -rw-r--r-- | arm9/src/unk_02022450.c | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/arm9/src/unk_020139D8.c b/arm9/src/unk_020139D8.c index 796190b2..d88ca02d 100644 --- a/arm9/src/unk_020139D8.c +++ b/arm9/src/unk_020139D8.c @@ -4,6 +4,7 @@ #include "save_block_2.h" #include "math_util.h" #include "unk_020139D8.h" +#include "msgdata/msg.naix" #pragma thumb on @@ -17,17 +18,17 @@ const u8 sNarcLanguages[][2] = { }; const u16 sNarcMsgBanks[] = { - 362, // Species names - 589, // Move names - 565, // Type names - 553, // Ability names - 388, // Trainer - 389, // People - 390, // Greetings - 391, // Lifestyle - 392, // Feelings - 393, // Tough words - 394 // Union + NARC_msg_narc_0362_bin, // Species names + NARC_msg_narc_0589_bin, // Move names + NARC_msg_narc_0565_bin, // Type names + NARC_msg_narc_0553_bin, // Ability names + NARC_msg_narc_0388_bin, // Trainer + NARC_msg_narc_0389_bin, // People + NARC_msg_narc_0390_bin, // Greetings + NARC_msg_narc_0391_bin, // Lifestyle + NARC_msg_narc_0392_bin, // Feelings + NARC_msg_narc_0393_bin, // Tough words + NARC_msg_narc_0394_bin // Union }; const u16 sNarcMsgCounts[] = { diff --git a/arm9/src/unk_02022450.c b/arm9/src/unk_02022450.c index 2c5b9417..328ddfbd 100644 --- a/arm9/src/unk_02022450.c +++ b/arm9/src/unk_02022450.c @@ -23,7 +23,7 @@ static const char arc_name[] = "rom"; // Multichar constants are encoded big-endian, // but this is a little-endian machine. #define ROM_CODE_ADAJ_BE 'JADA' -#define MAKER_CODE_01_BE '01' +#define MAKER_CODE_01_BE '10' /*Replacing (HW_MAIN_MEM_SHARED + 0xC) or (HW_MAIN_MEM_SHARED + 0x10) or defining ADAJ or 01 constants causes match failure*/ THUMB_FUNC void FUN_02022450() { |