diff options
Diffstat (limited to 'arm9')
| -rw-r--r-- | arm9/asm/MSL_Common_direct_io.s | 2 | ||||
| -rw-r--r-- | arm9/asm/RUNTIME_ARM_semihosted_console_io.s | 2 | ||||
| -rw-r--r-- | arm9/src/pokemon.c | 2 | ||||
| -rw-r--r-- | arm9/src/trainer_data.c | 11 |
4 files changed, 8 insertions, 9 deletions
diff --git a/arm9/asm/MSL_Common_direct_io.s b/arm9/asm/MSL_Common_direct_io.s index bc803a3f..8a493303 100644 --- a/arm9/asm/MSL_Common_direct_io.s +++ b/arm9/asm/MSL_Common_direct_io.s @@ -502,4 +502,4 @@ _020DEC5C: exception fread, 269, 0x00407F00
exception __fread, 841, 0x00507F00
- exception __fwrite, 689, 0x0060FF00
\ No newline at end of file + exception __fwrite, 689, 0x0060FF00
diff --git a/arm9/asm/RUNTIME_ARM_semihosted_console_io.s b/arm9/asm/RUNTIME_ARM_semihosted_console_io.s index 6e7ddf0b..b36cee70 100644 --- a/arm9/asm/RUNTIME_ARM_semihosted_console_io.s +++ b/arm9/asm/RUNTIME_ARM_semihosted_console_io.s @@ -75,4 +75,4 @@ __close_console: ; 0x020EC68C bx lr
exception __read_console, 81, 0x00300F00
- exception __write_console, 53, 0x00200700
\ No newline at end of file + exception __write_console, 53, 0x00200700
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 672b47e6..a15a8b12 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -2446,7 +2446,7 @@ void FUN_02069038(u32 a0, u32 a1, u32 a2, s32 a3, u32 a4, u32 a5, u32 a6) void FUN_020690AC(struct SomeDrawPokemonStruct * a0, u32 a1) { - a0->unk0 = 60; + a0->unk0 = NARC_POKETOOL_TRGRA_TRFGRA; a0->unk2 = (u16)(a1 * 2); a0->unk4 = (u16)(a1 * 2 + 1); a0->unk6 = 0; diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c index fb941278..fbb477ac 100644 --- a/arm9/src/trainer_data.c +++ b/arm9/src/trainer_data.c @@ -20,7 +20,6 @@ void EnemyTrainerSet_Init(struct BattleSetupStruct * enemies, struct SaveBlock2 s32 i; struct String * str; - // FIXME: String formatting in files/msgdata/msg/narc_0559.txt is abnormal. msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 559, heap_id); rivalName = GetRivalNamePtr(FUN_02024EC0(sav2)); for (i = 0; i < 4; i++) @@ -244,11 +243,11 @@ const u8 sTrainerClassGenderCountTbl[] = { /*TRAINER_CLASS_COMMANDER_JUPITER*/ 1, /*TRAINER_CLASS_COMMANDER_SATURN*/ 1, /*TRAINER_CLASS_GALACTIC_F*/ 1, - /*TRAINER_CLASS_PKMN_TRAINER_CHERYL*/ 1, - /*TRAINER_CLASS_PKMN_TRAINER_RILEY*/ 0, - /*TRAINER_CLASS_PKMN_TRAINER_MARLEY*/ 1, - /*TRAINER_CLASS_PKMN_TRAINER_BUCK*/ 0, - /*TRAINER_CLASS_PKMN_TRAINER_MIRA*/ 1, + /*TRAINER_CLASS_PKMN_TRAINER_CHERYL*/ 1, + /*TRAINER_CLASS_PKMN_TRAINER_RILEY*/ 0, + /*TRAINER_CLASS_PKMN_TRAINER_MARLEY*/ 1, + /*TRAINER_CLASS_PKMN_TRAINER_BUCK*/ 0, + /*TRAINER_CLASS_PKMN_TRAINER_MIRA*/ 1, /*TRAINER_CLASS_PKMN_TRAINER_LUCAS*/ 0, /*TRAINER_CLASS_PKMN_TRAINER_DAWN*/ 1, /*TRAINER_CLASS_TOWER_TYCOON*/ 0 |