From cd9254cd42a290e84bc3d4a62cccdcca2407dfe2 Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Wed, 19 Jun 2024 17:59:12 +0200 Subject: [PATCH] fix map bug introduced with debug --- include/config/debug.h | 2 +- src/crt0.s | 1 - tools/mapjson/mapjson.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/config/debug.h b/include/config/debug.h index 8918d6616..2446b9360 100644 --- a/include/config/debug.h +++ b/include/config/debug.h @@ -2,7 +2,7 @@ #define GUARD_CONFIG_DEBUG_H // Overworld Debug -#define DEBUG_OVERWORLD_MENU FALSE // Enables an overworld debug menu to change flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default. +#define DEBUG_OVERWORLD_MENU TRUE // Enables an overworld debug menu to change flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default. #define DEBUG_OVERWORLD_HELD_KEYS (R_BUTTON) // The keys required to be held to open the debug menu. #define DEBUG_OVERWORLD_TRIGGER_EVENT pressedStartButton // The event that opens the menu when holding the key(s) defined in DEBUG_OVERWORLD_HELD_KEYS. #define DEBUG_OVERWORLD_IN_MENU FALSE // Replaces the overworld debug menu button combination with a start menu entry (above Pokédex). diff --git a/src/crt0.s b/src/crt0.s index a0d8a4b55..9b492486a 100644 --- a/src/crt0.s +++ b/src/crt0.s @@ -1,6 +1,5 @@ .include "constants/gba_constants.inc" .include "constants/misc_constants.inc" - .include "constants/version.inc" .syntax unified diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 4f59dc757..bd3e00820 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -195,7 +195,7 @@ string generate_map_events_text(Json map_data) { string mapName = json_to_string(map_data, "name"); - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n"; + text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n\t.align 2\n\n"; string objects_label, warps_label, coords_label, bgs_label;