Fix calcrom invoke back to diamond; other fixes

6 files changed, 13 insertions, 12 deletions

diff --git a/.github/calcrom/BuildAnalyzer.cpp b/.github/calcrom/BuildAnalyzer.cpp
index 99d7bd90..ef2b5089 100644
--- a/.github/calcrom/BuildAnalyzer.cpp
+++ b/.github/calcrom/BuildAnalyzer.cpp
@@ -1,3 +1,5 @@
+#include <algorithm>
+#include <cstring>
 #include <iostream>
 #include "BuildAnalyzer.h"
 #include "Glob.h"
diff --git a/.github/calcrom/webhook.sh b/.github/calcrom/webhook.sh
index 83b5d6c3..60726c7d 100644
--- a/.github/calcrom/webhook.sh
+++ b/.github/calcrom/webhook.sh
@@ -8,13 +8,13 @@ fi
 build_name=$1
 url=$2
 build_subdir=${1//poke/}.us
-arm9name=${arm9name:-main.nef}
-map_file=$(dirname "$0")/../../build/${build_subdir}/${arm9name}.xMAP
+arm9name=${arm9name:-arm9.elf}
+map_file=$(dirname "$0")/../../arm9/build/${build_subdir}/${arm9name}.xMAP
 if [ ! -f $map_file ]; then
   echo "$map_file does not exist!"
   exit 1
 fi
 
 make -C ${GITHUB_WORKSPACE}/.github/calcrom
-output=$(${GITHUB_WORKSPACE}/.github/calcrom/calcrom -d ${GITHUB_WORKSPACE} -9 "" -7 sub heartgold.us soulsilver.us | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
+output=$(${GITHUB_WORKSPACE}/.github/calcrom/calcrom -d ${GITHUB_WORKSPACE} -9 arm9 -7 arm7 diamond.us pearl.us | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
 curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $url
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