From e7a672a3a67d15c5f72246dc53ce25e7ac27cc19 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Tue, 27 Aug 2024 03:31:07 +0100 Subject: [PATCH] hi thorny --- Makefile | 2 +- layout.link | 2 +- maps/DebugRoom.asm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c8582b0..0aa5355 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ ifeq ($(DEBUG),1) RGBASMFLAGS += -E endif -$(pokecrystal_obj): RGBASMFLAGS += -D _DEBUG +$(pokecrystal_obj): RGBASMFLAGS += $(pokecrystal_vc_obj): RGBASMFLAGS += -D _CRYSTAL_VC %.patch: vc/%.constants.sym %_vc.gbc %.gbc vc/%.patch.template diff --git a/layout.link b/layout.link index 60cdaf1..42edf16 100644 --- a/layout.link +++ b/layout.link @@ -302,7 +302,7 @@ ROMX $77 "Pokégear GFX" "European Mail" ROMX $78 - "Debug Room" + ROMX $7b "Battle Tower Text" ROMX $7c diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index a437eb8..4a50831 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -8,12 +8,12 @@ DebugRoom_MapScripts: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, PERSIAN + getmonname STRING_BUFFER_3, MACHAMP writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke PERSIAN, 90, TM_ROCK_SMASH + givepoke MACHAMP, 90, TM_ROCK_SMASH closetext end