From 0083f7a549d9daea3b128e7950072be9493d5c86 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Thu, 11 Jul 2024 18:54:34 +0100 Subject: [PATCH] Altering Cave wild data and mapdev This gives Altering Cave its appearance and wild data according to the current spreadsheet revision. --- constants/map_constants.asm | 2 +- data/wild/kanto_grass.asm | 28 ++++++++++++++++++++++++++++ maps/AlteringCave.ablk | Bin 100 -> 270 bytes maps/AlteringCave.asm | 1 + 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index f217628..99eede9 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -600,7 +600,7 @@ ENDM map_const GREEN_PATH, 10, 10 ; 5 map_const PATTERN_BUSH, 10, 10 ; 6 map_const OUTCAST_ISLAND, 10, 10 ; 7 - map_const ALTERING_CAVE, 10, 10 ; 8 + map_const ALTERING_CAVE, 18, 15 ; 8 endgroup newgroup SEVEN_ISLAND ; 34 diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index aed7466..aebd4bf 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -930,4 +930,32 @@ KantoGrassWildMons: dbw 42, GENGAR end_grass_wildmons + def_grass_wildmons ALTERING_CAVE + db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite + ; morn + dbw 45, ZUBAT + dbw 46, MAREEP + dbw 46, ZUBAT + dbw 46, AIPOM + dbw 49, PINECO + dbw 48, TEDDIURSA + dbw 49, SMEARGLE + ; day + dbw 45, ZUBAT + dbw 46, MAREEP + dbw 46, ZUBAT + dbw 46, AIPOM + dbw 49, PINECO + dbw 48, TEDDIURSA + dbw 49, STANTLER + ; nite + dbw 45, ZUBAT + dbw 46, MAREEP + dbw 46, ZUBAT + dbw 46, AIPOM + dbw 49, PINECO + dbw 48, TEDDIURSA + dbw 49, HOUNDOUR + end_grass_wildmons + db -1 ; end diff --git a/maps/AlteringCave.ablk b/maps/AlteringCave.ablk index eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7..891acd4e72514f234e836a08edfdcfbd069ab895 100644 GIT binary patch literal 270 zcmY+8!3qO02t;An1QjFMQ`^JB9@C!s|6f-%o6^q3;W0Wgb8l_uUv(SMKO_TqX!D?l zGcI@{MY5Gr$@hIEBk^SklCV^$LElEJsT~=(xgG(fbJKY7ZFUhE%Scqo#xWm6n ZQ3=)X{!D7N2f7}afVpB@cFo%|`~jF83EBVv literal 100 LcmZQzpgjNp0Av6G diff --git a/maps/AlteringCave.asm b/maps/AlteringCave.asm index bc6a99f..19b3bca 100644 --- a/maps/AlteringCave.asm +++ b/maps/AlteringCave.asm @@ -9,6 +9,7 @@ AlteringCave_MapEvents: db 0, 0 ; filler def_warp_events + warp_event 17, 27, DEBUG_ROOM, 1 ; Will be Outcast Island def_coord_events