From a1ad14f4afddfaaf4604183a1f56d7fc273f4626 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 28 Jun 2021 10:42:28 -0400 Subject: Sync makefile echo lines from Emerald; RegionMapState.choseFlyLocation --- include/ewram.h | 1 - include/region_map.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/ewram.h b/include/ewram.h index 1a03d71ae..09630d88b 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -29,7 +29,6 @@ extern u8 gSharedMem[]; #define eSaveSection (struct SaveSector *)(gSharedMem + 0x0) #define eSlotMachine ((struct SlotMachineEwramStruct *)(gSharedMem + 0x0)) #define ePokemonStorageSystem (*(struct PokemonStorageSystemData *)(gSharedMem + 0)) -#define ewramA6E (gSharedMem[0xA6E]) #define ewram01000 (*(struct Unk2001000 *)(gSharedMem + 0x1000)) #define ewramBerryPicTemp (gSharedMem + 0x1000) #define EWRAM_1000 (*(struct Struct2001000 *)(gSharedMem + 0x1000)) diff --git a/include/region_map.h b/include/region_map.h index 474e1ebda..dc3b8cee6 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -68,7 +68,8 @@ struct RegionMapState u16 mapSectionId; struct RegionMap regionMap; u16 unk_888[0xE0]; - u8 blankMapName[12]; + u8 blankMapName[0x26]; + bool8 choseFlyLocation; }; extern struct RegionMapState *const gRegionMapState; -- cgit v1.2.3