From dbebcdd002a5cd2b6cb1b695ee6e1992d3f54557 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 8 Jul 2026 01:12:16 +0000 Subject: [PATCH] Merge pull request #278 from AnonymousRandomPerson/main --- pmdskyeu.xMAP | 42 +++++++++++++++++++++--------------------- pmdskyjp.xMAP | 44 ++++++++++++++++++++++---------------------- pmdskyus.xMAP | 44 ++++++++++++++++++++++---------------------- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP index 1cec6fc5..804a80ad 100644 --- a/pmdskyeu.xMAP +++ b/pmdskyeu.xMAP @@ -935,7 +935,7 @@ 115](TreasureBoxDropsEnabled,func) found in global dungeon_recruitment_2.o 114](ov29_022FEDBC,func) found in global overlay_29_022FEDBC.o 115](ActivateFlashFire,func) found in global move_orb_effects.o - 114](ov29_02318D58,func) found in global overlay_29_02318D58.o + 114](EndTwoTurnMove,func) found in global overlay_29_02318D58.o 115](EntityIsValid__02318D34,func) found in global overlay_29_02318D34.o 114](TrySpawnTrapperTrap,func) found in global overlay_29_022EDCBC.o 114](ov29_022F52B0,func) found in global overlay_29_022F52B0.o @@ -1055,7 +1055,7 @@ 122](CosAbs4096,func) found in global main_020018D0.o 119](BoostOffensiveStat,func) found in global move_orb_effects.o 119](TryActivateGravity,func) found in global overlay_29_0233836C.o - 119](ov29_02318BBC,func) found in global overlay_29_02318AD4.o + 119](BeginChargedMove,func) found in global overlay_29_02318AD4.o 120](IsMonster__02318AB0,func) found in global overlay_29_02318AB0.o 119](TryInflictCringeStatus,func) found in global move_orb_effects.o 119](LowerHitChanceStat,func) found in global move_orb_effects.o @@ -1159,7 +1159,7 @@ 103](IsTextLogOnTopScreen,func) found in global options.o 103](SetActionUseMovePlayer,func) found in global overlay_29_022EBC98.o 103](GetDPadAttackOption,func) found in global options.o - 103](ov29_022FF3F4,func) found in global overlay_29_022FF3F4.o + 103](HasStatusThatPreventsLeaderActing,func) found in global overlay_29_022FF3F4.o 103](SetTopScreenOption,func) found in global options.o 103](GetBottomScreenOption,func) found in global options.o 101](IsMonster__0234D460,func) found in global overlay_29_0234D460.o @@ -4690,7 +4690,7 @@ 020279B4 000001E8 .text NewWindow (main_0202676C.o) 020279B4 00000000 .text $a (main_0202676C.o) 02027B8C 00000000 .text $d (main_0202676C.o) - 02027B9C 0000001C .text GetPaletteBaseAddress__02027B9C (main_0202676C.o) + 02027B9C 0000001C .text GetPaletteBaseAddress__020278A8 (main_0202676C.o) 02027B9C 00000000 .text $a (main_0202676C.o) 02027BB4 00000000 .text $d (main_0202676C.o) 02027BB8 00000000 .text $a (main_0202676C.o) @@ -36318,7 +36318,7 @@ 022F0154 00000024 .text EntityIsValid__022EF7A0 (overlay_29_022EF7A0.o) 022F0154 00000000 .text $a (overlay_29_022EF7A0.o) 022F0178 00000228 .text .text (overlay_29_022EF7C4.o) - 022F0178 000000E0 .text ov29_022EF7C4 (overlay_29_022EF7C4.o) + 022F0178 000000E0 .text CheckBossFightVictory (overlay_29_022EF7C4.o) 022F0178 00000000 .text $a (overlay_29_022EF7C4.o) 022F0250 00000000 .text $d (overlay_29_022EF7C4.o) 022F0258 00000094 .text ov29_022EF8A4 (overlay_29_022EF7C4.o) @@ -36380,7 +36380,7 @@ 022F118C 00000000 .text $a (overlay_29_022F05B4.o) 022F11F8 00000000 .text $d (overlay_29_022F05B4.o) 022F11FC 00000000 .text $a (overlay_29_022F05B4.o) - 022F11FC 00000014 .text ov29_022F0848 (overlay_29_022F05B4.o) + 022F11FC 00000014 .text ReopenMinimap (overlay_29_022F05B4.o) 022F120C 00000000 .text $d (overlay_29_022F05B4.o) 022F1210 00000000 .text $a (overlay_29_022F05B4.o) 022F1210 00000128 .text GonePebbleGradualPaletteShift (overlay_29_022F05B4.o) @@ -36935,7 +36935,7 @@ 022FFE08 00000000 .text $d (status_checks.o) 022FFE20 00000000 .text $a (overlay_29_022FF3F4.o) 022FFE20 00000238 .text .text (overlay_29_022FF3F4.o) - 022FFE20 00000238 .text ov29_022FF3F4 (overlay_29_022FF3F4.o) + 022FFE20 00000238 .text HasStatusThatPreventsLeaderActing (overlay_29_022FF3F4.o) 02300038 00000000 .text $d (overlay_29_022FF3F4.o) 02300058 00000000 .text $a (dungeon_mobility.o) 02300058 00000048 .text GetMobilityTypeCheckSlip (dungeon_mobility.o) @@ -37026,7 +37026,7 @@ 023013CC 0000002C .text ov29_023009A0 (overlay_29_023009A0.o) 023013CC 00000000 .text $a (overlay_29_023009A0.o) 023013F8 00000138 .text ov29_023009CC (overlay_29_023009A0.o) - 02301530 0000003C .text ov29_02300B04 (overlay_29_023009A0.o) + 02301530 0000003C .text HasStatusThatPreventsOutlawEscaping (overlay_29_023009A0.o) 0230156C 000000B8 .text CheckVariousConditions__0230156C (dungeon_capabilities_1.o) 0230156C 00000000 .text $a (dungeon_capabilities_1.o) 02301624 000000B8 .text CheckVariousConditions__02301624 (dungeon_capabilities_1.o) @@ -37708,7 +37708,7 @@ 0231624C 000001E8 .text TryInflictLeechSeedStatus (overlay_29_0231516C.o) 0231641C 00000000 .text $d (overlay_29_0231516C.o) 02316434 00000000 .text $a (overlay_29_0231516C.o) - 02316434 0000007C .text ov29_023159D4 (overlay_29_0231516C.o) + 02316434 0000007C .text EndLeechSeedStatusForAllTargets (overlay_29_0231516C.o) 023164AC 00000000 .text $d (overlay_29_0231516C.o) 023164B0 00000000 .text $a (overlay_29_0231516C.o) 023164B0 00000120 .text TryInflictDestinyBondStatus (overlay_29_0231516C.o) @@ -37852,15 +37852,15 @@ 02319510 00000000 .text $a (overlay_29_02318AB0.o) 02319534 00000000 .text $a (overlay_29_02318AD4.o) 02319534 00000260 .text .text (overlay_29_02318AD4.o) - 02319534 00000074 .text ov29_02318AD4 (overlay_29_02318AD4.o) - 023195A8 00000074 .text ov29_02318B48 (overlay_29_02318AD4.o) - 0231961C 00000178 .text ov29_02318BBC (overlay_29_02318AD4.o) + 02319534 00000074 .text WaitUntilMonsterFliesOffscreen (overlay_29_02318AD4.o) + 023195A8 00000074 .text WaitUntilMonsterIsBackOnGround (overlay_29_02318AD4.o) + 0231961C 00000178 .text BeginChargedMove (overlay_29_02318AD4.o) 02319780 00000000 .text $d (overlay_29_02318AD4.o) 02319794 00000024 .text EntityIsValid__02318D34 (overlay_29_02318D34.o) 02319794 00000000 .text $a (overlay_29_02318D34.o) 023197B8 00000000 .text $a (overlay_29_02318D58.o) 023197B8 000000F4 .text .text (overlay_29_02318D58.o) - 023197B8 00000040 .text ov29_02318D58 (overlay_29_02318D58.o) + 023197B8 00000040 .text EndTwoTurnMove (overlay_29_02318D58.o) 023197F8 000000B4 .text SetReflectStatus (overlay_29_02318D58.o) 023198A0 00000000 .text $d (overlay_29_02318D58.o) 023198AC 00000024 .text EntityIsValid__02318E4C (overlay_29_02318E4C.o) @@ -39109,7 +39109,7 @@ 02336250 00000004 .text ov29_02335804 (overlay_29_023350FC.o) 02336254 0000005C .text InitUi3dElement (overlay_29_023350FC.o) 023362AC 00000000 .text $d (overlay_29_023350FC.o) - 023362B0 0000001C .text GetPaletteBaseAddress__02027B9C (overlay_29_023350FC.o) + 023362B0 0000001C .text GetPaletteBaseAddressOv29 (overlay_29_023350FC.o) 023362B0 00000000 .text $a (overlay_29_023350FC.o) 023362C8 00000000 .text $d (overlay_29_023350FC.o) 023362CC 00000108 .text DisplayNumberTextureUi (overlay_29_023350FC.o) @@ -40104,7 +40104,7 @@ 0234C0E0 00000014 .text ov29_0234B4E0 (overlay_29_0234AEE8.o) 0234C0E0 00000000 .text $a (overlay_29_0234AEE8.o) 0234C0F0 00000000 .text $d (overlay_29_0234AEE8.o) - 0234C0F4 00000014 .text ov29_0234B4F4 (overlay_29_0234AEE8.o) + 0234C0F4 00000014 .text GetAlertBoxLoadingStatus (overlay_29_0234AEE8.o) 0234C0F4 00000000 .text $a (overlay_29_0234AEE8.o) 0234C104 00000000 .text $d (overlay_29_0234AEE8.o) 0234C108 00000000 .text $a (overlay_29_0234AEE8.o) @@ -40127,7 +40127,7 @@ 0234C618 00000000 .text $a (overlay_29_0234AEE8.o) 0234C650 00000000 .text $d (overlay_29_0234AEE8.o) 0234C654 00000000 .text $a (overlay_29_0234AEE8.o) - 0234C654 0000006C .text ov29_0234BA54 (overlay_29_0234AEE8.o) + 0234C654 0000006C .text WaitUntilAlertBoxPauseIsOver (overlay_29_0234AEE8.o) 0234C6B8 00000000 .text $d (overlay_29_0234AEE8.o) 0234C6C0 00000050 .text InitPortraitDungeon (overlay_29_0234AEE8.o) 0234C6C0 00000000 .text $a (overlay_29_0234AEE8.o) @@ -40193,7 +40193,7 @@ 0234D30C 0000002C .text ov29_0234C70C (overlay_29_0234BEE0.o) 0234D30C 00000000 .text $a (overlay_29_0234BEE0.o) 0234D334 00000000 .text $d (overlay_29_0234BEE0.o) - 0234D338 0000009C .text ov29_0234C738 (overlay_29_0234BEE0.o) + 0234D338 0000009C .text WaitUntilFadeIsFinished (overlay_29_0234BEE0.o) 0234D338 00000000 .text $a (overlay_29_0234BEE0.o) 0234D3D0 00000000 .text $d (overlay_29_0234BEE0.o) 0234D3D4 00000000 .text $a (overlay_29_0234BEE0.o) @@ -40254,7 +40254,7 @@ 0234E084 0000094C .text .text (overlay_29_0234D484.o) 0234E0BC 0000005C .text ov29_0234D4BC (overlay_29_0234D484.o) 0234E118 00000040 .text YesNoMenu (overlay_29_0234D484.o) - 0234E158 00000038 .text ov29_0234D558 (overlay_29_0234D484.o) + 0234E158 00000038 .text CloseMinimap (overlay_29_0234D484.o) 0234E190 00000040 .text DisplayMessageInternal (overlay_29_0234D484.o) 0234E1D0 00000060 .text ov29_0234D5D0 (overlay_29_0234D484.o) 0234E230 00000020 .text ov29_0234D630 (overlay_29_0234D484.o) @@ -40802,7 +40802,7 @@ 02353E3C 00000000 .rodata ov29_02353228 (overlay_29_rodata_02352A6C.o) 02353E40 00000000 .rodata ov29_02353218 (overlay_29_rodata_02352A6C.o) 02353E48 00000000 .rodata ov29_0235322C (overlay_29_rodata_02352A6C.o) - 02353E4C 00000000 .rodata ov29_0235321C (overlay_29_rodata_02352A6C.o) + 02353E4C 00000000 .rodata DEFEAT_STRING_IDS (overlay_29_rodata_02352A6C.o) 02353E50 00000000 .rodata ov29_02353278 (overlay_29_rodata_02352A6C.o) 02353E58 00000000 .rodata ov29_02353250 (overlay_29_rodata_02352A6C.o) 02353E60 00000000 .rodata ov29_02353240 (overlay_29_rodata_02352A6C.o) @@ -41795,5 +41795,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Fri Jul 03 01:18:27 2026 -# Link end time: Fri Jul 03 01:18:27 2026 +# Link start time: Wed Jul 08 01:09:35 2026 +# Link end time: Wed Jul 08 01:09:36 2026 diff --git a/pmdskyjp.xMAP b/pmdskyjp.xMAP index adf6e1d4..1c49d0d4 100644 --- a/pmdskyjp.xMAP +++ b/pmdskyjp.xMAP @@ -877,7 +877,7 @@ 104](GetForcedLossReason,func) found in global overlay_29_022ECDE4.o 105](GetRandomSpawnTrapId,func) found in global random_trap.o 104](TrySpawnGoldenChamber,func) found in global overlay_29_02336224.o - 104](ov29_0234C738,func) found in global overlay_29_0234BEE0.o + 104](WaitUntilFadeIsFinished,func) found in global overlay_29_0234BEE0.o 104](ExclusiveItemEffectIsActive__02347B80,func) found in global dungeon_projectile_throw.o 104](ItemIsActive__02347B50,func) found in global dungeon_projectile_throw.o 103](TestItemAiFlag,func) found in global item_util_1.o @@ -970,8 +970,8 @@ 101](MonsterHasNegativeStatus,func) found in global dungeon_logic_1.o 101](EntityIsValid__0230558C,func) found in global overlay_29_0230558C.o 101](TryNonLeaderItemPickUp,func) found in global overlay_29_0230F02C.o - 100](ov29_022FF3F4,func) found in global overlay_29_022FF3F4.o - 101](ov29_02318D58,func) found in global overlay_29_02318D58.o + 100](HasStatusThatPreventsLeaderActing,func) found in global overlay_29_022FF3F4.o + 101](EndTwoTurnMove,func) found in global overlay_29_02318D58.o 102](EntityIsValid__02318D34,func) found in global overlay_29_02318D34.o 101](IsChargingTwoTurnMove,func) found in global dungeon_move.o 100](SetTopScreenOption,func) found in global options.o @@ -1056,7 +1056,7 @@ 104](GetMoveCritChance,func) found in global moves.o 104](GetMovePower,func) found in global dungeon_logic_5.o 103](TryActivateGravity,func) found in global overlay_29_0233836C.o - 103](ov29_02318BBC,func) found in global overlay_29_02318AD4.o + 103](BeginChargedMove,func) found in global overlay_29_02318AD4.o 104](IsMonster__02318AB0,func) found in global overlay_29_02318AB0.o 103](TryInflictCringeStatus,func) found in global move_orb_effects.o 103](LowerHitChanceStat,func) found in global move_orb_effects.o @@ -4665,7 +4665,7 @@ 02027A20 00000000 .text $a (main_0202676C.o) 02027A20 000001E8 .text NewWindow (main_0202676C.o) 02027BF8 00000000 .text $d (main_0202676C.o) - 02027C08 0000001C .text GetPaletteBaseAddress__02027B9C (main_0202676C.o) + 02027C08 0000001C .text GetPaletteBaseAddress__020278A8 (main_0202676C.o) 02027C08 00000000 .text $a (main_0202676C.o) 02027C20 00000000 .text $d (main_0202676C.o) 02027C24 00000000 .text $a (main_0202676C.o) @@ -36548,7 +36548,7 @@ 022F0DA4 00000024 .text EntityIsValid__022EF7A0 (overlay_29_022EF7A0.o) 022F0DA4 00000000 .text $a (overlay_29_022EF7A0.o) 022F0DC8 00000228 .text .text (overlay_29_022EF7C4.o) - 022F0DC8 000000E0 .text ov29_022EF7C4 (overlay_29_022EF7C4.o) + 022F0DC8 000000E0 .text CheckBossFightVictory (overlay_29_022EF7C4.o) 022F0DC8 00000000 .text $a (overlay_29_022EF7C4.o) 022F0EA0 00000000 .text $d (overlay_29_022EF7C4.o) 022F0EA8 00000094 .text ov29_022EF8A4 (overlay_29_022EF7C4.o) @@ -36610,7 +36610,7 @@ 022F1DDC 00000000 .text $a (overlay_29_022F05B4.o) 022F1E48 00000000 .text $d (overlay_29_022F05B4.o) 022F1E4C 00000000 .text $a (overlay_29_022F05B4.o) - 022F1E4C 00000014 .text ov29_022F0848 (overlay_29_022F05B4.o) + 022F1E4C 00000014 .text ReopenMinimap (overlay_29_022F05B4.o) 022F1E5C 00000000 .text $d (overlay_29_022F05B4.o) 022F1E60 00000000 .text $a (overlay_29_022F05B4.o) 022F1E60 00000128 .text GonePebbleGradualPaletteShift (overlay_29_022F05B4.o) @@ -37152,7 +37152,7 @@ 023007CC 00000000 .text $d (status_checks.o) 023007E4 00000000 .text $a (overlay_29_022FF3F4.o) 023007E4 00000238 .text .text (overlay_29_022FF3F4.o) - 023007E4 00000238 .text ov29_022FF3F4 (overlay_29_022FF3F4.o) + 023007E4 00000238 .text HasStatusThatPreventsLeaderActing (overlay_29_022FF3F4.o) 023009FC 00000000 .text $d (overlay_29_022FF3F4.o) 02300A1C 00000000 .text $a (dungeon_mobility.o) 02300A1C 00000048 .text GetMobilityTypeCheckSlip (dungeon_mobility.o) @@ -37237,7 +37237,7 @@ 02301D84 0000002C .text ov29_023009A0 (overlay_29_023009A0.o) 02301D84 00000000 .text $a (overlay_29_023009A0.o) 02301DB0 00000138 .text ov29_023009CC (overlay_29_023009A0.o) - 02301EE8 0000003C .text ov29_02300B04 (overlay_29_023009A0.o) + 02301EE8 0000003C .text HasStatusThatPreventsOutlawEscaping (overlay_29_023009A0.o) 02301F24 000000B8 .text CheckVariousConditions__0230156C (dungeon_capabilities_1.o) 02301F24 00000000 .text $a (dungeon_capabilities_1.o) 02301FDC 000000B8 .text CheckVariousConditions__02301624 (dungeon_capabilities_1.o) @@ -37918,7 +37918,7 @@ 02316CC4 000001E8 .text TryInflictLeechSeedStatus (overlay_29_0231516C.o) 02316E94 00000000 .text $d (overlay_29_0231516C.o) 02316EAC 00000000 .text $a (overlay_29_0231516C.o) - 02316EAC 0000007C .text ov29_023159D4 (overlay_29_0231516C.o) + 02316EAC 0000007C .text EndLeechSeedStatusForAllTargets (overlay_29_0231516C.o) 02316F24 00000000 .text $d (overlay_29_0231516C.o) 02316F28 00000000 .text $a (overlay_29_0231516C.o) 02316F28 00000120 .text TryInflictDestinyBondStatus (overlay_29_0231516C.o) @@ -38062,15 +38062,15 @@ 02319F80 00000000 .text $a (overlay_29_02318AB0.o) 02319FA4 00000000 .text $a (overlay_29_02318AD4.o) 02319FA4 00000260 .text .text (overlay_29_02318AD4.o) - 02319FA4 00000074 .text ov29_02318AD4 (overlay_29_02318AD4.o) - 0231A018 00000074 .text ov29_02318B48 (overlay_29_02318AD4.o) - 0231A08C 00000178 .text ov29_02318BBC (overlay_29_02318AD4.o) + 02319FA4 00000074 .text WaitUntilMonsterFliesOffscreen (overlay_29_02318AD4.o) + 0231A018 00000074 .text WaitUntilMonsterIsBackOnGround (overlay_29_02318AD4.o) + 0231A08C 00000178 .text BeginChargedMove (overlay_29_02318AD4.o) 0231A1F0 00000000 .text $d (overlay_29_02318AD4.o) 0231A204 00000024 .text EntityIsValid__02318D34 (overlay_29_02318D34.o) 0231A204 00000000 .text $a (overlay_29_02318D34.o) 0231A228 00000000 .text $a (overlay_29_02318D58.o) 0231A228 000000F4 .text .text (overlay_29_02318D58.o) - 0231A228 00000040 .text ov29_02318D58 (overlay_29_02318D58.o) + 0231A228 00000040 .text EndTwoTurnMove (overlay_29_02318D58.o) 0231A268 000000B4 .text SetReflectStatus (overlay_29_02318D58.o) 0231A310 00000000 .text $d (overlay_29_02318D58.o) 0231A31C 00000024 .text EntityIsValid__02318E4C (overlay_29_02318E4C.o) @@ -39317,7 +39317,7 @@ 02336BD4 00000004 .text ov29_02335804 (overlay_29_023350FC.o) 02336BD8 0000005C .text InitUi3dElement (overlay_29_023350FC.o) 02336C30 00000000 .text $d (overlay_29_023350FC.o) - 02336C34 0000001C .text GetPaletteBaseAddress__02027B9C (overlay_29_023350FC.o) + 02336C34 0000001C .text GetPaletteBaseAddressOv29 (overlay_29_023350FC.o) 02336C34 00000000 .text $a (overlay_29_023350FC.o) 02336C4C 00000000 .text $d (overlay_29_023350FC.o) 02336C50 00000108 .text DisplayNumberTextureUi (overlay_29_023350FC.o) @@ -40303,7 +40303,7 @@ 0234C750 00000014 .text ov29_0234B4E0 (overlay_29_0234AEE8.o) 0234C750 00000000 .text $a (overlay_29_0234AEE8.o) 0234C760 00000000 .text $d (overlay_29_0234AEE8.o) - 0234C764 00000014 .text ov29_0234B4F4 (overlay_29_0234AEE8.o) + 0234C764 00000014 .text GetAlertBoxLoadingStatus (overlay_29_0234AEE8.o) 0234C764 00000000 .text $a (overlay_29_0234AEE8.o) 0234C774 00000000 .text $d (overlay_29_0234AEE8.o) 0234C778 00000000 .text $a (overlay_29_0234AEE8.o) @@ -40326,7 +40326,7 @@ 0234CC7C 00000000 .text $a (overlay_29_0234AEE8.o) 0234CCB4 00000000 .text $d (overlay_29_0234AEE8.o) 0234CCB8 00000000 .text $a (overlay_29_0234AEE8.o) - 0234CCB8 0000006C .text ov29_0234BA54 (overlay_29_0234AEE8.o) + 0234CCB8 0000006C .text WaitUntilAlertBoxPauseIsOver (overlay_29_0234AEE8.o) 0234CD1C 00000000 .text $d (overlay_29_0234AEE8.o) 0234CD24 00000050 .text InitPortraitDungeon (overlay_29_0234AEE8.o) 0234CD24 00000000 .text $a (overlay_29_0234AEE8.o) @@ -40392,7 +40392,7 @@ 0234D970 0000002C .text ov29_0234C70C (overlay_29_0234BEE0.o) 0234D970 00000000 .text $a (overlay_29_0234BEE0.o) 0234D998 00000000 .text $d (overlay_29_0234BEE0.o) - 0234D99C 0000009C .text ov29_0234C738 (overlay_29_0234BEE0.o) + 0234D99C 0000009C .text WaitUntilFadeIsFinished (overlay_29_0234BEE0.o) 0234D99C 00000000 .text $a (overlay_29_0234BEE0.o) 0234DA34 00000000 .text $d (overlay_29_0234BEE0.o) 0234DA38 00000000 .text $a (overlay_29_0234BEE0.o) @@ -40453,7 +40453,7 @@ 0234E710 0000094C .text .text (overlay_29_0234D484.o) 0234E748 0000005C .text ov29_0234D4BC (overlay_29_0234D484.o) 0234E7A4 00000040 .text YesNoMenu (overlay_29_0234D484.o) - 0234E7E4 00000038 .text ov29_0234D558 (overlay_29_0234D484.o) + 0234E7E4 00000038 .text CloseMinimap (overlay_29_0234D484.o) 0234E81C 00000040 .text DisplayMessageInternal (overlay_29_0234D484.o) 0234E85C 00000060 .text ov29_0234D5D0 (overlay_29_0234D484.o) 0234E8BC 00000020 .text ov29_0234D630 (overlay_29_0234D484.o) @@ -40995,7 +40995,7 @@ 0235444C 00000000 .rodata ov29_023531CC (overlay_29_rodata_02352A6C.o) 02354494 00000000 .rodata ov29_02353214 (overlay_29_rodata_02352A6C.o) 02354498 00000000 .rodata ov29_02353218 (overlay_29_rodata_02352A6C.o) - 0235449C 00000000 .rodata ov29_0235321C (overlay_29_rodata_02352A6C.o) + 0235449C 00000000 .rodata DEFEAT_STRING_IDS (overlay_29_rodata_02352A6C.o) 023544A0 00000000 .rodata ov29_02353220 (overlay_29_rodata_02352A6C.o) 023544A4 00000000 .rodata ov29_02353224 (overlay_29_rodata_02352A6C.o) 023544A8 00000000 .rodata ov29_02353228 (overlay_29_rodata_02352A6C.o) @@ -41991,5 +41991,5 @@ 00000000 00000000 00004060 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Fri Jul 03 01:20:29 2026 -# Link end time: Fri Jul 03 01:20:30 2026 +# Link start time: Wed Jul 08 01:11:44 2026 +# Link end time: Wed Jul 08 01:11:45 2026 diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index 21737ca6..c1cba286 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -880,7 +880,7 @@ 104](GetForcedLossReason,func) found in global overlay_29_022ECDE4.o 105](GetRandomSpawnTrapId,func) found in global random_trap.o 104](TrySpawnGoldenChamber,func) found in global overlay_29_02336224.o - 104](ov29_0234C738,func) found in global overlay_29_0234BEE0.o + 104](WaitUntilFadeIsFinished,func) found in global overlay_29_0234BEE0.o 104](ExclusiveItemEffectIsActive__02347B80,func) found in global dungeon_projectile_throw.o 104](ItemIsActive__02347B50,func) found in global dungeon_projectile_throw.o 103](TestItemAiFlag,func) found in global item_util_1.o @@ -973,8 +973,8 @@ 101](MonsterHasNegativeStatus,func) found in global dungeon_logic_1.o 101](EntityIsValid__0230558C,func) found in global overlay_29_0230558C.o 101](TryNonLeaderItemPickUp,func) found in global overlay_29_0230F02C.o - 100](ov29_022FF3F4,func) found in global overlay_29_022FF3F4.o - 101](ov29_02318D58,func) found in global overlay_29_02318D58.o + 100](HasStatusThatPreventsLeaderActing,func) found in global overlay_29_022FF3F4.o + 101](EndTwoTurnMove,func) found in global overlay_29_02318D58.o 102](EntityIsValid__02318D34,func) found in global overlay_29_02318D34.o 101](IsChargingTwoTurnMove,func) found in global dungeon_move.o 100](SetDecoyAiTracker,func) found in global overlay_29_022FB538.o @@ -1060,7 +1060,7 @@ 104](GetMoveCritChance,func) found in global moves.o 104](GetMovePower,func) found in global dungeon_logic_5.o 103](TryActivateGravity,func) found in global overlay_29_0233836C.o - 103](ov29_02318BBC,func) found in global overlay_29_02318AD4.o + 103](BeginChargedMove,func) found in global overlay_29_02318AD4.o 104](IsMonster__02318AB0,func) found in global overlay_29_02318AB0.o 103](TryInflictCringeStatus,func) found in global move_orb_effects.o 103](LowerHitChanceStat,func) found in global move_orb_effects.o @@ -4660,7 +4660,7 @@ 020276C0 000001E8 .text NewWindow (main_0202676C.o) 020276C0 00000000 .text $a (main_0202676C.o) 02027898 00000000 .text $d (main_0202676C.o) - 020278A8 0000001C .text GetPaletteBaseAddress__02027B9C (main_0202676C.o) + 020278A8 0000001C .text GetPaletteBaseAddress__020278A8 (main_0202676C.o) 020278A8 00000000 .text $a (main_0202676C.o) 020278C0 00000000 .text $d (main_0202676C.o) 020278C4 00000000 .text $a (main_0202676C.o) @@ -36268,7 +36268,7 @@ 022EF7A0 00000024 .text EntityIsValid__022EF7A0 (overlay_29_022EF7A0.o) 022EF7A0 00000000 .text $a (overlay_29_022EF7A0.o) 022EF7C4 00000228 .text .text (overlay_29_022EF7C4.o) - 022EF7C4 000000E0 .text ov29_022EF7C4 (overlay_29_022EF7C4.o) + 022EF7C4 000000E0 .text CheckBossFightVictory (overlay_29_022EF7C4.o) 022EF7C4 00000000 .text $a (overlay_29_022EF7C4.o) 022EF89C 00000000 .text $d (overlay_29_022EF7C4.o) 022EF8A4 00000094 .text ov29_022EF8A4 (overlay_29_022EF7C4.o) @@ -36330,7 +36330,7 @@ 022F07D8 00000000 .text $a (overlay_29_022F05B4.o) 022F0844 00000000 .text $d (overlay_29_022F05B4.o) 022F0848 00000000 .text $a (overlay_29_022F05B4.o) - 022F0848 00000014 .text ov29_022F0848 (overlay_29_022F05B4.o) + 022F0848 00000014 .text ReopenMinimap (overlay_29_022F05B4.o) 022F0858 00000000 .text $d (overlay_29_022F05B4.o) 022F085C 00000000 .text $a (overlay_29_022F05B4.o) 022F085C 00000128 .text GonePebbleGradualPaletteShift (overlay_29_022F05B4.o) @@ -36884,7 +36884,7 @@ 022FF3DC 00000000 .text $d (status_checks.o) 022FF3F4 00000000 .text $a (overlay_29_022FF3F4.o) 022FF3F4 00000238 .text .text (overlay_29_022FF3F4.o) - 022FF3F4 00000238 .text ov29_022FF3F4 (overlay_29_022FF3F4.o) + 022FF3F4 00000238 .text HasStatusThatPreventsLeaderActing (overlay_29_022FF3F4.o) 022FF60C 00000000 .text $d (overlay_29_022FF3F4.o) 022FF62C 00000000 .text $a (dungeon_mobility.o) 022FF62C 00000048 .text GetMobilityTypeCheckSlip (dungeon_mobility.o) @@ -36975,7 +36975,7 @@ 023009A0 0000002C .text ov29_023009A0 (overlay_29_023009A0.o) 023009A0 00000000 .text $a (overlay_29_023009A0.o) 023009CC 00000138 .text ov29_023009CC (overlay_29_023009A0.o) - 02300B04 0000003C .text ov29_02300B04 (overlay_29_023009A0.o) + 02300B04 0000003C .text HasStatusThatPreventsOutlawEscaping (overlay_29_023009A0.o) 02300B40 000000B8 .text CheckVariousConditions__0230156C (dungeon_capabilities_1.o) 02300B40 00000000 .text $a (dungeon_capabilities_1.o) 02300BF8 000000B8 .text CheckVariousConditions__02301624 (dungeon_capabilities_1.o) @@ -37657,7 +37657,7 @@ 023157EC 000001E8 .text TryInflictLeechSeedStatus (overlay_29_0231516C.o) 023159BC 00000000 .text $d (overlay_29_0231516C.o) 023159D4 00000000 .text $a (overlay_29_0231516C.o) - 023159D4 0000007C .text ov29_023159D4 (overlay_29_0231516C.o) + 023159D4 0000007C .text EndLeechSeedStatusForAllTargets (overlay_29_0231516C.o) 02315A4C 00000000 .text $d (overlay_29_0231516C.o) 02315A50 00000000 .text $a (overlay_29_0231516C.o) 02315A50 00000120 .text TryInflictDestinyBondStatus (overlay_29_0231516C.o) @@ -37801,15 +37801,15 @@ 02318AB0 00000000 .text $a (overlay_29_02318AB0.o) 02318AD4 00000000 .text $a (overlay_29_02318AD4.o) 02318AD4 00000260 .text .text (overlay_29_02318AD4.o) - 02318AD4 00000074 .text ov29_02318AD4 (overlay_29_02318AD4.o) - 02318B48 00000074 .text ov29_02318B48 (overlay_29_02318AD4.o) - 02318BBC 00000178 .text ov29_02318BBC (overlay_29_02318AD4.o) + 02318AD4 00000074 .text WaitUntilMonsterFliesOffscreen (overlay_29_02318AD4.o) + 02318B48 00000074 .text WaitUntilMonsterIsBackOnGround (overlay_29_02318AD4.o) + 02318BBC 00000178 .text BeginChargedMove (overlay_29_02318AD4.o) 02318D20 00000000 .text $d (overlay_29_02318AD4.o) 02318D34 00000024 .text EntityIsValid__02318D34 (overlay_29_02318D34.o) 02318D34 00000000 .text $a (overlay_29_02318D34.o) 02318D58 00000000 .text $a (overlay_29_02318D58.o) 02318D58 000000F4 .text .text (overlay_29_02318D58.o) - 02318D58 00000040 .text ov29_02318D58 (overlay_29_02318D58.o) + 02318D58 00000040 .text EndTwoTurnMove (overlay_29_02318D58.o) 02318D98 000000B4 .text SetReflectStatus (overlay_29_02318D58.o) 02318E40 00000000 .text $d (overlay_29_02318D58.o) 02318E4C 00000024 .text EntityIsValid__02318E4C (overlay_29_02318E4C.o) @@ -39060,7 +39060,7 @@ 02335804 00000004 .text ov29_02335804 (overlay_29_023350FC.o) 02335808 0000005C .text InitUi3dElement (overlay_29_023350FC.o) 02335860 00000000 .text $d (overlay_29_023350FC.o) - 02335864 0000001C .text GetPaletteBaseAddress__02027B9C (overlay_29_023350FC.o) + 02335864 0000001C .text GetPaletteBaseAddressOv29 (overlay_29_023350FC.o) 02335864 00000000 .text $a (overlay_29_023350FC.o) 0233587C 00000000 .text $d (overlay_29_023350FC.o) 02335880 00000108 .text DisplayNumberTextureUi (overlay_29_023350FC.o) @@ -40054,7 +40054,7 @@ 0234B4E0 00000014 .text ov29_0234B4E0 (overlay_29_0234AEE8.o) 0234B4E0 00000000 .text $a (overlay_29_0234AEE8.o) 0234B4F0 00000000 .text $d (overlay_29_0234AEE8.o) - 0234B4F4 00000014 .text ov29_0234B4F4 (overlay_29_0234AEE8.o) + 0234B4F4 00000014 .text GetAlertBoxLoadingStatus (overlay_29_0234AEE8.o) 0234B4F4 00000000 .text $a (overlay_29_0234AEE8.o) 0234B504 00000000 .text $d (overlay_29_0234AEE8.o) 0234B508 00000000 .text $a (overlay_29_0234AEE8.o) @@ -40077,7 +40077,7 @@ 0234BA18 00000000 .text $a (overlay_29_0234AEE8.o) 0234BA50 00000000 .text $d (overlay_29_0234AEE8.o) 0234BA54 00000000 .text $a (overlay_29_0234AEE8.o) - 0234BA54 0000006C .text ov29_0234BA54 (overlay_29_0234AEE8.o) + 0234BA54 0000006C .text WaitUntilAlertBoxPauseIsOver (overlay_29_0234AEE8.o) 0234BAB8 00000000 .text $d (overlay_29_0234AEE8.o) 0234BAC0 00000050 .text InitPortraitDungeon (overlay_29_0234AEE8.o) 0234BAC0 00000000 .text $a (overlay_29_0234AEE8.o) @@ -40143,7 +40143,7 @@ 0234C70C 0000002C .text ov29_0234C70C (overlay_29_0234BEE0.o) 0234C70C 00000000 .text $a (overlay_29_0234BEE0.o) 0234C734 00000000 .text $d (overlay_29_0234BEE0.o) - 0234C738 0000009C .text ov29_0234C738 (overlay_29_0234BEE0.o) + 0234C738 0000009C .text WaitUntilFadeIsFinished (overlay_29_0234BEE0.o) 0234C738 00000000 .text $a (overlay_29_0234BEE0.o) 0234C7D0 00000000 .text $d (overlay_29_0234BEE0.o) 0234C7D4 00000000 .text $a (overlay_29_0234BEE0.o) @@ -40204,7 +40204,7 @@ 0234D484 0000094C .text .text (overlay_29_0234D484.o) 0234D4BC 0000005C .text ov29_0234D4BC (overlay_29_0234D484.o) 0234D518 00000040 .text YesNoMenu (overlay_29_0234D484.o) - 0234D558 00000038 .text ov29_0234D558 (overlay_29_0234D484.o) + 0234D558 00000038 .text CloseMinimap (overlay_29_0234D484.o) 0234D590 00000040 .text DisplayMessageInternal (overlay_29_0234D484.o) 0234D5D0 00000060 .text ov29_0234D5D0 (overlay_29_0234D484.o) 0234D630 00000020 .text ov29_0234D630 (overlay_29_0234D484.o) @@ -40746,7 +40746,7 @@ 023531CC 00000000 .rodata ov29_023531CC (overlay_29_rodata_02352A6C.o) 02353214 00000000 .rodata ov29_02353214 (overlay_29_rodata_02352A6C.o) 02353218 00000000 .rodata ov29_02353218 (overlay_29_rodata_02352A6C.o) - 0235321C 00000000 .rodata ov29_0235321C (overlay_29_rodata_02352A6C.o) + 0235321C 00000000 .rodata DEFEAT_STRING_IDS (overlay_29_rodata_02352A6C.o) 02353220 00000000 .rodata ov29_02353220 (overlay_29_rodata_02352A6C.o) 02353224 00000000 .rodata ov29_02353224 (overlay_29_rodata_02352A6C.o) 02353228 00000000 .rodata ov29_02353228 (overlay_29_rodata_02352A6C.o) @@ -41750,5 +41750,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Fri Jul 03 01:16:21 2026 -# Link end time: Fri Jul 03 01:16:22 2026 +# Link start time: Wed Jul 08 01:07:23 2026 +# Link end time: Wed Jul 08 01:07:24 2026