From 616b71d90ae4503c9e4a36dd6dd20ff6fb99807f Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 3 Feb 2026 18:12:10 +0000 Subject: [PATCH] Merge pull request #243 from SethBarberee/decomp_jan_2026 --- pmdskyeu.xMAP | 136 ++++++++++++++++++++++++++------------------------ pmdskyjp.xMAP | 136 ++++++++++++++++++++++++++------------------------ pmdskyus.xMAP | 136 ++++++++++++++++++++++++++------------------------ 3 files changed, 216 insertions(+), 192 deletions(-) diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP index 76d62e91..7062d5a5 100644 --- a/pmdskyeu.xMAP +++ b/pmdskyeu.xMAP @@ -41,7 +41,6 @@ 16](_022A5970,notype) found in global main_bss_020B3380.o 16](sub_0200D310,func) found in global main_0200CAFC.o 17](sub_0200EB64,func) found in global main_0200EB30.o - 18](ItemZInit,func) found in global main_0200CAFC.o 18](BABY_EXCLUSIVE_ITEM_PAIRS,notype) found in global main_rodata_020908D4.o 19](sub_0204A190,func) found in global main_0203C774.o 20](CardPullOutWithStatus,func) found in global main_02003D2C.o @@ -141,6 +140,7 @@ 42](IsUnown,func) found in global main_02054AA4.o 42](IsDeoxys,func) found in global main_02054BE0.o 40](StrncpySimple,func) found in global main_020251AC.o + 40](ItemZInit,func) found in global main_0200CAFC.o 40](StrncmpSimple,func) found in global main_020251AC.o 40](StrcpyName,func) found in global main_020251F0.o 40](EnableAllLearnableIqSkills,func) found in global main_02058E8C.o @@ -173,7 +173,8 @@ 45](GetThrownItemQuantityLimit,func) found in global item_util_1.o 44](IsItemInTimeDarkness,func) found in global main_0200EB30.o 44](IsTreasureBox,func) found in global item_util_4.o - 44](AddMoneyCarried,func) found in global main_0200ED1C.o + 44](AddMoneyCarried,func) found in global main_0200ECFC.o + 45](SetMoneyCarried,func) found in global main_0200ECFC.o 44](GetCurrentBagCapacity,func) found in global main_0200EDC0.o 45](GetExecuteSpecialEpisodeType,func) found in global special_episode.o 45](GetScenarioBalance,func) found in global progression.o @@ -187,9 +188,12 @@ 40](SaveScriptVariableValue,func) found in global script_variable.o 41](SetDebugSpecialEpisodeNumber,func) found in global special_episode.o 40](sub_0200C4CC,func) found in global main_0200C4CC.o + 41](RescueInventoryZInit,func) found in global main_0200ECFC.o + 41](SpecialEpisodeInventoryZInit,func) found in global main_0200ECFC.o 41](sub_02011AB8,func) found in global main_02010FC4.o 42](GetMaxPp,func) found in global moves.o 42](GetType,func) found in global main_0205283C.o + 42](GetExclusiveItem,func) found in global main_02052B28.o 42](RandRange,func) found in global main_0200224C.o 42](IsTicketItem,func) found in global item_util_4.o 42](IQ_GUMMI_GAIN_TABLE,notype) found in global main_rodata_020A20B1.o @@ -322,6 +326,7 @@ 81](ov29_022E273C,func) found in global overlay_29_022E1AD4.o 81](DungeonGetSpriteIndex,func) found in global overlay_29_022F7364.o 81](GetLoadedAttackSpriteId,func) found in global overlay_29_022F62CC.o + 81](NeedsItemToSpawn,func) found in global main_02052B28.o 81](SpawnMonster,func) found in global overlay_29_022FC9C0.o 82](IsDestinationFloorWithFleeingOutlaw,func) found in global overlay_29_02348D3C.o 83](ov29_02348ABC,func) found in global overlay_29_02348020.o @@ -819,7 +824,7 @@ 121](GetTypeMatchup,func) found in global type_effectiveness.o 122](ExclusiveItemEffectIsActive__0230A9B8,func) found in global overlay_29_0230A994.o 122](TYPE_MATCHUP_TABLE,object) found in global type_matchup_table.o - 121](@180,object) found in local dungeon_damage.o + 121](@186,object) found in local dungeon_damage.o 119](AI_POTENTIAL_ATTACK_TARGET_DIRECTIONS,object) found in global dungeon_ai_attack.o 118](IsTargetInRange,func) found in global dungeon_ai_attack.o 116](ov29_0231A8A0,func) found in global overlay_29_0231A8A0.o @@ -830,7 +835,8 @@ 117](DIRECTIONAL_BIT_MASKS__02352798,object) found in global directional_bit_masks.o 116](ov29_023085DC,func) found in global overlay_29_023085DC.o 117](GendersNotEqualNotGenderless,func) found in global main_02054DC4.o - 117](HasTypeAffectedByGravity,func) found in global overlay_29_02301E88.o + 117](HasTypeAffectedByGravity,func) found in global dungeon_logic_3.o + 118](IsTypeAffectedByGravity,func) found in global dungeon_logic_3.o 117](HasLowHealth,func) found in global dungeon_logic_4.o 117](CategoryIsNotPhysical,func) found in global overlay_29_0231EA04.o 117](ApplyDamage,func) found in global overlay_29_02308FE0.o @@ -1041,7 +1047,7 @@ 56](EntityIsValid__022EF7A0,func) found in global overlay_29_022EF7A0.o 55](GetFarOffPalsOption,func) found in global options.o 54](EntityIsValidMoveEffects__0232A3D8,func) found in global overlay_29_0232A3D8.o - 53](ov29_02318A90,func) found in global overlay_29_02318A90.o + 53](ov29_02318A90,func) found in global overlay_29_02318A4C.o 53](BoostHitChanceStat,func) found in global move_orb_effects.o 53](EntityIsValidMoveEffects__0232800C,func) found in global overlay_29_0232800C.o 49](ov31_02383434,func) found in global overlay_31_023833D8.o @@ -1050,6 +1056,7 @@ 50](ov31_02383328,func) found in global overlay_31_02383328.o 48](IsTeamStatsOnTopScreen,func) found in global options.o 48](CheckSpawnThreshold,func) found in global overlay_29_022FB538.o + 49](GetSpawnThreshold,func) found in global main_02052B28.o 48](IsDojoDungeon,func) found in global main_020514CC.o 46](GetWeightMultiplier,func) found in global main_0205283C.o 46](ApplyOffensiveStatMultiplier,func) found in global move_orb_effects.o @@ -1058,6 +1065,9 @@ 42](GetMoveMaxGinsengBoostGround,func) found in global moves.o 42](GetMoveBasePowerGround,func) found in global main_0201398C.o 42](GetExclusiveItemParameter,func) found in global item_util_1.o + 41](AllInventoriesZInit,func) found in global main_0200ECFC.o + 42](SetActiveInventory,func) found in global main_0200ECFC.o + 41](SetActiveInventoryToMain,func) found in global main_0200ECFC.o 41](LoadItemPspi2n,func) found in global item_util_1.o 42](SprintfStatic__0200E990,func) found in local item_util_1.o 40](LoadOptionsFromCtx,func) found in global options.o @@ -2428,44 +2438,43 @@ 0200EB48 00000000 .text $a (item_util_1.o) 0200EB48 00000090 .text TestItemAiFlag (item_util_1.o) 0200EBD4 00000000 .text $d (item_util_1.o) - 0200EBD8 00000000 .text $a (main_0200EB30.o) 0200EBD8 00000028 .text IsItemInTimeDarkness (main_0200EB30.o) - 0200EBD8 000001CC .text .text (main_0200EB30.o) + 0200EBD8 00000000 .text $a (main_0200EB30.o) + 0200EBD8 0000009C .text .text (main_0200EB30.o) 0200EBFC 00000000 .text $d (main_0200EB30.o) 0200EC00 00000000 .text $a (main_0200EB30.o) 0200EC00 0000000C .text IsItemValidVeneer (main_0200EB30.o) 0200EC08 00000000 .text $d (main_0200EB30.o) - 0200EC0C 00000000 .text $a (main_0200EB30.o) 0200EC0C 0000002C .text sub_0200EB64 (main_0200EB30.o) + 0200EC0C 00000000 .text $a (main_0200EB30.o) 0200EC30 00000000 .text $d (main_0200EB30.o) - 0200EC38 0000003C .text ReturnEggExclusiveItem (main_0200EB30.o) 0200EC38 00000000 .text $a (main_0200EB30.o) + 0200EC38 0000003C .text ReturnEggExclusiveItem (main_0200EB30.o) 0200EC70 00000000 .text $d (main_0200EB30.o) - 0200EC74 00000010 .text SetActiveInventoryToMain (main_0200EB30.o) - 0200EC74 00000000 .text $a (main_0200EB30.o) - 0200EC80 00000000 .text $d (main_0200EB30.o) - 0200EC84 0000006C .text AllInventoriesZInit (main_0200EB30.o) - 0200EC84 00000000 .text $a (main_0200EB30.o) - 0200ECEC 00000000 .text $d (main_0200EB30.o) - 0200ECF0 00000048 .text SpecialEpisodeInventoryZInit (main_0200EB30.o) - 0200ECF0 00000000 .text $a (main_0200EB30.o) - 0200ED34 00000000 .text $d (main_0200EB30.o) - 0200ED38 00000000 .text $a (main_0200EB30.o) - 0200ED38 00000048 .text RescueInventoryZInit (main_0200EB30.o) - 0200ED7C 00000000 .text $d (main_0200EB30.o) - 0200ED80 00000024 .text SetActiveInventory (main_0200EB30.o) - 0200ED80 00000000 .text $a (main_0200EB30.o) - 0200EDA0 00000000 .text $d (main_0200EB30.o) + 0200EC74 00000000 .text $a (main_0200ECFC.o) + 0200EC74 00000010 .text SetActiveInventoryToMain (main_0200ECFC.o) + 0200EC80 00000000 .text $d (main_0200ECFC.o) + 0200EC84 00000000 .text $a (main_0200ECFC.o) + 0200EC84 0000006C .text AllInventoriesZInit (main_0200ECFC.o) + 0200ECEC 00000000 .text $d (main_0200ECFC.o) + 0200ECF0 00000000 .text $a (main_0200ECFC.o) + 0200ECF0 00000048 .text SpecialEpisodeInventoryZInit (main_0200ECFC.o) + 0200ED34 00000000 .text $d (main_0200ECFC.o) + 0200ED38 00000000 .text $a (main_0200ECFC.o) + 0200ED38 00000048 .text RescueInventoryZInit (main_0200ECFC.o) + 0200ED7C 00000000 .text $d (main_0200ECFC.o) + 0200ED80 00000000 .text $a (main_0200ECFC.o) + 0200ED80 00000024 .text SetActiveInventory (main_0200ECFC.o) + 0200EDA0 00000000 .text $d (main_0200ECFC.o) 0200EDA4 00000000 .text $a (main_0200ECFC.o) 0200EDA4 00000020 .text GetMoneyCarried (main_0200ECFC.o) 0200EDC0 00000000 .text $d (main_0200ECFC.o) - 0200EDC4 00000068 .text .text (main_0200ED1C.o) - 0200EDC4 0000003C .text SetMoneyCarried (main_0200ED1C.o) - 0200EDC4 00000000 .text $a (main_0200ED1C.o) - 0200EDF8 00000000 .text $d (main_0200ED1C.o) - 0200EE00 00000000 .text $a (main_0200ED1C.o) - 0200EE00 0000002C .text AddMoneyCarried (main_0200ED1C.o) - 0200EE24 00000000 .text $d (main_0200ED1C.o) + 0200EDC4 00000000 .text $a (main_0200ECFC.o) + 0200EDC4 0000003C .text SetMoneyCarried (main_0200ECFC.o) + 0200EDF8 00000000 .text $d (main_0200ECFC.o) + 0200EE00 00000000 .text $a (main_0200ECFC.o) + 0200EE00 0000002C .text AddMoneyCarried (main_0200ECFC.o) + 0200EE24 00000000 .text $d (main_0200ECFC.o) 0200EE2C 0000003C .text GetCurrentBagCapacity (main_0200EDC0.o) 0200EE2C 00000000 .text $a (main_0200EDC0.o) 0200EE68 00000000 .text $a (main_0200EDC0.o) @@ -7116,18 +7125,18 @@ 02052E60 00000000 .text $a (main_02052B28.o) 02052E60 0000001C .text GetIqGroup (main_02052B28.o) 02052E78 00000000 .text $d (main_02052B28.o) - 02052E7C 00001F88 .text .text (main_02052B44.o) - 02052E7C 00000000 .text $a (main_02052B44.o) - 02052E7C 0000001C .text GetSpawnThreshold (main_02052B44.o) - 02052E94 00000000 .text $d (main_02052B44.o) - 02052E98 00000000 .text $a (main_02052B44.o) - 02052E98 0000002C .text NeedsItemToSpawn (main_02052B44.o) - 02052EC0 00000000 .text $d (main_02052B44.o) - 02052EC4 00000000 .text $a (main_02052B44.o) - 02052EC4 0000002C .text GetExclusiveItem (main_02052B44.o) - 02052EEC 00000000 .text $d (main_02052B44.o) + 02052E7C 00000000 .text $a (main_02052B28.o) + 02052E7C 0000001C .text GetSpawnThreshold (main_02052B28.o) + 02052E94 00000000 .text $d (main_02052B28.o) + 02052E98 00000000 .text $a (main_02052B28.o) + 02052E98 0000002C .text NeedsItemToSpawn (main_02052B28.o) + 02052EC0 00000000 .text $d (main_02052B28.o) + 02052EC4 00000000 .text $a (main_02052B28.o) + 02052EC4 0000002C .text GetExclusiveItem (main_02052B28.o) + 02052EEC 00000000 .text $d (main_02052B28.o) 02052EF0 00000000 .text $a (main_02052B44.o) 02052EF0 0000001C .text GetFamilyIndex (main_02052B44.o) + 02052EF0 00001F14 .text .text (main_02052B44.o) 02052F08 00000000 .text $d (main_02052B44.o) 02052F0C 00000000 .text $a (main_02052B44.o) 02052F0C 000000AC .text LoadM2nAndN2m (main_02052B44.o) @@ -7142,8 +7151,8 @@ 02053054 00000000 .text $a (main_02052B44.o) 02053064 0000000C .text sub_02052CE8 (main_02052B44.o) 0205306C 00000000 .text $d (main_02052B44.o) - 02053070 00000138 .text sub_02052CF4 (main_02052B44.o) 02053070 00000000 .text $a (main_02052B44.o) + 02053070 00000138 .text sub_02052CF4 (main_02052B44.o) 020531A8 00000024 .text sub_02052E2C (main_02052B44.o) 020531CC 000000AC .text GuestMonsterToGroundMonster (main_02052B44.o) 02053278 00000090 .text SetBaseStatsMovesGroundMonster (main_02052B44.o) @@ -7151,20 +7160,20 @@ 0205332C 00000048 .text StrcmpMonsterName (main_02052B44.o) 02053374 00000040 .text sub_02052FF8 (main_02052B44.o) 020533B0 00000000 .text $d (main_02052B44.o) - 020533B4 0000009C .text sub_02053038 (main_02052B44.o) 020533B4 00000000 .text $a (main_02052B44.o) + 020533B4 0000009C .text sub_02053038 (main_02052B44.o) 02053448 00000000 .text $d (main_02052B44.o) - 02053450 000000A0 .text sub_020530D4 (main_02052B44.o) 02053450 00000000 .text $a (main_02052B44.o) + 02053450 000000A0 .text sub_020530D4 (main_02052B44.o) 020534EC 00000000 .text $d (main_02052B44.o) - 020534F0 00000000 .text $a (main_02052B44.o) 020534F0 000000B0 .text sub_02053174 (main_02052B44.o) + 020534F0 00000000 .text $a (main_02052B44.o) 0205359C 00000000 .text $d (main_02052B44.o) 020535A0 0000002C .text sub_02053224 (main_02052B44.o) 020535A0 00000000 .text $a (main_02052B44.o) 020535C8 00000000 .text $d (main_02052B44.o) - 020535CC 00000124 .text sub_02053250 (main_02052B44.o) 020535CC 00000000 .text $a (main_02052B44.o) + 020535CC 00000124 .text sub_02053250 (main_02052B44.o) 020536F0 00000128 .text sub_02053374 (main_02052B44.o) 02053818 00000020 .text sub_0205349C (main_02052B44.o) 02053830 00000000 .text $d (main_02052B44.o) @@ -7177,15 +7186,15 @@ 020539DC 0000013C .text sub_02053660 (main_02052B44.o) 02053B18 000000B0 .text GetLvlUpEntry (main_02052B44.o) 02053BC0 00000000 .text $d (main_02052B44.o) - 02053BC8 00000034 .text GetEncodedHalfword (main_02052B44.o) 02053BC8 00000000 .text $a (main_02052B44.o) + 02053BC8 00000034 .text GetEncodedHalfword (main_02052B44.o) 02053BFC 00000084 .text sub_02053880 (main_02052B44.o) 02053C6C 00000000 .text $d (main_02052B44.o) - 02053C80 00000108 .text sub_02053904 (main_02052B44.o) 02053C80 00000000 .text $a (main_02052B44.o) + 02053C80 00000108 .text sub_02053904 (main_02052B44.o) 02053D84 00000000 .text $d (main_02052B44.o) - 02053D88 00000044 .text sub_02053A0C (main_02052B44.o) 02053D88 00000000 .text $a (main_02052B44.o) + 02053D88 00000044 .text sub_02053A0C (main_02052B44.o) 02053DCC 000000E8 .text sub_02053A50 (main_02052B44.o) 02053EB4 00000028 .text sub_02053B38 (main_02052B44.o) 02053ED8 00000000 .text $d (main_02052B44.o) @@ -7222,21 +7231,21 @@ 020547FC 00000020 .text GetMonsterIdFromSpawnEntry (main_02052B44.o) 020547FC 00000000 .text $a (main_02052B44.o) 02054818 00000000 .text $d (main_02052B44.o) - 0205481C 00000000 .text $a (main_02052B44.o) 0205481C 00000008 .text SetMonsterId (main_02052B44.o) + 0205481C 00000000 .text $a (main_02052B44.o) 02054824 00000010 .text SetMonsterLevelAndId (main_02052B44.o) 02054834 00000010 .text GetMonsterLevelFromSpawnEntry (main_02052B44.o) 02054844 00000220 .text ApplyLevelUpBoostsToGroundMonster (main_02052B44.o) 02054A60 00000000 .text $d (main_02052B44.o) - 02054A64 00000000 .text $a (main_02052B44.o) 02054A64 00000078 .text sub_020546E8 (main_02052B44.o) + 02054A64 00000000 .text $a (main_02052B44.o) 02054ADC 0000000C .text GetMonsterGenderVeneer (main_02052B44.o) 02054AE4 00000000 .text $d (main_02052B44.o) - 02054AE8 00000000 .text $a (main_02052B44.o) 02054AE8 0000005C .text IsMonsterValid (main_02052B44.o) + 02054AE8 00000000 .text $a (main_02052B44.o) 02054B3C 00000000 .text $d (main_02052B44.o) - 02054B44 00000010 .text sub_020547C8 (main_02052B44.o) 02054B44 00000000 .text $a (main_02052B44.o) + 02054B44 00000010 .text sub_020547C8 (main_02052B44.o) 02054B54 0000002C .text sub_020547D8 (main_02052B44.o) 02054B80 00000020 .text sub_02054804 (main_02052B44.o) 02054B9C 00000000 .text $d (main_02052B44.o) @@ -7246,8 +7255,8 @@ 02054BC0 00000000 .text $a (main_02052B44.o) 02054BC0 0000021C .text sub_02054844 (main_02052B44.o) 02054DCC 00000000 .text $d (main_02052B44.o) - 02054DDC 00000000 .text $a (main_02052B44.o) 02054DDC 00000028 .text SprintfStatic__02054A60 (main_02052B44.o) + 02054DDC 00000000 .text $a (main_02052B44.o) 02054E04 0000001C .text IsUnown (main_02054AA4.o) 02054E04 00000000 .text $a (main_02054AA4.o) 02054E20 00000000 .text $a (main_02054AA4.o) @@ -36555,10 +36564,10 @@ 02302844 00000000 .text $a (dungeon_logic_3.o) 0230287C 00000038 .text MonsterIsType (dungeon_logic_3.o) 0230287C 00000000 .text $a (dungeon_logic_3.o) - 023028B4 00000000 .text $a (overlay_29_02301E88.o) - 023028B4 00000024 .text IsTypeAffectedByGravity (overlay_29_02301E88.o) - 023028B4 00000064 .text .text (overlay_29_02301E88.o) - 023028D8 00000040 .text HasTypeAffectedByGravity (overlay_29_02301E88.o) + 023028B4 00000024 .text IsTypeAffectedByGravity (dungeon_logic_3.o) + 023028B4 00000000 .text $a (dungeon_logic_3.o) + 023028D8 00000040 .text HasTypeAffectedByGravity (dungeon_logic_3.o) + 023028D8 00000000 .text $a (dungeon_logic_3.o) 02302918 00000034 .text CanSeeInvisibleMonsters (dungeon_pokemon_attributes_1.o) 02302918 00000000 .text $a (dungeon_pokemon_attributes_1.o) 0230294C 00000030 .text IsTacticSet (dungeon_pokemon_attributes_1.o) @@ -37282,9 +37291,8 @@ 0231949C 00000000 .text $d (overlay_29_02317844.o) 023194AC 00000044 .text IsFloating (overlay_29_02318A4C.o) 023194AC 00000000 .text $a (overlay_29_02318A4C.o) - 023194F0 00000020 .text .text (overlay_29_02318A90.o) - 023194F0 00000020 .text ov29_02318A90 (overlay_29_02318A90.o) - 023194F0 00000000 .text $a (overlay_29_02318A90.o) + 023194F0 00000020 .text ov29_02318A90 (overlay_29_02318A4C.o) + 023194F0 00000000 .text $a (overlay_29_02318A4C.o) 02319510 00000024 .text IsMonster__02318AB0 (overlay_29_02318AB0.o) 02319510 00000000 .text $a (overlay_29_02318AB0.o) 02319534 00000000 .text $a (overlay_29_02318AD4.o) @@ -40172,7 +40180,7 @@ 02353478 00000000 .rodata DAMAGE_FORMULA_MAX_BASE (overlay_29_rodata_023527C0.o) 02353488 00000000 .rodata DAMAGE_FORMULA_MIN_BASE (overlay_29_rodata_023527C0.o) 02353490 00000000 .rodata .rodata (dungeon_damage.o) - 02353490 00000010 .rodata @180 (dungeon_damage.o) + 02353490 00000010 .rodata @186 (dungeon_damage.o) 023534A0 00000000 .rodata ov29_02352894 (overlay_29_rodata_02352894.o) 023534A0 000001CC .rodata .rodata (overlay_29_rodata_02352894.o) 023534B0 00000000 .rodata TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS (overlay_29_rodata_02352894.o) @@ -41225,5 +41233,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Wed Jan 28 15:56:47 2026 -# Link end time: Wed Jan 28 15:56:48 2026 +# Link start time: Tue Feb 03 18:10:16 2026 +# Link end time: Tue Feb 03 18:10:17 2026 diff --git a/pmdskyjp.xMAP b/pmdskyjp.xMAP index 4b78bb35..a33f9c9b 100644 --- a/pmdskyjp.xMAP +++ b/pmdskyjp.xMAP @@ -42,7 +42,6 @@ 16](_022A5970,notype) found in global main_bss_020B3380.o 16](sub_0200D310,func) found in global main_0200CAFC.o 17](sub_0200EB64,func) found in global main_0200EB30.o - 18](ItemZInit,func) found in global main_0200CAFC.o 18](BABY_EXCLUSIVE_ITEM_PAIRS,notype) found in global main_rodata_020908D4.o 19](sub_0204A190,func) found in global main_0203C774.o 20](CardPullOutWithStatus,func) found in global main_02003D2C.o @@ -137,6 +136,7 @@ 38](IsUnown,func) found in global main_02054AA4.o 38](IsDeoxys,func) found in global main_02054BE0.o 36](StrncpySimple,func) found in global main_020251AC.o + 36](ItemZInit,func) found in global main_0200CAFC.o 36](StrncmpSimple,func) found in global main_020251AC.o 36](sub_02025304_JP,func) found in global main_020251F0.o 36](EnableAllLearnableIqSkills,func) found in global main_02058E8C.o @@ -169,7 +169,8 @@ 41](GetThrownItemQuantityLimit,func) found in global item_util_1.o 40](IsItemInTimeDarkness,func) found in global main_0200EB30.o 40](IsTreasureBox,func) found in global item_util_4.o - 40](AddMoneyCarried,func) found in global main_0200ED1C.o + 40](AddMoneyCarried,func) found in global main_0200ECFC.o + 41](SetMoneyCarried,func) found in global main_0200ECFC.o 40](GetCurrentBagCapacity,func) found in global main_0200EDC0.o 41](GetExecuteSpecialEpisodeType,func) found in global special_episode.o 41](GetScenarioBalance,func) found in global progression.o @@ -182,9 +183,12 @@ 36](SaveScriptVariableValue,func) found in global script_variable.o 37](SetDebugSpecialEpisodeNumber,func) found in global special_episode.o 36](sub_0200C4CC,func) found in global main_0200C4CC.o + 37](RescueInventoryZInit,func) found in global main_0200ECFC.o + 37](SpecialEpisodeInventoryZInit,func) found in global main_0200ECFC.o 37](sub_02011AB8,func) found in global main_02010FC4.o 38](GetMaxPp,func) found in global moves.o 38](GetType,func) found in global main_0205283C.o + 38](GetExclusiveItem,func) found in global main_02052B28.o 38](RandRange,func) found in global main_0200224C.o 38](IsTicketItem,func) found in global item_util_4.o 38](GetItemCategoryVeneer,func) found in global item_util.o @@ -317,6 +321,7 @@ 77](ov29_022E273C,func) found in global overlay_29_022E1AD4.o 77](DungeonGetSpriteIndex,func) found in global overlay_29_022F7364.o 77](GetLoadedAttackSpriteId,func) found in global overlay_29_022F62CC.o + 77](NeedsItemToSpawn,func) found in global main_02052B28.o 77](SpawnMonster,func) found in global overlay_29_022FC9C0.o 78](IsDestinationFloorWithFleeingOutlaw,func) found in global overlay_29_02348D3C.o 79](ov29_02348ABC,func) found in global overlay_29_02348020.o @@ -811,7 +816,7 @@ 117](GetTypeMatchup,func) found in global type_effectiveness.o 118](ExclusiveItemEffectIsActive__0230A9B8,func) found in global overlay_29_0230A994.o 118](TYPE_MATCHUP_TABLE,object) found in global type_matchup_table.o - 117](@179,object) found in local dungeon_damage.o + 117](@185,object) found in local dungeon_damage.o 115](AI_POTENTIAL_ATTACK_TARGET_DIRECTIONS,object) found in global dungeon_ai_attack.o 114](IsTargetInRange,func) found in global dungeon_ai_attack.o 112](ov29_0231A8A0,func) found in global overlay_29_0231A8A0.o @@ -822,7 +827,8 @@ 113](DIRECTIONAL_BIT_MASKS__02352798,object) found in global directional_bit_masks.o 112](ov29_023085DC,func) found in global overlay_29_023085DC.o 113](GendersNotEqualNotGenderless,func) found in global main_02054DC4.o - 113](HasTypeAffectedByGravity,func) found in global overlay_29_02301E88.o + 113](HasTypeAffectedByGravity,func) found in global dungeon_logic_3.o + 114](IsTypeAffectedByGravity,func) found in global dungeon_logic_3.o 113](HasLowHealth,func) found in global dungeon_logic_4.o 113](CategoryIsNotPhysical,func) found in global overlay_29_0231EA04.o 113](ApplyDamage,func) found in global overlay_29_02308FE0.o @@ -1032,7 +1038,7 @@ 52](EntityIsValid__022EF7A0,func) found in global overlay_29_022EF7A0.o 51](GetFarOffPalsOption,func) found in global options.o 50](EntityIsValidMoveEffects__0232A3D8,func) found in global overlay_29_0232A3D8.o - 49](ov29_02318A90,func) found in global overlay_29_02318A90.o + 49](ov29_02318A90,func) found in global overlay_29_02318A4C.o 49](BoostHitChanceStat,func) found in global move_orb_effects.o 49](EntityIsValidMoveEffects__0232800C,func) found in global overlay_29_0232800C.o 45](ov31_02383434,func) found in global overlay_31_023833D8.o @@ -1041,6 +1047,7 @@ 46](ov31_02383328,func) found in global overlay_31_02383328.o 44](IsTeamStatsOnTopScreen,func) found in global options.o 44](CheckSpawnThreshold,func) found in global overlay_29_022FB538.o + 45](GetSpawnThreshold,func) found in global main_02052B28.o 44](IsDojoDungeon,func) found in global main_020514CC.o 42](GetWeightMultiplier,func) found in global main_0205283C.o 42](ApplyOffensiveStatMultiplier,func) found in global move_orb_effects.o @@ -1049,6 +1056,9 @@ 38](GetMoveMaxGinsengBoostGround,func) found in global moves.o 38](GetMoveBasePowerGround,func) found in global main_0201398C.o 38](GetExclusiveItemParameter,func) found in global item_util_1.o + 37](AllInventoriesZInit,func) found in global main_0200ECFC.o + 38](SetActiveInventory,func) found in global main_0200ECFC.o + 37](SetActiveInventoryToMain,func) found in global main_0200ECFC.o 37](LoadItemPspi2n,func) found in global item_util_1.o 36](LoadOptionsFromCtx,func) found in global options.o 36](SaveOptionsToCtx,func) found in global options.o @@ -2422,44 +2432,43 @@ 0200EAD0 00000000 .text $a (item_util_1.o) 0200EAD0 00000090 .text TestItemAiFlag (item_util_1.o) 0200EB5C 00000000 .text $d (item_util_1.o) - 0200EB60 00000000 .text $a (main_0200EB30.o) 0200EB60 00000028 .text IsItemInTimeDarkness (main_0200EB30.o) - 0200EB60 000001CC .text .text (main_0200EB30.o) + 0200EB60 00000000 .text $a (main_0200EB30.o) + 0200EB60 0000009C .text .text (main_0200EB30.o) 0200EB84 00000000 .text $d (main_0200EB30.o) 0200EB88 00000000 .text $a (main_0200EB30.o) 0200EB88 0000000C .text IsItemValidVeneer (main_0200EB30.o) 0200EB90 00000000 .text $d (main_0200EB30.o) - 0200EB94 00000000 .text $a (main_0200EB30.o) 0200EB94 0000002C .text sub_0200EB64 (main_0200EB30.o) + 0200EB94 00000000 .text $a (main_0200EB30.o) 0200EBB8 00000000 .text $d (main_0200EB30.o) - 0200EBC0 0000003C .text ReturnEggExclusiveItem (main_0200EB30.o) 0200EBC0 00000000 .text $a (main_0200EB30.o) + 0200EBC0 0000003C .text ReturnEggExclusiveItem (main_0200EB30.o) 0200EBF8 00000000 .text $d (main_0200EB30.o) - 0200EBFC 00000010 .text SetActiveInventoryToMain (main_0200EB30.o) - 0200EBFC 00000000 .text $a (main_0200EB30.o) - 0200EC08 00000000 .text $d (main_0200EB30.o) - 0200EC0C 0000006C .text AllInventoriesZInit (main_0200EB30.o) - 0200EC0C 00000000 .text $a (main_0200EB30.o) - 0200EC74 00000000 .text $d (main_0200EB30.o) - 0200EC78 00000048 .text SpecialEpisodeInventoryZInit (main_0200EB30.o) - 0200EC78 00000000 .text $a (main_0200EB30.o) - 0200ECBC 00000000 .text $d (main_0200EB30.o) - 0200ECC0 00000000 .text $a (main_0200EB30.o) - 0200ECC0 00000048 .text RescueInventoryZInit (main_0200EB30.o) - 0200ED04 00000000 .text $d (main_0200EB30.o) - 0200ED08 00000024 .text SetActiveInventory (main_0200EB30.o) - 0200ED08 00000000 .text $a (main_0200EB30.o) - 0200ED28 00000000 .text $d (main_0200EB30.o) + 0200EBFC 00000000 .text $a (main_0200ECFC.o) + 0200EBFC 00000010 .text SetActiveInventoryToMain (main_0200ECFC.o) + 0200EC08 00000000 .text $d (main_0200ECFC.o) + 0200EC0C 00000000 .text $a (main_0200ECFC.o) + 0200EC0C 0000006C .text AllInventoriesZInit (main_0200ECFC.o) + 0200EC74 00000000 .text $d (main_0200ECFC.o) + 0200EC78 00000000 .text $a (main_0200ECFC.o) + 0200EC78 00000048 .text SpecialEpisodeInventoryZInit (main_0200ECFC.o) + 0200ECBC 00000000 .text $d (main_0200ECFC.o) + 0200ECC0 00000000 .text $a (main_0200ECFC.o) + 0200ECC0 00000048 .text RescueInventoryZInit (main_0200ECFC.o) + 0200ED04 00000000 .text $d (main_0200ECFC.o) + 0200ED08 00000000 .text $a (main_0200ECFC.o) + 0200ED08 00000024 .text SetActiveInventory (main_0200ECFC.o) + 0200ED28 00000000 .text $d (main_0200ECFC.o) 0200ED2C 00000000 .text $a (main_0200ECFC.o) 0200ED2C 00000020 .text GetMoneyCarried (main_0200ECFC.o) 0200ED48 00000000 .text $d (main_0200ECFC.o) - 0200ED4C 00000068 .text .text (main_0200ED1C.o) - 0200ED4C 0000003C .text SetMoneyCarried (main_0200ED1C.o) - 0200ED4C 00000000 .text $a (main_0200ED1C.o) - 0200ED80 00000000 .text $d (main_0200ED1C.o) - 0200ED88 00000000 .text $a (main_0200ED1C.o) - 0200ED88 0000002C .text AddMoneyCarried (main_0200ED1C.o) - 0200EDAC 00000000 .text $d (main_0200ED1C.o) + 0200ED4C 00000000 .text $a (main_0200ECFC.o) + 0200ED4C 0000003C .text SetMoneyCarried (main_0200ECFC.o) + 0200ED80 00000000 .text $d (main_0200ECFC.o) + 0200ED88 00000000 .text $a (main_0200ECFC.o) + 0200ED88 0000002C .text AddMoneyCarried (main_0200ECFC.o) + 0200EDAC 00000000 .text $d (main_0200ECFC.o) 0200EDB4 0000003C .text GetCurrentBagCapacity (main_0200EDC0.o) 0200EDB4 00000000 .text $a (main_0200EDC0.o) 0200EDF0 00000000 .text $a (main_0200EDC0.o) @@ -7101,18 +7110,18 @@ 02052E60 00000000 .text $a (main_02052B28.o) 02052E60 0000001C .text GetIqGroup (main_02052B28.o) 02052E78 00000000 .text $d (main_02052B28.o) - 02052E7C 00001F44 .text .text (main_02052B44.o) - 02052E7C 00000000 .text $a (main_02052B44.o) - 02052E7C 0000001C .text GetSpawnThreshold (main_02052B44.o) - 02052E94 00000000 .text $d (main_02052B44.o) - 02052E98 00000000 .text $a (main_02052B44.o) - 02052E98 0000002C .text NeedsItemToSpawn (main_02052B44.o) - 02052EC0 00000000 .text $d (main_02052B44.o) - 02052EC4 00000000 .text $a (main_02052B44.o) - 02052EC4 0000002C .text GetExclusiveItem (main_02052B44.o) - 02052EEC 00000000 .text $d (main_02052B44.o) + 02052E7C 00000000 .text $a (main_02052B28.o) + 02052E7C 0000001C .text GetSpawnThreshold (main_02052B28.o) + 02052E94 00000000 .text $d (main_02052B28.o) + 02052E98 00000000 .text $a (main_02052B28.o) + 02052E98 0000002C .text NeedsItemToSpawn (main_02052B28.o) + 02052EC0 00000000 .text $d (main_02052B28.o) + 02052EC4 00000000 .text $a (main_02052B28.o) + 02052EC4 0000002C .text GetExclusiveItem (main_02052B28.o) + 02052EEC 00000000 .text $d (main_02052B28.o) 02052EF0 00000000 .text $a (main_02052B44.o) 02052EF0 0000001C .text GetFamilyIndex (main_02052B44.o) + 02052EF0 00001ED0 .text .text (main_02052B44.o) 02052F08 00000000 .text $d (main_02052B44.o) 02052F0C 00000000 .text $a (main_02052B44.o) 02052F0C 00000068 .text LoadM2nAndN2m (main_02052B44.o) @@ -7127,8 +7136,8 @@ 02053010 00000000 .text $a (main_02052B44.o) 02053020 0000000C .text sub_02052CE8 (main_02052B44.o) 02053028 00000000 .text $d (main_02052B44.o) - 0205302C 00000138 .text sub_02052CF4 (main_02052B44.o) 0205302C 00000000 .text $a (main_02052B44.o) + 0205302C 00000138 .text sub_02052CF4 (main_02052B44.o) 02053164 00000024 .text sub_02052E2C (main_02052B44.o) 02053188 000000AC .text GuestMonsterToGroundMonster (main_02052B44.o) 02053234 00000090 .text SetBaseStatsMovesGroundMonster (main_02052B44.o) @@ -7136,20 +7145,20 @@ 020532E8 00000048 .text StrcmpMonsterName (main_02052B44.o) 02053330 00000040 .text sub_02052FF8 (main_02052B44.o) 0205336C 00000000 .text $d (main_02052B44.o) - 02053370 0000009C .text sub_02053038 (main_02052B44.o) 02053370 00000000 .text $a (main_02052B44.o) + 02053370 0000009C .text sub_02053038 (main_02052B44.o) 02053404 00000000 .text $d (main_02052B44.o) - 0205340C 000000A0 .text sub_020530D4 (main_02052B44.o) 0205340C 00000000 .text $a (main_02052B44.o) + 0205340C 000000A0 .text sub_020530D4 (main_02052B44.o) 020534A8 00000000 .text $d (main_02052B44.o) - 020534AC 00000000 .text $a (main_02052B44.o) 020534AC 000000B0 .text sub_02053174 (main_02052B44.o) + 020534AC 00000000 .text $a (main_02052B44.o) 02053558 00000000 .text $d (main_02052B44.o) 0205355C 0000002C .text sub_02053224 (main_02052B44.o) 0205355C 00000000 .text $a (main_02052B44.o) 02053584 00000000 .text $d (main_02052B44.o) - 02053588 00000124 .text sub_02053250 (main_02052B44.o) 02053588 00000000 .text $a (main_02052B44.o) + 02053588 00000124 .text sub_02053250 (main_02052B44.o) 020536AC 00000128 .text sub_02053374 (main_02052B44.o) 020537D4 00000020 .text sub_0205349C (main_02052B44.o) 020537EC 00000000 .text $d (main_02052B44.o) @@ -7162,15 +7171,15 @@ 02053998 0000013C .text sub_02053660 (main_02052B44.o) 02053AD4 000000B0 .text GetLvlUpEntry (main_02052B44.o) 02053B7C 00000000 .text $d (main_02052B44.o) - 02053B84 00000034 .text GetEncodedHalfword (main_02052B44.o) 02053B84 00000000 .text $a (main_02052B44.o) + 02053B84 00000034 .text GetEncodedHalfword (main_02052B44.o) 02053BB8 00000084 .text sub_02053880 (main_02052B44.o) 02053C28 00000000 .text $d (main_02052B44.o) - 02053C3C 00000108 .text sub_02053904 (main_02052B44.o) 02053C3C 00000000 .text $a (main_02052B44.o) + 02053C3C 00000108 .text sub_02053904 (main_02052B44.o) 02053D40 00000000 .text $d (main_02052B44.o) - 02053D44 00000044 .text sub_02053A0C (main_02052B44.o) 02053D44 00000000 .text $a (main_02052B44.o) + 02053D44 00000044 .text sub_02053A0C (main_02052B44.o) 02053D88 000000E8 .text sub_02053A50 (main_02052B44.o) 02053E70 00000028 .text sub_02053B38 (main_02052B44.o) 02053E94 00000000 .text $d (main_02052B44.o) @@ -7207,21 +7216,21 @@ 020547B8 00000020 .text GetMonsterIdFromSpawnEntry (main_02052B44.o) 020547B8 00000000 .text $a (main_02052B44.o) 020547D4 00000000 .text $d (main_02052B44.o) - 020547D8 00000000 .text $a (main_02052B44.o) 020547D8 00000008 .text SetMonsterId (main_02052B44.o) + 020547D8 00000000 .text $a (main_02052B44.o) 020547E0 00000010 .text SetMonsterLevelAndId (main_02052B44.o) 020547F0 00000010 .text GetMonsterLevelFromSpawnEntry (main_02052B44.o) 02054800 00000220 .text ApplyLevelUpBoostsToGroundMonster (main_02052B44.o) 02054A1C 00000000 .text $d (main_02052B44.o) - 02054A20 00000000 .text $a (main_02052B44.o) 02054A20 00000078 .text sub_020546E8 (main_02052B44.o) + 02054A20 00000000 .text $a (main_02052B44.o) 02054A98 0000000C .text GetMonsterGenderVeneer (main_02052B44.o) 02054AA0 00000000 .text $d (main_02052B44.o) - 02054AA4 00000000 .text $a (main_02052B44.o) 02054AA4 0000005C .text IsMonsterValid (main_02052B44.o) + 02054AA4 00000000 .text $a (main_02052B44.o) 02054AF8 00000000 .text $d (main_02052B44.o) - 02054B00 00000010 .text sub_020547C8 (main_02052B44.o) 02054B00 00000000 .text $a (main_02052B44.o) + 02054B00 00000010 .text sub_020547C8 (main_02052B44.o) 02054B10 0000002C .text sub_020547D8 (main_02052B44.o) 02054B3C 00000020 .text sub_02054804 (main_02052B44.o) 02054B58 00000000 .text $d (main_02052B44.o) @@ -7231,8 +7240,8 @@ 02054B7C 00000000 .text $a (main_02052B44.o) 02054B7C 0000021C .text sub_02054844 (main_02052B44.o) 02054D88 00000000 .text $d (main_02052B44.o) - 02054D98 00000000 .text $a (main_02052B44.o) 02054D98 00000028 .text SprintfStatic__02054A60 (main_02052B44.o) + 02054D98 00000000 .text $a (main_02052B44.o) 02054DC0 0000001C .text IsUnown (main_02054AA4.o) 02054DC0 00000000 .text $a (main_02054AA4.o) 02054DDC 00000000 .text $a (main_02054AA4.o) @@ -36775,10 +36784,10 @@ 02303368 00000000 .text $a (dungeon_logic_3.o) 023033A0 00000038 .text MonsterIsType (dungeon_logic_3.o) 023033A0 00000000 .text $a (dungeon_logic_3.o) - 023033D8 00000000 .text $a (overlay_29_02301E88.o) - 023033D8 00000024 .text IsTypeAffectedByGravity (overlay_29_02301E88.o) - 023033D8 00000064 .text .text (overlay_29_02301E88.o) - 023033FC 00000040 .text HasTypeAffectedByGravity (overlay_29_02301E88.o) + 023033D8 00000024 .text IsTypeAffectedByGravity (dungeon_logic_3.o) + 023033D8 00000000 .text $a (dungeon_logic_3.o) + 023033FC 00000040 .text HasTypeAffectedByGravity (dungeon_logic_3.o) + 023033FC 00000000 .text $a (dungeon_logic_3.o) 0230343C 00000034 .text CanSeeInvisibleMonsters (dungeon_pokemon_attributes_1.o) 0230343C 00000000 .text $a (dungeon_pokemon_attributes_1.o) 02303470 00000030 .text IsTacticSet (dungeon_pokemon_attributes_1.o) @@ -37503,9 +37512,8 @@ 02319F0C 00000000 .text $d (overlay_29_02317844.o) 02319F1C 00000044 .text IsFloating (overlay_29_02318A4C.o) 02319F1C 00000000 .text $a (overlay_29_02318A4C.o) - 02319F60 00000020 .text .text (overlay_29_02318A90.o) - 02319F60 00000020 .text ov29_02318A90 (overlay_29_02318A90.o) - 02319F60 00000000 .text $a (overlay_29_02318A90.o) + 02319F60 00000020 .text ov29_02318A90 (overlay_29_02318A4C.o) + 02319F60 00000000 .text $a (overlay_29_02318A4C.o) 02319F80 00000024 .text IsMonster__02318AB0 (overlay_29_02318AB0.o) 02319F80 00000000 .text $a (overlay_29_02318AB0.o) 02319FA4 00000000 .text $a (overlay_29_02318AD4.o) @@ -40382,7 +40390,7 @@ 02353AEC 00000000 .rodata DAMAGE_FORMULA_MAX_BASE (overlay_29_rodata_023527C0.o) 02353AFC 00000000 .rodata DAMAGE_FORMULA_MIN_BASE (overlay_29_rodata_023527C0.o) 02353B04 00000000 .rodata .rodata (dungeon_damage.o) - 02353B04 00000010 .rodata @179 (dungeon_damage.o) + 02353B04 00000010 .rodata @185 (dungeon_damage.o) 02353B14 00000000 .rodata ov29_02352894 (overlay_29_rodata_02352894.o) 02353B14 000001CC .rodata .rodata (overlay_29_rodata_02352894.o) 02353B24 00000000 .rodata TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS (overlay_29_rodata_02352894.o) @@ -41432,5 +41440,5 @@ 00000000 00000000 00004060 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Wed Jan 28 15:58:16 2026 -# Link end time: Wed Jan 28 15:58:17 2026 +# Link start time: Tue Feb 03 18:11:40 2026 +# Link end time: Tue Feb 03 18:11:41 2026 diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index eaad56a9..168af01f 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -41,7 +41,6 @@ 16](_022A5970,notype) found in global main_bss_020B3380.o 16](sub_0200D310,func) found in global main_0200CAFC.o 17](sub_0200EB64,func) found in global main_0200EB30.o - 18](ItemZInit,func) found in global main_0200CAFC.o 18](BABY_EXCLUSIVE_ITEM_PAIRS,notype) found in global main_rodata_020908D4.o 19](sub_0204A190,func) found in global main_0203C774.o 20](CardPullOutWithStatus,func) found in global main_02003D2C.o @@ -136,6 +135,7 @@ 38](IsUnown,func) found in global main_02054AA4.o 38](IsDeoxys,func) found in global main_02054BE0.o 36](StrncpySimple,func) found in global main_020251AC.o + 36](ItemZInit,func) found in global main_0200CAFC.o 36](StrncmpSimple,func) found in global main_020251AC.o 36](StrcpyName,func) found in global main_020251F0.o 36](EnableAllLearnableIqSkills,func) found in global main_02058E8C.o @@ -168,7 +168,8 @@ 41](GetThrownItemQuantityLimit,func) found in global item_util_1.o 40](IsItemInTimeDarkness,func) found in global main_0200EB30.o 40](IsTreasureBox,func) found in global item_util_4.o - 40](AddMoneyCarried,func) found in global main_0200ED1C.o + 40](AddMoneyCarried,func) found in global main_0200ECFC.o + 41](SetMoneyCarried,func) found in global main_0200ECFC.o 40](GetCurrentBagCapacity,func) found in global main_0200EDC0.o 41](GetExecuteSpecialEpisodeType,func) found in global special_episode.o 41](GetScenarioBalance,func) found in global progression.o @@ -182,9 +183,12 @@ 36](SaveScriptVariableValue,func) found in global script_variable.o 37](SetDebugSpecialEpisodeNumber,func) found in global special_episode.o 36](sub_0200C4CC,func) found in global main_0200C4CC.o + 37](RescueInventoryZInit,func) found in global main_0200ECFC.o + 37](SpecialEpisodeInventoryZInit,func) found in global main_0200ECFC.o 37](sub_02011AB8,func) found in global main_02010FC4.o 38](GetMaxPp,func) found in global moves.o 38](GetType,func) found in global main_0205283C.o + 38](GetExclusiveItem,func) found in global main_02052B28.o 38](RandRange,func) found in global main_0200224C.o 38](IsTicketItem,func) found in global item_util_4.o 38](IQ_GUMMI_GAIN_TABLE,notype) found in global main_rodata_020A20B1.o @@ -317,6 +321,7 @@ 77](ov29_022E273C,func) found in global overlay_29_022E1AD4.o 77](DungeonGetSpriteIndex,func) found in global overlay_29_022F7364.o 77](GetLoadedAttackSpriteId,func) found in global overlay_29_022F62CC.o + 77](NeedsItemToSpawn,func) found in global main_02052B28.o 77](SpawnMonster,func) found in global overlay_29_022FC9C0.o 78](IsDestinationFloorWithFleeingOutlaw,func) found in global overlay_29_02348D3C.o 79](ov29_02348ABC,func) found in global overlay_29_02348020.o @@ -814,7 +819,7 @@ 117](GetTypeMatchup,func) found in global type_effectiveness.o 118](ExclusiveItemEffectIsActive__0230A9B8,func) found in global overlay_29_0230A994.o 118](TYPE_MATCHUP_TABLE,object) found in global type_matchup_table.o - 117](@180,object) found in local dungeon_damage.o + 117](@186,object) found in local dungeon_damage.o 115](AI_POTENTIAL_ATTACK_TARGET_DIRECTIONS,object) found in global dungeon_ai_attack.o 114](IsTargetInRange,func) found in global dungeon_ai_attack.o 112](ov29_0231A8A0,func) found in global overlay_29_0231A8A0.o @@ -825,7 +830,8 @@ 113](DIRECTIONAL_BIT_MASKS__02352798,object) found in global directional_bit_masks.o 112](ov29_023085DC,func) found in global overlay_29_023085DC.o 113](GendersNotEqualNotGenderless,func) found in global main_02054DC4.o - 113](HasTypeAffectedByGravity,func) found in global overlay_29_02301E88.o + 113](HasTypeAffectedByGravity,func) found in global dungeon_logic_3.o + 114](IsTypeAffectedByGravity,func) found in global dungeon_logic_3.o 113](HasLowHealth,func) found in global dungeon_logic_4.o 113](CategoryIsNotPhysical,func) found in global overlay_29_0231EA04.o 113](ApplyDamage,func) found in global overlay_29_02308FE0.o @@ -1036,7 +1042,7 @@ 52](EntityIsValid__022EF7A0,func) found in global overlay_29_022EF7A0.o 51](GetFarOffPalsOption,func) found in global options.o 50](EntityIsValidMoveEffects__0232A3D8,func) found in global overlay_29_0232A3D8.o - 49](ov29_02318A90,func) found in global overlay_29_02318A90.o + 49](ov29_02318A90,func) found in global overlay_29_02318A4C.o 49](BoostHitChanceStat,func) found in global move_orb_effects.o 49](EntityIsValidMoveEffects__0232800C,func) found in global overlay_29_0232800C.o 45](ov31_02383434,func) found in global overlay_31_023833D8.o @@ -1045,6 +1051,7 @@ 46](ov31_02383328,func) found in global overlay_31_02383328.o 44](IsTeamStatsOnTopScreen,func) found in global options.o 44](CheckSpawnThreshold,func) found in global overlay_29_022FB538.o + 45](GetSpawnThreshold,func) found in global main_02052B28.o 44](IsDojoDungeon,func) found in global main_020514CC.o 42](GetWeightMultiplier,func) found in global main_0205283C.o 42](ApplyOffensiveStatMultiplier,func) found in global move_orb_effects.o @@ -1053,6 +1060,9 @@ 38](GetMoveMaxGinsengBoostGround,func) found in global moves.o 38](GetMoveBasePowerGround,func) found in global main_0201398C.o 38](GetExclusiveItemParameter,func) found in global item_util_1.o + 37](AllInventoriesZInit,func) found in global main_0200ECFC.o + 38](SetActiveInventory,func) found in global main_0200ECFC.o + 37](SetActiveInventoryToMain,func) found in global main_0200ECFC.o 37](LoadItemPspi2n,func) found in global item_util_1.o 36](LoadOptionsFromCtx,func) found in global options.o 36](SaveOptionsToCtx,func) found in global options.o @@ -2426,44 +2436,43 @@ 0200EAA0 00000000 .text $a (item_util_1.o) 0200EAA0 00000090 .text TestItemAiFlag (item_util_1.o) 0200EB2C 00000000 .text $d (item_util_1.o) - 0200EB30 00000000 .text $a (main_0200EB30.o) 0200EB30 00000028 .text IsItemInTimeDarkness (main_0200EB30.o) - 0200EB30 000001CC .text .text (main_0200EB30.o) + 0200EB30 00000000 .text $a (main_0200EB30.o) + 0200EB30 0000009C .text .text (main_0200EB30.o) 0200EB54 00000000 .text $d (main_0200EB30.o) 0200EB58 00000000 .text $a (main_0200EB30.o) 0200EB58 0000000C .text IsItemValidVeneer (main_0200EB30.o) 0200EB60 00000000 .text $d (main_0200EB30.o) - 0200EB64 00000000 .text $a (main_0200EB30.o) 0200EB64 0000002C .text sub_0200EB64 (main_0200EB30.o) + 0200EB64 00000000 .text $a (main_0200EB30.o) 0200EB88 00000000 .text $d (main_0200EB30.o) - 0200EB90 0000003C .text ReturnEggExclusiveItem (main_0200EB30.o) 0200EB90 00000000 .text $a (main_0200EB30.o) + 0200EB90 0000003C .text ReturnEggExclusiveItem (main_0200EB30.o) 0200EBC8 00000000 .text $d (main_0200EB30.o) - 0200EBCC 00000010 .text SetActiveInventoryToMain (main_0200EB30.o) - 0200EBCC 00000000 .text $a (main_0200EB30.o) - 0200EBD8 00000000 .text $d (main_0200EB30.o) - 0200EBDC 0000006C .text AllInventoriesZInit (main_0200EB30.o) - 0200EBDC 00000000 .text $a (main_0200EB30.o) - 0200EC44 00000000 .text $d (main_0200EB30.o) - 0200EC48 00000048 .text SpecialEpisodeInventoryZInit (main_0200EB30.o) - 0200EC48 00000000 .text $a (main_0200EB30.o) - 0200EC8C 00000000 .text $d (main_0200EB30.o) - 0200EC90 00000000 .text $a (main_0200EB30.o) - 0200EC90 00000048 .text RescueInventoryZInit (main_0200EB30.o) - 0200ECD4 00000000 .text $d (main_0200EB30.o) - 0200ECD8 00000024 .text SetActiveInventory (main_0200EB30.o) - 0200ECD8 00000000 .text $a (main_0200EB30.o) - 0200ECF8 00000000 .text $d (main_0200EB30.o) + 0200EBCC 00000000 .text $a (main_0200ECFC.o) + 0200EBCC 00000010 .text SetActiveInventoryToMain (main_0200ECFC.o) + 0200EBD8 00000000 .text $d (main_0200ECFC.o) + 0200EBDC 00000000 .text $a (main_0200ECFC.o) + 0200EBDC 0000006C .text AllInventoriesZInit (main_0200ECFC.o) + 0200EC44 00000000 .text $d (main_0200ECFC.o) + 0200EC48 00000000 .text $a (main_0200ECFC.o) + 0200EC48 00000048 .text SpecialEpisodeInventoryZInit (main_0200ECFC.o) + 0200EC8C 00000000 .text $d (main_0200ECFC.o) + 0200EC90 00000000 .text $a (main_0200ECFC.o) + 0200EC90 00000048 .text RescueInventoryZInit (main_0200ECFC.o) + 0200ECD4 00000000 .text $d (main_0200ECFC.o) + 0200ECD8 00000000 .text $a (main_0200ECFC.o) + 0200ECD8 00000024 .text SetActiveInventory (main_0200ECFC.o) + 0200ECF8 00000000 .text $d (main_0200ECFC.o) 0200ECFC 00000000 .text $a (main_0200ECFC.o) 0200ECFC 00000020 .text GetMoneyCarried (main_0200ECFC.o) 0200ED18 00000000 .text $d (main_0200ECFC.o) - 0200ED1C 00000068 .text .text (main_0200ED1C.o) - 0200ED1C 0000003C .text SetMoneyCarried (main_0200ED1C.o) - 0200ED1C 00000000 .text $a (main_0200ED1C.o) - 0200ED50 00000000 .text $d (main_0200ED1C.o) - 0200ED58 00000000 .text $a (main_0200ED1C.o) - 0200ED58 0000002C .text AddMoneyCarried (main_0200ED1C.o) - 0200ED7C 00000000 .text $d (main_0200ED1C.o) + 0200ED1C 00000000 .text $a (main_0200ECFC.o) + 0200ED1C 0000003C .text SetMoneyCarried (main_0200ECFC.o) + 0200ED50 00000000 .text $d (main_0200ECFC.o) + 0200ED58 00000000 .text $a (main_0200ECFC.o) + 0200ED58 0000002C .text AddMoneyCarried (main_0200ECFC.o) + 0200ED7C 00000000 .text $d (main_0200ECFC.o) 0200ED84 0000003C .text GetCurrentBagCapacity (main_0200EDC0.o) 0200ED84 00000000 .text $a (main_0200EDC0.o) 0200EDC0 00000000 .text $a (main_0200EDC0.o) @@ -7097,18 +7106,18 @@ 02052B28 00000000 .text $a (main_02052B28.o) 02052B28 0000001C .text GetIqGroup (main_02052B28.o) 02052B40 00000000 .text $d (main_02052B28.o) - 02052B44 00001F44 .text .text (main_02052B44.o) - 02052B44 00000000 .text $a (main_02052B44.o) - 02052B44 0000001C .text GetSpawnThreshold (main_02052B44.o) - 02052B5C 00000000 .text $d (main_02052B44.o) - 02052B60 00000000 .text $a (main_02052B44.o) - 02052B60 0000002C .text NeedsItemToSpawn (main_02052B44.o) - 02052B88 00000000 .text $d (main_02052B44.o) - 02052B8C 00000000 .text $a (main_02052B44.o) - 02052B8C 0000002C .text GetExclusiveItem (main_02052B44.o) - 02052BB4 00000000 .text $d (main_02052B44.o) + 02052B44 00000000 .text $a (main_02052B28.o) + 02052B44 0000001C .text GetSpawnThreshold (main_02052B28.o) + 02052B5C 00000000 .text $d (main_02052B28.o) + 02052B60 00000000 .text $a (main_02052B28.o) + 02052B60 0000002C .text NeedsItemToSpawn (main_02052B28.o) + 02052B88 00000000 .text $d (main_02052B28.o) + 02052B8C 00000000 .text $a (main_02052B28.o) + 02052B8C 0000002C .text GetExclusiveItem (main_02052B28.o) + 02052BB4 00000000 .text $d (main_02052B28.o) 02052BB8 00000000 .text $a (main_02052B44.o) 02052BB8 0000001C .text GetFamilyIndex (main_02052B44.o) + 02052BB8 00001ED0 .text .text (main_02052B44.o) 02052BD0 00000000 .text $d (main_02052B44.o) 02052BD4 00000000 .text $a (main_02052B44.o) 02052BD4 00000068 .text LoadM2nAndN2m (main_02052B44.o) @@ -7123,8 +7132,8 @@ 02052CD8 00000000 .text $a (main_02052B44.o) 02052CE8 0000000C .text sub_02052CE8 (main_02052B44.o) 02052CF0 00000000 .text $d (main_02052B44.o) - 02052CF4 00000138 .text sub_02052CF4 (main_02052B44.o) 02052CF4 00000000 .text $a (main_02052B44.o) + 02052CF4 00000138 .text sub_02052CF4 (main_02052B44.o) 02052E2C 00000024 .text sub_02052E2C (main_02052B44.o) 02052E50 000000AC .text GuestMonsterToGroundMonster (main_02052B44.o) 02052EFC 00000090 .text SetBaseStatsMovesGroundMonster (main_02052B44.o) @@ -7132,20 +7141,20 @@ 02052FB0 00000048 .text StrcmpMonsterName (main_02052B44.o) 02052FF8 00000040 .text sub_02052FF8 (main_02052B44.o) 02053034 00000000 .text $d (main_02052B44.o) - 02053038 0000009C .text sub_02053038 (main_02052B44.o) 02053038 00000000 .text $a (main_02052B44.o) + 02053038 0000009C .text sub_02053038 (main_02052B44.o) 020530CC 00000000 .text $d (main_02052B44.o) - 020530D4 000000A0 .text sub_020530D4 (main_02052B44.o) 020530D4 00000000 .text $a (main_02052B44.o) + 020530D4 000000A0 .text sub_020530D4 (main_02052B44.o) 02053170 00000000 .text $d (main_02052B44.o) - 02053174 00000000 .text $a (main_02052B44.o) 02053174 000000B0 .text sub_02053174 (main_02052B44.o) + 02053174 00000000 .text $a (main_02052B44.o) 02053220 00000000 .text $d (main_02052B44.o) 02053224 0000002C .text sub_02053224 (main_02052B44.o) 02053224 00000000 .text $a (main_02052B44.o) 0205324C 00000000 .text $d (main_02052B44.o) - 02053250 00000124 .text sub_02053250 (main_02052B44.o) 02053250 00000000 .text $a (main_02052B44.o) + 02053250 00000124 .text sub_02053250 (main_02052B44.o) 02053374 00000128 .text sub_02053374 (main_02052B44.o) 0205349C 00000020 .text sub_0205349C (main_02052B44.o) 020534B4 00000000 .text $d (main_02052B44.o) @@ -7158,15 +7167,15 @@ 02053660 0000013C .text sub_02053660 (main_02052B44.o) 0205379C 000000B0 .text GetLvlUpEntry (main_02052B44.o) 02053844 00000000 .text $d (main_02052B44.o) - 0205384C 00000034 .text GetEncodedHalfword (main_02052B44.o) 0205384C 00000000 .text $a (main_02052B44.o) + 0205384C 00000034 .text GetEncodedHalfword (main_02052B44.o) 02053880 00000084 .text sub_02053880 (main_02052B44.o) 020538F0 00000000 .text $d (main_02052B44.o) - 02053904 00000108 .text sub_02053904 (main_02052B44.o) 02053904 00000000 .text $a (main_02052B44.o) + 02053904 00000108 .text sub_02053904 (main_02052B44.o) 02053A08 00000000 .text $d (main_02052B44.o) - 02053A0C 00000044 .text sub_02053A0C (main_02052B44.o) 02053A0C 00000000 .text $a (main_02052B44.o) + 02053A0C 00000044 .text sub_02053A0C (main_02052B44.o) 02053A50 000000E8 .text sub_02053A50 (main_02052B44.o) 02053B38 00000028 .text sub_02053B38 (main_02052B44.o) 02053B5C 00000000 .text $d (main_02052B44.o) @@ -7203,21 +7212,21 @@ 02054480 00000020 .text GetMonsterIdFromSpawnEntry (main_02052B44.o) 02054480 00000000 .text $a (main_02052B44.o) 0205449C 00000000 .text $d (main_02052B44.o) - 020544A0 00000000 .text $a (main_02052B44.o) 020544A0 00000008 .text SetMonsterId (main_02052B44.o) + 020544A0 00000000 .text $a (main_02052B44.o) 020544A8 00000010 .text SetMonsterLevelAndId (main_02052B44.o) 020544B8 00000010 .text GetMonsterLevelFromSpawnEntry (main_02052B44.o) 020544C8 00000220 .text ApplyLevelUpBoostsToGroundMonster (main_02052B44.o) 020546E4 00000000 .text $d (main_02052B44.o) - 020546E8 00000000 .text $a (main_02052B44.o) 020546E8 00000078 .text sub_020546E8 (main_02052B44.o) + 020546E8 00000000 .text $a (main_02052B44.o) 02054760 0000000C .text GetMonsterGenderVeneer (main_02052B44.o) 02054768 00000000 .text $d (main_02052B44.o) - 0205476C 00000000 .text $a (main_02052B44.o) 0205476C 0000005C .text IsMonsterValid (main_02052B44.o) + 0205476C 00000000 .text $a (main_02052B44.o) 020547C0 00000000 .text $d (main_02052B44.o) - 020547C8 00000010 .text sub_020547C8 (main_02052B44.o) 020547C8 00000000 .text $a (main_02052B44.o) + 020547C8 00000010 .text sub_020547C8 (main_02052B44.o) 020547D8 0000002C .text sub_020547D8 (main_02052B44.o) 02054804 00000020 .text sub_02054804 (main_02052B44.o) 02054820 00000000 .text $d (main_02052B44.o) @@ -7227,8 +7236,8 @@ 02054844 00000000 .text $a (main_02052B44.o) 02054844 0000021C .text sub_02054844 (main_02052B44.o) 02054A50 00000000 .text $d (main_02052B44.o) - 02054A60 00000000 .text $a (main_02052B44.o) 02054A60 00000028 .text SprintfStatic__02054A60 (main_02052B44.o) + 02054A60 00000000 .text $a (main_02052B44.o) 02054A88 0000001C .text IsUnown (main_02054AA4.o) 02054A88 00000000 .text $a (main_02054AA4.o) 02054AA4 00000000 .text $a (main_02054AA4.o) @@ -36515,10 +36524,10 @@ 02301E18 00000000 .text $a (dungeon_logic_3.o) 02301E50 00000038 .text MonsterIsType (dungeon_logic_3.o) 02301E50 00000000 .text $a (dungeon_logic_3.o) - 02301E88 00000000 .text $a (overlay_29_02301E88.o) - 02301E88 00000024 .text IsTypeAffectedByGravity (overlay_29_02301E88.o) - 02301E88 00000064 .text .text (overlay_29_02301E88.o) - 02301EAC 00000040 .text HasTypeAffectedByGravity (overlay_29_02301E88.o) + 02301E88 00000024 .text IsTypeAffectedByGravity (dungeon_logic_3.o) + 02301E88 00000000 .text $a (dungeon_logic_3.o) + 02301EAC 00000040 .text HasTypeAffectedByGravity (dungeon_logic_3.o) + 02301EAC 00000000 .text $a (dungeon_logic_3.o) 02301EEC 00000034 .text CanSeeInvisibleMonsters (dungeon_pokemon_attributes_1.o) 02301EEC 00000000 .text $a (dungeon_pokemon_attributes_1.o) 02301F20 00000030 .text IsTacticSet (dungeon_pokemon_attributes_1.o) @@ -37242,9 +37251,8 @@ 02318A3C 00000000 .text $d (overlay_29_02317844.o) 02318A4C 00000044 .text IsFloating (overlay_29_02318A4C.o) 02318A4C 00000000 .text $a (overlay_29_02318A4C.o) - 02318A90 00000020 .text .text (overlay_29_02318A90.o) - 02318A90 00000020 .text ov29_02318A90 (overlay_29_02318A90.o) - 02318A90 00000000 .text $a (overlay_29_02318A90.o) + 02318A90 00000020 .text ov29_02318A90 (overlay_29_02318A4C.o) + 02318A90 00000000 .text $a (overlay_29_02318A4C.o) 02318AB0 00000024 .text IsMonster__02318AB0 (overlay_29_02318AB0.o) 02318AB0 00000000 .text $a (overlay_29_02318AB0.o) 02318AD4 00000000 .text $a (overlay_29_02318AD4.o) @@ -40133,7 +40141,7 @@ 0235286C 00000000 .rodata DAMAGE_FORMULA_MAX_BASE (overlay_29_rodata_023527C0.o) 0235287C 00000000 .rodata DAMAGE_FORMULA_MIN_BASE (overlay_29_rodata_023527C0.o) 02352884 00000000 .rodata .rodata (dungeon_damage.o) - 02352884 00000010 .rodata @180 (dungeon_damage.o) + 02352884 00000010 .rodata @186 (dungeon_damage.o) 02352894 00000000 .rodata ov29_02352894 (overlay_29_rodata_02352894.o) 02352894 000001CC .rodata .rodata (overlay_29_rodata_02352894.o) 023528A4 00000000 .rodata TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS (overlay_29_rodata_02352894.o) @@ -41191,5 +41199,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Wed Jan 28 15:55:15 2026 -# Link end time: Wed Jan 28 15:55:16 2026 +# Link start time: Tue Feb 03 18:08:50 2026 +# Link end time: Tue Feb 03 18:08:51 2026