diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-06 23:02:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 23:02:23 -0500 |
| commit | 577e6cc740c4fc5418bf38d182012f5f9819e616 (patch) | |
| tree | 583db3a43fff5a4be05ad6cd0c8c5546de25e028 /data | |
| parent | 71e0b480a93b083f0cf3d404e6ff65325f0cc512 (diff) | |
| parent | 713cd6616ea8c159bbcaeba223cbb6097a74e393 (diff) | |
Merge pull request #1586 from GriffinRichards/clean-areascreen
Clean up pokedex_area_screen
Diffstat (limited to 'data')
| -rw-r--r-- | data/mystery_gift.s | 1 | ||||
| -rw-r--r-- | data/scripts/gift_altering_cave.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/data/mystery_gift.s b/data/mystery_gift.s index df0cbd4ac..86202b95f 100644 --- a/data/mystery_gift.s +++ b/data/mystery_gift.s @@ -8,6 +8,7 @@ #include "constants/songs.h" #include "constants/species.h" #include "constants/vars.h" +#include "constants/wild_encounter.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" diff --git a/data/scripts/gift_altering_cave.inc b/data/scripts/gift_altering_cave.inc index f86432ce2..65ff87068 100644 --- a/data/scripts/gift_altering_cave.inc +++ b/data/scripts/gift_altering_cave.inc @@ -1,7 +1,7 @@ MysteryGiftScript_AlteringCave:: setvaddress MysteryGiftScript_AlteringCave addvar VAR_ALTERING_CAVE_WILD_SET, 1 - vgoto_if_ne VAR_ALTERING_CAVE_WILD_SET, 10, MysteryGiftScript_AlteringCave_ + vgoto_if_ne VAR_ALTERING_CAVE_WILD_SET, (NUM_ALTERING_CAVE_TABLES + 1), MysteryGiftScript_AlteringCave_ setvar VAR_ALTERING_CAVE_WILD_SET, 0 MysteryGiftScript_AlteringCave_: lock |