From ac19cd833f191019f37c783a656f4a42f3edca34 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 23 Aug 2026 17:35:57 +0000 Subject: [PATCH] Merge pull request #294 from AnonymousRandomPerson/main --- pmdskyeu.xMAP | 8 ++++---- pmdskyjp.xMAP | 8 ++++---- pmdskyus.xMAP | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP index 46f107ec..1229cbed 100644 --- a/pmdskyeu.xMAP +++ b/pmdskyeu.xMAP @@ -1353,7 +1353,7 @@ 144](DoMoveCamouflage,func) found in global overlay_29_0232B518.o 144](DoMoveSnatch,func) found in global overlay_29_0232BE34.o 144](DoMoveReturn,func) found in global overlay_29_0232692C.o - 145](GetFlashFireStatus,func) found in global move_orb_effects.o + 145](FlashFireShouldActivate,func) found in global move_orb_effects.o 145](ApplyOffensiveStatMultiplier,func) found in global move_orb_effects.o 144](DoMoveConversion,func) found in global overlay_29_02329554.o 144](DoMoveSkillSwap,func) found in global overlay_29_02328538.o @@ -39363,7 +39363,7 @@ 02314568 00000000 .text $a (move_orb_effects.o) 02314568 0000016C .text BoostDefensiveStat (move_orb_effects.o) 023146BC 00000000 .text $d (move_orb_effects.o) - 023146D4 00000070 .text GetFlashFireStatus (move_orb_effects.o) + 023146D4 00000070 .text FlashFireShouldActivate (move_orb_effects.o) 023146D4 00000000 .text $a (move_orb_effects.o) 02314744 0000005C .text ActivateFlashFire (move_orb_effects.o) 02314744 00000000 .text $a (move_orb_effects.o) @@ -43701,5 +43701,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sun Aug 23 01:12:32 2026 -# Link end time: Sun Aug 23 01:12:32 2026 +# Link start time: Sun Aug 23 17:32:44 2026 +# Link end time: Sun Aug 23 17:32:45 2026 diff --git a/pmdskyjp.xMAP b/pmdskyjp.xMAP index 31a7c53b..aeea42f6 100644 --- a/pmdskyjp.xMAP +++ b/pmdskyjp.xMAP @@ -1710,7 +1710,7 @@ 136](DoMoveCamouflage,func) found in global overlay_29_0232B518.o 136](DoMoveSnatch,func) found in global overlay_29_0232BE34.o 136](DoMoveReturn,func) found in global overlay_29_0232692C.o - 137](GetFlashFireStatus,func) found in global move_orb_effects.o + 137](FlashFireShouldActivate,func) found in global move_orb_effects.o 137](ApplyOffensiveStatMultiplier,func) found in global move_orb_effects.o 136](DoMoveConversion,func) found in global overlay_29_02329554.o 136](DoMoveSkillSwap,func) found in global overlay_29_02328538.o @@ -39583,7 +39583,7 @@ 02314FF0 00000000 .text $a (move_orb_effects.o) 02314FF0 0000016C .text BoostDefensiveStat (move_orb_effects.o) 02315144 00000000 .text $d (move_orb_effects.o) - 0231515C 0000006C .text GetFlashFireStatus (move_orb_effects.o) + 0231515C 0000006C .text FlashFireShouldActivate (move_orb_effects.o) 0231515C 00000000 .text $a (move_orb_effects.o) 023151C8 0000005C .text ActivateFlashFire (move_orb_effects.o) 023151C8 00000000 .text $a (move_orb_effects.o) @@ -43906,5 +43906,5 @@ 00000000 00000000 00004060 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sun Aug 23 01:15:08 2026 -# Link end time: Sun Aug 23 01:15:09 2026 +# Link start time: Sun Aug 23 17:35:24 2026 +# Link end time: Sun Aug 23 17:35:25 2026 diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index d111cf14..ad917bf7 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -1716,7 +1716,7 @@ 136](DoMoveCamouflage,func) found in global overlay_29_0232B518.o 136](DoMoveSnatch,func) found in global overlay_29_0232BE34.o 136](DoMoveReturn,func) found in global overlay_29_0232692C.o - 137](GetFlashFireStatus,func) found in global move_orb_effects.o + 137](FlashFireShouldActivate,func) found in global move_orb_effects.o 137](ApplyOffensiveStatMultiplier,func) found in global move_orb_effects.o 136](DoMoveConversion,func) found in global overlay_29_02329554.o 136](DoMoveSkillSwap,func) found in global overlay_29_02328538.o @@ -39322,7 +39322,7 @@ 02313B08 00000000 .text $a (move_orb_effects.o) 02313B08 0000016C .text BoostDefensiveStat (move_orb_effects.o) 02313C5C 00000000 .text $d (move_orb_effects.o) - 02313C74 00000070 .text GetFlashFireStatus (move_orb_effects.o) + 02313C74 00000070 .text FlashFireShouldActivate (move_orb_effects.o) 02313C74 00000000 .text $a (move_orb_effects.o) 02313CE4 0000005C .text ActivateFlashFire (move_orb_effects.o) 02313CE4 00000000 .text $a (move_orb_effects.o) @@ -43665,5 +43665,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sun Aug 23 01:09:51 2026 -# Link end time: Sun Aug 23 01:09:52 2026 +# Link start time: Sun Aug 23 17:29:55 2026 +# Link end time: Sun Aug 23 17:29:56 2026