From a4bdad0a1371eeed0df89b4a7b233b5983ce51e7 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sat, 6 Dec 2025 21:19:27 +0000 Subject: [PATCH] Merge pull request #222 from AnonymousRandomPerson/main --- pmdskyeu.xMAP | 23 +++++++++++++---------- pmdskyjp.xMAP | 23 +++++++++++++---------- pmdskyus.xMAP | 23 +++++++++++++---------- 3 files changed, 39 insertions(+), 30 deletions(-) diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP index 227755f8..0fe0ada6 100644 --- a/pmdskyeu.xMAP +++ b/pmdskyeu.xMAP @@ -184,9 +184,9 @@ 30](GetStringFromFileVeneer,func) found in global main_0202593C.o 29](GetColorCodePaletteOffset,func) found in global main_020265C4.o 27](EnableAllLearnableIqSkills,func) found in global main_02058E8C.o - 28](EnableIqSkill,func) found in global main_02058D04.o + 28](EnableIqSkill,func) found in global main_02058E68.o 29](IQ_SKILL_RESTRICTIONS,object) found in global monster_parameters.o - 29](IqSkillFlagTest,func) found in global pokemon.o + 28](GetLearnableIqSkills,func) found in global main_02058D04.o 29](IQ_GROUP_SKILLS,object) found in global iq_skills.o 29](CanLearnIqSkill,func) found in global main_02058CD8.o 29](GetIqGroup,func) found in global main_02052B28.o @@ -275,6 +275,7 @@ 55](RANDOM_MUSIC_ID_TABLE,notype) found in global overlay_10_rodata_022C593C.o 55](RoundUpDiv256,func) found in global main_02001894.o 55](IqSkillIsEnabled,func) found in global dungeon_pokemon_attributes_1.o + 56](IqSkillFlagTest,func) found in global pokemon.o 55](DungeonRandRange,func) found in global dg_random.o 54](EntityIsValid__02315118,func) found in global overlay_29_02315118.o 54](GravityIsActive,func) found in global overlay_29_0233836C.o @@ -871,6 +872,7 @@ 96](ov29_023021F0,func) found in global overlay_29_023021F0.o 97](UpdateIqSkills,func) found in global dungeon_pokemon_attributes_1.o 98](GetSpeciesIqSkill,func) found in global main_02058E68.o + 98](DisableIqSkill,func) found in global main_02058E68.o 98](MIN_IQ_EXCLUSIVE_MOVE_USER,object) found in global dungeon_parameters_3.o 98](MIN_IQ_ITEM_MASTER,object) found in global dungeon_parameters_4.o 95](IsSecretBazaarVeneer,func) found in global overlay_29_02344178.o @@ -7517,14 +7519,15 @@ 02059054 00000000 .text $a (main_02058CD8.o) 02059054 0000002C .text CanLearnIqSkill (main_02058CD8.o) 0205907C 00000000 .text $d (main_02058CD8.o) - 02059080 00000164 .text .text (main_02058D04.o) - 02059080 000000A0 .text GetLearnableIqSkills (main_02058D04.o) 02059080 00000000 .text $a (main_02058D04.o) + 02059080 000000A0 .text .text (main_02058D04.o) + 02059080 000000A0 .text GetLearnableIqSkills (main_02058D04.o) 0205911C 00000000 .text $d (main_02058D04.o) - 02059120 00000000 .text $a (main_02058D04.o) - 02059120 00000050 .text DisableIqSkill (main_02058D04.o) - 02059170 00000074 .text EnableIqSkill (main_02058D04.o) - 020591E0 00000000 .text $d (main_02058D04.o) + 02059120 00000050 .text DisableIqSkill (main_02058E68.o) + 02059120 00000000 .text $a (main_02058E68.o) + 02059170 00000000 .text $a (main_02058E68.o) + 02059170 00000074 .text EnableIqSkill (main_02058E68.o) + 020591E0 00000000 .text $d (main_02058E68.o) 020591E4 00000000 .text $a (main_02058E68.o) 020591E4 00000024 .text GetSpeciesIqSkill (main_02058E68.o) 02059204 00000000 .text $d (main_02058E68.o) @@ -41111,5 +41114,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sat Dec 06 19:39:59 2025 -# Link end time: Sat Dec 06 19:40:00 2025 +# Link start time: Sat Dec 06 21:17:26 2025 +# Link end time: Sat Dec 06 21:17:27 2025 diff --git a/pmdskyjp.xMAP b/pmdskyjp.xMAP index 57fa3a9f..58becaa4 100644 --- a/pmdskyjp.xMAP +++ b/pmdskyjp.xMAP @@ -185,9 +185,9 @@ 30](GetStringFromFileVeneer,func) found in global main_0202593C.o 29](GetColorCodePaletteOffset,func) found in global main_020265C4.o 27](EnableAllLearnableIqSkills,func) found in global main_02058E8C.o - 28](EnableIqSkill,func) found in global main_02058D04.o + 28](EnableIqSkill,func) found in global main_02058E68.o 29](IQ_SKILL_RESTRICTIONS,object) found in global monster_parameters.o - 29](IqSkillFlagTest,func) found in global pokemon.o + 28](GetLearnableIqSkills,func) found in global main_02058D04.o 29](IQ_GROUP_SKILLS,object) found in global iq_skills.o 29](CanLearnIqSkill,func) found in global main_02058CD8.o 29](GetIqGroup,func) found in global main_02052B28.o @@ -275,6 +275,7 @@ 55](RANDOM_MUSIC_ID_TABLE,notype) found in global overlay_10_rodata_022C593C.o 55](RoundUpDiv256,func) found in global main_02001894.o 55](IqSkillIsEnabled,func) found in global dungeon_pokemon_attributes_1.o + 56](IqSkillFlagTest,func) found in global pokemon.o 55](DungeonRandRange,func) found in global dg_random.o 54](EntityIsValid__02315118,func) found in global overlay_29_02315118.o 54](GravityIsActive,func) found in global overlay_29_0233836C.o @@ -868,6 +869,7 @@ 96](ov29_023021F0,func) found in global overlay_29_023021F0.o 97](UpdateIqSkills,func) found in global dungeon_pokemon_attributes_1.o 98](GetSpeciesIqSkill,func) found in global main_02058E68.o + 98](DisableIqSkill,func) found in global main_02058E68.o 98](MIN_IQ_EXCLUSIVE_MOVE_USER,object) found in global dungeon_parameters_3.o 98](MIN_IQ_ITEM_MASTER,object) found in global dungeon_parameters_4.o 95](IsSecretBazaarVeneer,func) found in global overlay_29_02344178.o @@ -7499,14 +7501,15 @@ 02058FD4 00000000 .text $a (main_02058CD8.o) 02058FD4 0000002C .text CanLearnIqSkill (main_02058CD8.o) 02058FFC 00000000 .text $d (main_02058CD8.o) - 02059000 00000164 .text .text (main_02058D04.o) - 02059000 000000A0 .text GetLearnableIqSkills (main_02058D04.o) 02059000 00000000 .text $a (main_02058D04.o) + 02059000 000000A0 .text .text (main_02058D04.o) + 02059000 000000A0 .text GetLearnableIqSkills (main_02058D04.o) 0205909C 00000000 .text $d (main_02058D04.o) - 020590A0 00000000 .text $a (main_02058D04.o) - 020590A0 00000050 .text DisableIqSkill (main_02058D04.o) - 020590F0 00000074 .text EnableIqSkill (main_02058D04.o) - 02059160 00000000 .text $d (main_02058D04.o) + 020590A0 00000050 .text DisableIqSkill (main_02058E68.o) + 020590A0 00000000 .text $a (main_02058E68.o) + 020590F0 00000000 .text $a (main_02058E68.o) + 020590F0 00000074 .text EnableIqSkill (main_02058E68.o) + 02059160 00000000 .text $d (main_02058E68.o) 02059164 00000000 .text $a (main_02058E68.o) 02059164 00000024 .text GetSpeciesIqSkill (main_02058E68.o) 02059184 00000000 .text $d (main_02058E68.o) @@ -41318,5 +41321,5 @@ 00000000 00000000 00004060 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sat Dec 06 19:41:33 2025 -# Link end time: Sat Dec 06 19:41:34 2025 +# Link start time: Sat Dec 06 21:18:57 2025 +# Link end time: Sat Dec 06 21:18:58 2025 diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index d499703e..25aae5c4 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -184,9 +184,9 @@ 30](GetStringFromFileVeneer,func) found in global main_0202593C.o 29](GetColorCodePaletteOffset,func) found in global main_020265C4.o 27](EnableAllLearnableIqSkills,func) found in global main_02058E8C.o - 28](EnableIqSkill,func) found in global main_02058D04.o + 28](EnableIqSkill,func) found in global main_02058E68.o 29](IQ_SKILL_RESTRICTIONS,object) found in global monster_parameters.o - 29](IqSkillFlagTest,func) found in global pokemon.o + 28](GetLearnableIqSkills,func) found in global main_02058D04.o 29](IQ_GROUP_SKILLS,object) found in global iq_skills.o 29](CanLearnIqSkill,func) found in global main_02058CD8.o 29](GetIqGroup,func) found in global main_02052B28.o @@ -275,6 +275,7 @@ 55](RANDOM_MUSIC_ID_TABLE,notype) found in global overlay_10_rodata_022C593C.o 55](RoundUpDiv256,func) found in global main_02001894.o 55](IqSkillIsEnabled,func) found in global dungeon_pokemon_attributes_1.o + 56](IqSkillFlagTest,func) found in global pokemon.o 55](DungeonRandRange,func) found in global dg_random.o 54](EntityIsValid__02315118,func) found in global overlay_29_02315118.o 54](GravityIsActive,func) found in global overlay_29_0233836C.o @@ -871,6 +872,7 @@ 96](ov29_023021F0,func) found in global overlay_29_023021F0.o 97](UpdateIqSkills,func) found in global dungeon_pokemon_attributes_1.o 98](GetSpeciesIqSkill,func) found in global main_02058E68.o + 98](DisableIqSkill,func) found in global main_02058E68.o 98](MIN_IQ_EXCLUSIVE_MOVE_USER,object) found in global dungeon_parameters_3.o 98](MIN_IQ_ITEM_MASTER,object) found in global dungeon_parameters_4.o 95](IsSecretBazaarVeneer,func) found in global overlay_29_02344178.o @@ -7498,14 +7500,15 @@ 02058CD8 00000000 .text $a (main_02058CD8.o) 02058CD8 0000002C .text CanLearnIqSkill (main_02058CD8.o) 02058D00 00000000 .text $d (main_02058CD8.o) - 02058D04 00000164 .text .text (main_02058D04.o) - 02058D04 000000A0 .text GetLearnableIqSkills (main_02058D04.o) 02058D04 00000000 .text $a (main_02058D04.o) + 02058D04 000000A0 .text .text (main_02058D04.o) + 02058D04 000000A0 .text GetLearnableIqSkills (main_02058D04.o) 02058DA0 00000000 .text $d (main_02058D04.o) - 02058DA4 00000000 .text $a (main_02058D04.o) - 02058DA4 00000050 .text DisableIqSkill (main_02058D04.o) - 02058DF4 00000074 .text EnableIqSkill (main_02058D04.o) - 02058E64 00000000 .text $d (main_02058D04.o) + 02058DA4 00000050 .text DisableIqSkill (main_02058E68.o) + 02058DA4 00000000 .text $a (main_02058E68.o) + 02058DF4 00000000 .text $a (main_02058E68.o) + 02058DF4 00000074 .text EnableIqSkill (main_02058E68.o) + 02058E64 00000000 .text $d (main_02058E68.o) 02058E68 00000000 .text $a (main_02058E68.o) 02058E68 00000024 .text GetSpeciesIqSkill (main_02058E68.o) 02058E88 00000000 .text $d (main_02058E68.o) @@ -41077,5 +41080,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sat Dec 06 19:38:22 2025 -# Link end time: Sat Dec 06 19:38:23 2025 +# Link start time: Sat Dec 06 21:15:47 2025 +# Link end time: Sat Dec 06 21:15:48 2025