diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-12-17 19:28:07 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-12-17 19:28:07 -0500 |
| commit | 3fd325f0aa9d7ad402c77c596ef7d0b38d50803f (patch) | |
| tree | 756d584ec8a55ca40ad2e56816d90a9992d22874 /arm9/src | |
| parent | 5429ef6348af7a3a4521e7806dff9ac64b0e9a63 (diff) | |
Fix calcrom invoke back to diamond; other fixes
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/pokemon.c | 2 | ||||
| -rw-r--r-- | arm9/src/trainer_data.c | 11 |
2 files changed, 6 insertions, 7 deletions
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 |