Merge branch 'main' into IsRecruitingAllowed

Author: AnonymousRandomPerson

.devcontainer/onCreate.sh

@@ -16,12 +16,12 @@ if [ ! -d "$WORKSPACE/tools/bin" \
      -o ! -f "$WORKSPACE/ARM9-TS.lcf.template" \
      -o ! -f "$WORKSPACE/mwldarm.response.template" ]; then
     wget https://github.com/pret/pmd-sky/raw/workflows/assets/NitroSDK-4_2-071210-jp.7z
-    7z x NitroSDK-3_2-060901.7z
+    7z x NitroSDK-4_2-071210-jp.7z -oNitroSDK-4_2-071210-jp
     rm -rf "$WORKSPACE/tools/bin"
-    mv -v NitroSDK-3_2-060901/tools/bin "$WORKSPACE/tools"
-    mv -v NitroSDK-3_2-060901/include/nitro/specfiles/ARM7-TS.lcf.template "$WORKSPACE/sub/"
-    mv -v NitroSDK-3_2-060901/include/nitro/specfiles/ARM9-TS.lcf.template "$WORKSPACE/"
-    mv -v NitroSDK-3_2-060901/include/nitro/specfiles/mwldarm.response.template "$WORKSPACE/"
+    mv -v NitroSDK-4_2-071210-jp/tools/bin "$WORKSPACE/tools"
+    mv -v NitroSDK-4_2-071210-jp/include/nitro/specfiles/ARM7-TS.lcf.template "$WORKSPACE/sub/"
+    mv -v NitroSDK-4_2-071210-jp/include/nitro/specfiles/ARM9-TS.lcf.template "$WORKSPACE/"
+    mv -v NitroSDK-4_2-071210-jp/include/nitro/specfiles/mwldarm.response.template "$WORKSPACE/"
 fi
 
 # Set up wine under a virtual X11 server to hide the annoying GUI popup.

asm/include/overlay_29_0230DBD0.inc asm/include/overlay_29_0230E064.incasm/include/overlay_29_0230DBD0.inc renamed to asm/include/overlay_29_0230E064.inc

@@ -1,56 +1,28 @@
 #pragma once
-.public CanSeeTarget
 .public DUNGEON_PTR
 .public DungeonModeSetupAndShowNameKeyboard
-.public DungeonRandInt
 .public EnableAllLearnableIqSkills
 .public EnsureCanStandCurrentTile
 .public GetActiveTeamMember
 .public GetDirectionTowardsPosition
-.public GetFirstEmptyMemberIdx
 .public GetMessageLogPreprocessorArgs
 .public GetNameString
-.public GetRecruitRate1
-.public GetRecruitRate2
 .public HandleFaint
-.public HasPlayedOldGame
 .public InitTeamMember
-.public IqSkillIsEnabled
-.public IsCurrentMissionTypeExact
-.public IsFullFloorFixedRoom
-.public IsLegendaryChallengeFloor
 .public IsMonsterOnTeam
-.public IsRecruitingAllowed
-.public ItemIsActive__0230E578
 .public LogMessageByIdWithPopupCheckUser
-.public MonsterIsType
-.public RECRUITMENT_LEVEL_BOOST_TABLE
 .public SetMessageLogPreprocessorArgsString
 .public SetPokemonJoined
 .public SetPreprocessorArgsIdVal
 .public SetPreprocessorArgsStringToName
-.public SpecificRecruitCheck
 .public StrcpySimple
 .public StrncpyName
 .public StrncpySimpleNoPad
 .public SubstitutePlaceholderStringTags
-.public abs
-.public ov10_022C4410
-.public ov10_022C441C
-.public ov10_022C443C
-.public ov10_022C447C
-.public ov10_022C44FC
-.public ov10_022C46FC
-.public ov10_022C4700
-.public ov10_022C4704
-.public ov10_022C4708
-.public ov10_022C470C
-.public ov29_022E1B28
 .public ov29_022E68BC
 .public ov29_022E8104
 .public ov29_022E81F8
 .public ov29_022EACAC
-.public ov29_022FBDE0
 .public ov29_02304A48
 .public ov29_02305F60
 .public ov29_0230E5A8

asm/overlay_10_022C4394.s

@@ -41,17 +41,17 @@ ov10_022C4404:
 	.global FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS
 FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS:
 	.byte 0x1C, 0x00, 0x00, 0x00
