From 91beb78c79438ad5403d4bc70734534db6132ded Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 30 Nov 2025 04:58:33 +0000 Subject: [PATCH] Merge pull request #217 from SethBarberee/gravity_funcs --- pmdskyeu.xMAP | 31 ++++++++++++++++--------------- pmdskyjp.xMAP | 31 ++++++++++++++++--------------- pmdskyus.xMAP | 31 ++++++++++++++++--------------- 3 files changed, 48 insertions(+), 45 deletions(-) diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP index b9270499..f62a1816 100644 --- a/pmdskyeu.xMAP +++ b/pmdskyeu.xMAP @@ -266,7 +266,7 @@ 58](IqSkillIsEnabled,func) found in global dungeon_pokemon_attributes_1.o 58](DungeonRandRange,func) found in global dg_random.o 57](EntityIsValid__02315118,func) found in global overlay_29_02315118.o - 57](GravityIsActive,func) found in global overlay_29_02338390.o + 57](GravityIsActive,func) found in global overlay_29_0233836C.o 57](TryActivateQuickFeet,func) found in global overlay_29_02314810.o 58](ItemIsActive__0231513C,func) found in global overlay_29_02315118.o 59](HasHeldItem,func) found in global dungeon_items.o @@ -800,6 +800,7 @@ 106](DefenderAbilityIsActive__02332A0C,func) found in global overlay_29_023329E8.o 106](MoveHitCheck,func) found in global overlay_29_0232393C.o 106](GetMovePower,func) found in global overlay_29_0230231C.o + 105](TryActivateGravity,func) found in global overlay_29_0233836C.o 105](ov29_02318BBC,func) found in global overlay_29_02318AD4.o 106](IsMonster__02318AB0,func) found in global overlay_29_02318AB0.o 105](LowerHitChanceStat,func) found in global move_orb_effects.o @@ -892,6 +893,7 @@ 91](DoMoveConversion2,func) found in global overlay_29_02328030.o 91](ExclusiveItemEffectIsActive__023329E8,func) found in global overlay_29_023329E8.o 91](ov29_0231AD38,func) found in global overlay_29_0231AD38.o + 90](ov29_023383A8,func) found in global overlay_29_0233836C.o 89](ExclusiveItemEffectIsActive__02311064,func) found in global overlay_29_02311010.o 89](TryActivateBadDreams,func) found in global overlay_29_0231B1B8.o 90](IsMonster__0231B318,func) found in global overlay_29_0231B318.o @@ -38545,25 +38547,24 @@ 02338F20 0000001C .text IsAdjacentToEnemyIgnoreTreatment (overlay_29_02338350.o) 02338F20 00000000 .text $a (overlay_29_02338350.o) 02338F3C 00000000 .text $a (overlay_29_0233836C.o) - 02338F3C 00000024 .text .text (overlay_29_0233836C.o) 02338F3C 00000024 .text ResetGravity (overlay_29_0233836C.o) 02338F58 00000000 .text $d (overlay_29_0233836C.o) - 02338F60 00000000 .text $a (overlay_29_02338390.o) - 02338F60 00000018 .text GravityIsActive (overlay_29_02338390.o) - 02338F74 00000000 .text $d (overlay_29_02338390.o) - 02338F78 00000014 .text ov29_023383A8 (overlay_29_023383A8.o) - 02338F78 00000000 .text $a (overlay_29_023383A8.o) - 02338F78 00000118 .text .text (overlay_29_023383A8.o) - 02338F84 00000000 .text $d (overlay_29_023383A8.o) - 02338F8C 00000000 .text $a (overlay_29_023383A8.o) - 02338F8C 00000074 .text TryActivateGravity (overlay_29_023383A8.o) - 02338FF4 00000000 .text $d (overlay_29_023383A8.o) + 02338F60 00000000 .text $a (overlay_29_0233836C.o) + 02338F60 00000018 .text GravityIsActive (overlay_29_0233836C.o) + 02338F74 00000000 .text $d (overlay_29_0233836C.o) + 02338F78 00000000 .text $a (overlay_29_0233836C.o) + 02338F78 00000014 .text ov29_023383A8 (overlay_29_0233836C.o) + 02338F84 00000000 .text $d (overlay_29_0233836C.o) + 02338F8C 00000000 .text $a (overlay_29_0233836C.o) + 02338F8C 00000074 .text TryActivateGravity (overlay_29_0233836C.o) + 02338FF4 00000000 .text $d (overlay_29_0233836C.o) 02339000 0000002C .text RevealAttackedTile (overlay_29_023383A8.o) + 02339000 00000090 .text .text (overlay_29_023383A8.o) 02339000 00000000 .text $a (overlay_29_023383A8.o) 0233902C 00000020 .text ov29_0233845C (overlay_29_023383A8.o) 02339044 00000000 .text $d (overlay_29_023383A8.o) - 0233904C 00000044 .text ov29_0233847C (overlay_29_023383A8.o) 0233904C 00000000 .text $a (overlay_29_023383A8.o) + 0233904C 00000044 .text ov29_0233847C (overlay_29_023383A8.o) 02339088 00000000 .text $d (overlay_29_023383A8.o) 02339090 00000000 .text $a (overlay_29_02338548.o) 02339090 00000018 .text ShouldBoostKecleonShopSpawnChance (overlay_29_02338548.o) @@ -41088,5 +41089,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sun Nov 30 04:20:27 2025 -# Link end time: Sun Nov 30 04:20:27 2025 +# Link start time: Sun Nov 30 04:56:34 2025 +# Link end time: Sun Nov 30 04:56:35 2025 diff --git a/pmdskyjp.xMAP b/pmdskyjp.xMAP index 483f2124..b6877028 100644 --- a/pmdskyjp.xMAP +++ b/pmdskyjp.xMAP @@ -267,7 +267,7 @@ 58](IqSkillIsEnabled,func) found in global dungeon_pokemon_attributes_1.o 58](DungeonRandRange,func) found in global dg_random.o 57](EntityIsValid__02315118,func) found in global overlay_29_02315118.o - 57](GravityIsActive,func) found in global overlay_29_02338390.o + 57](GravityIsActive,func) found in global overlay_29_0233836C.o 57](TryActivateQuickFeet,func) found in global overlay_29_02314810.o 58](ItemIsActive__0231513C,func) found in global overlay_29_02315118.o 59](HasHeldItem,func) found in global dungeon_items.o @@ -798,6 +798,7 @@ 106](DefenderAbilityIsActive__02332A0C,func) found in global overlay_29_023329E8.o 106](MoveHitCheck,func) found in global overlay_29_0232393C.o 106](GetMovePower,func) found in global overlay_29_0230231C.o + 105](TryActivateGravity,func) found in global overlay_29_0233836C.o 105](ov29_02318BBC,func) found in global overlay_29_02318AD4.o 106](IsMonster__02318AB0,func) found in global overlay_29_02318AB0.o 105](LowerHitChanceStat,func) found in global move_orb_effects.o @@ -889,6 +890,7 @@ 91](DoMoveConversion2,func) found in global overlay_29_02328030.o 91](ExclusiveItemEffectIsActive__023329E8,func) found in global overlay_29_023329E8.o 91](ov29_0231AD38,func) found in global overlay_29_0231AD38.o + 90](ov29_023383A8,func) found in global overlay_29_0233836C.o 89](ExclusiveItemEffectIsActive__02311064,func) found in global overlay_29_02311010.o 89](TryActivateBadDreams,func) found in global overlay_29_0231B1B8.o 90](IsMonster__0231B318,func) found in global overlay_29_0231B318.o @@ -38764,25 +38766,24 @@ 02339714 0000001C .text IsAdjacentToEnemyIgnoreTreatment (overlay_29_02338350.o) 02339714 00000000 .text $a (overlay_29_02338350.o) 02339730 00000000 .text $a (overlay_29_0233836C.o) - 02339730 00000024 .text .text (overlay_29_0233836C.o) 02339730 00000024 .text ResetGravity (overlay_29_0233836C.o) 0233974C 00000000 .text $d (overlay_29_0233836C.o) - 02339754 00000000 .text $a (overlay_29_02338390.o) - 02339754 00000018 .text GravityIsActive (overlay_29_02338390.o) - 02339768 00000000 .text $d (overlay_29_02338390.o) - 0233976C 00000014 .text ov29_023383A8 (overlay_29_023383A8.o) - 0233976C 00000000 .text $a (overlay_29_023383A8.o) - 0233976C 00000118 .text .text (overlay_29_023383A8.o) - 02339778 00000000 .text $d (overlay_29_023383A8.o) - 02339780 00000000 .text $a (overlay_29_023383A8.o) - 02339780 00000074 .text TryActivateGravity (overlay_29_023383A8.o) - 023397E8 00000000 .text $d (overlay_29_023383A8.o) + 02339754 00000000 .text $a (overlay_29_0233836C.o) + 02339754 00000018 .text GravityIsActive (overlay_29_0233836C.o) + 02339768 00000000 .text $d (overlay_29_0233836C.o) + 0233976C 00000000 .text $a (overlay_29_0233836C.o) + 0233976C 00000014 .text ov29_023383A8 (overlay_29_0233836C.o) + 02339778 00000000 .text $d (overlay_29_0233836C.o) + 02339780 00000000 .text $a (overlay_29_0233836C.o) + 02339780 00000074 .text TryActivateGravity (overlay_29_0233836C.o) + 023397E8 00000000 .text $d (overlay_29_0233836C.o) 023397F4 0000002C .text RevealAttackedTile (overlay_29_023383A8.o) + 023397F4 00000090 .text .text (overlay_29_023383A8.o) 023397F4 00000000 .text $a (overlay_29_023383A8.o) 02339820 00000020 .text ov29_0233845C (overlay_29_023383A8.o) 02339838 00000000 .text $d (overlay_29_023383A8.o) - 02339840 00000044 .text ov29_0233847C (overlay_29_023383A8.o) 02339840 00000000 .text $a (overlay_29_023383A8.o) + 02339840 00000044 .text ov29_0233847C (overlay_29_023383A8.o) 0233987C 00000000 .text $d (overlay_29_023383A8.o) 02339884 00000000 .text $a (overlay_29_02338548.o) 02339884 00000018 .text ShouldBoostKecleonShopSpawnChance (overlay_29_02338548.o) @@ -41295,5 +41296,5 @@ 00000000 00000000 00004060 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sun Nov 30 04:21:44 2025 -# Link end time: Sun Nov 30 04:21:44 2025 +# Link start time: Sun Nov 30 04:58:04 2025 +# Link end time: Sun Nov 30 04:58:05 2025 diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index c655066b..ded8980c 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -266,7 +266,7 @@ 58](IqSkillIsEnabled,func) found in global dungeon_pokemon_attributes_1.o 58](DungeonRandRange,func) found in global dg_random.o 57](EntityIsValid__02315118,func) found in global overlay_29_02315118.o - 57](GravityIsActive,func) found in global overlay_29_02338390.o + 57](GravityIsActive,func) found in global overlay_29_0233836C.o 57](TryActivateQuickFeet,func) found in global overlay_29_02314810.o 58](ItemIsActive__0231513C,func) found in global overlay_29_02315118.o 59](HasHeldItem,func) found in global dungeon_items.o @@ -800,6 +800,7 @@ 106](DefenderAbilityIsActive__02332A0C,func) found in global overlay_29_023329E8.o 106](MoveHitCheck,func) found in global overlay_29_0232393C.o 106](GetMovePower,func) found in global overlay_29_0230231C.o + 105](TryActivateGravity,func) found in global overlay_29_0233836C.o 105](ov29_02318BBC,func) found in global overlay_29_02318AD4.o 106](IsMonster__02318AB0,func) found in global overlay_29_02318AB0.o 105](LowerHitChanceStat,func) found in global move_orb_effects.o @@ -892,6 +893,7 @@ 91](DoMoveConversion2,func) found in global overlay_29_02328030.o 91](ExclusiveItemEffectIsActive__023329E8,func) found in global overlay_29_023329E8.o 91](ov29_0231AD38,func) found in global overlay_29_0231AD38.o + 90](ov29_023383A8,func) found in global overlay_29_0233836C.o 89](ExclusiveItemEffectIsActive__02311064,func) found in global overlay_29_02311010.o 89](TryActivateBadDreams,func) found in global overlay_29_0231B1B8.o 90](IsMonster__0231B318,func) found in global overlay_29_0231B318.o @@ -38507,25 +38509,24 @@ 02338350 0000001C .text IsAdjacentToEnemyIgnoreTreatment (overlay_29_02338350.o) 02338350 00000000 .text $a (overlay_29_02338350.o) 0233836C 00000000 .text $a (overlay_29_0233836C.o) - 0233836C 00000024 .text .text (overlay_29_0233836C.o) 0233836C 00000024 .text ResetGravity (overlay_29_0233836C.o) 02338388 00000000 .text $d (overlay_29_0233836C.o) - 02338390 00000000 .text $a (overlay_29_02338390.o) - 02338390 00000018 .text GravityIsActive (overlay_29_02338390.o) - 023383A4 00000000 .text $d (overlay_29_02338390.o) - 023383A8 00000014 .text ov29_023383A8 (overlay_29_023383A8.o) - 023383A8 00000000 .text $a (overlay_29_023383A8.o) - 023383A8 00000118 .text .text (overlay_29_023383A8.o) - 023383B4 00000000 .text $d (overlay_29_023383A8.o) - 023383BC 00000000 .text $a (overlay_29_023383A8.o) - 023383BC 00000074 .text TryActivateGravity (overlay_29_023383A8.o) - 02338424 00000000 .text $d (overlay_29_023383A8.o) + 02338390 00000000 .text $a (overlay_29_0233836C.o) + 02338390 00000018 .text GravityIsActive (overlay_29_0233836C.o) + 023383A4 00000000 .text $d (overlay_29_0233836C.o) + 023383A8 00000000 .text $a (overlay_29_0233836C.o) + 023383A8 00000014 .text ov29_023383A8 (overlay_29_0233836C.o) + 023383B4 00000000 .text $d (overlay_29_0233836C.o) + 023383BC 00000000 .text $a (overlay_29_0233836C.o) + 023383BC 00000074 .text TryActivateGravity (overlay_29_0233836C.o) + 02338424 00000000 .text $d (overlay_29_0233836C.o) 02338430 0000002C .text RevealAttackedTile (overlay_29_023383A8.o) + 02338430 00000090 .text .text (overlay_29_023383A8.o) 02338430 00000000 .text $a (overlay_29_023383A8.o) 0233845C 00000020 .text ov29_0233845C (overlay_29_023383A8.o) 02338474 00000000 .text $d (overlay_29_023383A8.o) - 0233847C 00000044 .text ov29_0233847C (overlay_29_023383A8.o) 0233847C 00000000 .text $a (overlay_29_023383A8.o) + 0233847C 00000044 .text ov29_0233847C (overlay_29_023383A8.o) 023384B8 00000000 .text $d (overlay_29_023383A8.o) 023384C0 00000000 .text $a (overlay_29_02338548.o) 023384C0 00000018 .text ShouldBoostKecleonShopSpawnChance (overlay_29_02338548.o) @@ -41054,5 +41055,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sun Nov 30 04:19:02 2025 -# Link end time: Sun Nov 30 04:19:02 2025 +# Link start time: Sun Nov 30 04:54:56 2025 +# Link end time: Sun Nov 30 04:54:57 2025