From 0089f7894b0f7f8fcb042f1559bd58c275352fbf Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:03:46 +0100 Subject: [PATCH] uhhh warp fix and wild data --- data/wild/kanto_grass.asm | 112 +++++++++++++++++++++++++++++++++++++ maps/LavenderCryptSet3.asm | 2 +- 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index 04ab6b3..6c5a71b 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -929,6 +929,118 @@ KantoGrassWildMons: dbw 42, WISPIRIT dbw 42, GENGAR end_grass_wildmons + + def_grass_wildmons LAVENDER_CRYPT_SET_1 + db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite + ; morn + dbw 33, GASTLY + dbw 36, GASTLY + dbw 32, HAUNTER + dbw 44, CUBONE + dbw 44, WISPIRIT + dbw 44, WISPIRIT + dbw 44, VULPIX + ; day + dbw 32, GASTLY + dbw 34, GASTLY + dbw 38, HAUNTER + dbw 36, CUBONE + dbw 46, WISPIRIT + dbw 46, WISPIRIT + dbw 46, VULPIX + ; nite + dbw 34, GASTLY + dbw 38, MISDREAVUS + dbw 36, HAUNTER + dbw 32, KITSEN + dbw 42, WISPIRIT + dbw 42, WISPIRIT + dbw 42, GENGAR + end_grass_wildmons + + def_grass_wildmons LAVENDER_CRYPT_SET_2 + db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite + ; morn + dbw 33, GASTLY + dbw 36, GASTLY + dbw 32, HAUNTER + dbw 44, CUBONE + dbw 44, WISPIRIT + dbw 44, WISPIRIT + dbw 44, NOCTOWL + ; day + dbw 32, GASTLY + dbw 34, GASTLY + dbw 38, HAUNTER + dbw 36, CUBONE + dbw 46, WISPIRIT + dbw 46, WISPIRIT + dbw 46, NOCTOWL + ; nite + dbw 34, GASTLY + dbw 38, MISDREAVUS + dbw 36, HAUNTER + dbw 32, KITSEN + dbw 42, WISPIRIT + dbw 42, WISPIRIT + dbw 42, GENGAR + end_grass_wildmons + + def_grass_wildmons LAVENDER_CRYPT_SET_3 + db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite + ; morn + dbw 33, GASTLY + dbw 36, GASTLY + dbw 32, HAUNTER + dbw 44, CUBONE + dbw 44, WISPIRIT + dbw 44, WISPIRIT + dbw 44, VULPIX + ; day + dbw 32, GASTLY + dbw 34, GASTLY + dbw 38, HAUNTER + dbw 36, CUBONE + dbw 46, WISPIRIT + dbw 46, WISPIRIT + dbw 46, VULPIX + ; nite + dbw 34, GASTLY + dbw 38, MISDREAVUS + dbw 36, HAUNTER + dbw 32, KITSEN + dbw 42, WISPIRIT + dbw 42, WISPIRIT + dbw 42, GENGAR + end_grass_wildmons + + def_grass_wildmons LAVENDER_CRYPT_DOKUROARS_ROOM + db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite + ; morn + dbw 33, CUBONE + dbw 36, GASTLY + dbw 32, HAUNTER + dbw 44, CUBONE + dbw 44, WISPIRIT + dbw 44, WISPIRIT + dbw 44, MAROWAK + ; day + dbw 32, CUBONE + dbw 34, GASTLY + dbw 38, HAUNTER + dbw 36, CUBONE + dbw 46, WISPIRIT + dbw 46, WISPIRIT + dbw 46, MAROWAK + ; nite + dbw 34, CUBONE + dbw 38, MISDREAVUS + dbw 36, HAUNTER + dbw 32, KITSEN + dbw 42, WISPIRIT + dbw 42, WISPIRIT + dbw 42, GENGAR + end_grass_wildmons def_grass_wildmons ALTERING_CAVE db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite diff --git a/maps/LavenderCryptSet3.asm b/maps/LavenderCryptSet3.asm index bc85861..ddc8020 100644 --- a/maps/LavenderCryptSet3.asm +++ b/maps/LavenderCryptSet3.asm @@ -9,7 +9,7 @@ LavenderCryptSet3_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 3, 8, LAVENDER_CRYPT, 3 + warp_event 3, 8, LAVENDER_CRYPT, 4 warp_event 7, 13, LAVENDER_CRYPT_SET_1, 1 ; To Dokuroar warp_event 2, 4, LAVENDER_CRYPT_SET_1, 4