-	.global ov10_022C4410
-ov10_022C4410:
+	.global FIERY_DRUM_RECRUIT_BOOST
+FIERY_DRUM_RECRUIT_BOOST:
 	.byte 0xC8, 0x00, 0x00, 0x00
 	.global BAD_POISON_DAMAGE_COOLDOWN
 BAD_POISON_DAMAGE_COOLDOWN:
 	.byte 0x05, 0x00, 0x00, 0x00
 	.global ov10_022C4418
 ov10_022C4418:
 	.byte 0x14, 0x00, 0x00, 0x00
-	.global ov10_022C441C
-ov10_022C441C:
+	.global ICY_FLUTE_RECRUIT_BOOST
+ICY_FLUTE_RECRUIT_BOOST:
 	.byte 0xC8, 0x00, 0x00, 0x00
 	.global PROTEIN_STAT_BOOST
 PROTEIN_STAT_BOOST:
@@ -74,8 +74,8 @@ ov10_022C4434:
 	.global OREN_BERRY_DAMAGE
 OREN_BERRY_DAMAGE:
 	.byte 0x0A, 0x00, 0x00, 0x00
-	.global ov10_022C443C
-ov10_022C443C:
+	.global GOLDEN_MASK_RECRUIT_BOOST
+GOLDEN_MASK_RECRUIT_BOOST:
 	.byte 0xC9, 0x00, 0x00, 0x00
 	.global IRON_TAIL_LOWER_DEFENSE_CHANCE
 IRON_TAIL_LOWER_DEFENSE_CHANCE:
@@ -122,8 +122,8 @@ UNOWN_STONE_DROP_CHANCE:
 	.global SITRUS_BERRY_HP_RESTORATION
 SITRUS_BERRY_HP_RESTORATION:
 	.byte 0x64, 0x00, 0x00, 0x00
-	.global ov10_022C447C
-ov10_022C447C:
+	.global AMBER_TEAR_RECRUIT_BOOST
+AMBER_TEAR_RECRUIT_BOOST:
 	.byte 0x96, 0x00, 0x00, 0x00
 	.global ov10_022C4480
 ov10_022C4480:
@@ -218,8 +218,8 @@ ORAN_BERRY_FULL_HP_BOOST:
 	.global LIFE_SEED_HP_BOOST
 LIFE_SEED_HP_BOOST:
 	.byte 0x03, 0x00, 0x00, 0x00
-	.global ov10_022C44FC
-ov10_022C44FC:
+	.global FRIEND_BOW_FAST_FRIEND_BOOST
+FRIEND_BOW_FAST_FRIEND_BOOST:
 	.byte 0x32, 0x00, 0x00, 0x00
 	.global OCTAZOOKA_LOWER_ACCURACY_CHANCE
 OCTAZOOKA_LOWER_ACCURACY_CHANCE:

asm/overlay_10_rodata_022C464C.s

@@ -134,20 +134,20 @@ HEALING_WISH_HP_RESTORATION:
 	.global ov10_022C46F8
 ov10_022C46F8:
 	.byte 0x9C, 0xFF, 0x00, 0x00
-	.global ov10_022C46FC
-ov10_022C46FC:
+	.global SKY_MELODICA_RECRUIT_BOOST
+SKY_MELODICA_RECRUIT_BOOST:
 	.byte 0xC8, 0x00, 0x00, 0x00
-	.global ov10_022C4700
-ov10_022C4700:
+	.global GRASS_CORNET_RECRUIT_BOOST
+GRASS_CORNET_RECRUIT_BOOST:
 	.byte 0xC8, 0x00, 0x00, 0x00
-	.global ov10_022C4704
-ov10_022C4704:
+	.global ROCK_HORN_RECRUIT_BOOST
+ROCK_HORN_RECRUIT_BOOST:
 	.byte 0xC8, 0x00, 0x00, 0x00
-	.global ov10_022C4708
-ov10_022C4708:
+	.global AQUA_MONICA_RECRUIT_BOOST
+AQUA_MONICA_RECRUIT_BOOST:
 	.byte 0xC8, 0x00, 0x00, 0x00
-	.global ov10_022C470C
-ov10_022C470C:
+	.global TERRA_CYMBAL_RECRUIT_BOOST
+TERRA_CYMBAL_RECRUIT_BOOST:
 	.byte 0xC8, 0x00, 0x00, 0x00
 	.global ME_FIRST_MULTIPLIER
 ME_FIRST_MULTIPLIER: