From c05ee6e5b9e06f54313c345ef4be7a4357fd38c9 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Mon, 17 Oct 2022 23:01:27 +0000 Subject: [PATCH] Merge pull request #1802 from abaresk/wild-encounters --- pokeemerald.sym | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 8bffe72a38..54bd218cda 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -258,7 +258,7 @@ 020375ce l 00000002 sMovingNpcMapNum 020375d0 l 00000002 sFieldEffectScriptId 020375d4 l 00000001 sWildEncounterImmunitySteps -020375d6 l 00000002 sPreviousPlayerMetatileBehavior +020375d6 l 00000002 sPrevMetatileBehavior 020375d8 g 00000002 gSpecialVar_0x8000 020375da g 00000002 gSpecialVar_0x8001 020375dc g 00000002 gSpecialVar_0x8002 @@ -7278,9 +7278,9 @@ 080b5024 l 00000036 GenerateFishingWildMon 080b505c l 00000080 SetUpMassOutbreakEncounter 080b50dc l 00000068 DoMassOutbreakEncounterTest -080b5144 l 0000002c DoWildEncounterRateDiceRoll -080b5170 l 000000cc DoWildEncounterRateTest -080b523c l 00000022 DoGlobalWildEncounterDiceRoll +080b5144 l 0000002c EncounterOddsCheck +080b5170 l 000000cc WildEncounterCheck +080b523c l 00000022 AllowWildCheckOnNewMetatile 080b5260 l 00000026 AreLegendariesInSootopolisPreventingEncounters 080b5288 g 00000284 StandardWildEncounter 080b550c g 0000006c RockSmashWildEncounter