From 1b0c9e6f8a2ac867c57d7f8056f462dad3bd4ba0 Mon Sep 17 00:00:00 2001 From: May Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 5 Dec 2022 17:52:14 +0000 Subject: [PATCH] correct associations for scarlet book & mt moon crater spaced with actual names, not how it's rendered in-game --- data/wild/maps/MtMoonCrater.asm | 4 ++-- engine/events/hidden_objects/museum_fossils.asm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/wild/maps/MtMoonCrater.asm b/data/wild/maps/MtMoonCrater.asm index 657e1513..eb36a6aa 100644 --- a/data/wild/maps/MtMoonCrater.asm +++ b/data/wild/maps/MtMoonCrater.asm @@ -8,8 +8,8 @@ MtMoonCraterMons: db 55, RAICHU db 55, UMBREON db 56, ESPEON - db 50, SCREAMTAIL - db 50, SANDYSHOX + db 50, SCREAM_TAIL + db 50, SANDY_SHOCKS end_grass_wildmons def_water_wildmons 10 ; encounter rate diff --git a/engine/events/hidden_objects/museum_fossils.asm b/engine/events/hidden_objects/museum_fossils.asm index 3134ebab..fd1ff814 100644 --- a/engine/events/hidden_objects/museum_fossils.asm +++ b/engine/events/hidden_objects/museum_fossils.asm @@ -24,12 +24,12 @@ KabutopsFossilText:: ScarletBook:: tx_pre ScarletBook1 - ld a, SCREAMTAIL + ld a, SCREAM_TAIL ld [wcf91], a call PlayCry jp DisplayMonFrontSpriteInBox tx_pre ScarletBook2 - ld a, SANDYSHOX + ld a, SANDY_SHOCKS ld [wcf91], a call PlayCry jp DisplayMonFrontSpriteInBox