From a2d206665c6fffbd962375f262b7fbb05c7b7478 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Tue, 30 Mar 2021 13:11:51 -0500 Subject: Move some data and Splitting (#32) * move friend area settings to src * split out playtime into different C file and decomp a few more funcs * time -> play_time * fix include * split out more wonder mail stuff * unify 203B2C0 and unkDungeon structs. snuck in a decomp func too * split out more menu screens * work some more on trade items * doc a few more things * add a close nonmatch and decomp nullsub and small func * rollback struct attempt since it causes nonmatchings * only one func left in asm * death to trade_item asm and unify into one C file * more docing and cleanup * label main menu and trade items menu global menu struct * doc itemMode --- include/constants/friend_area.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'include/constants') diff --git a/include/constants/friend_area.h b/include/constants/friend_area.h index 061e1ae..4692f89 100644 --- a/include/constants/friend_area.h +++ b/include/constants/friend_area.h @@ -4,6 +4,12 @@ #define NUM_FRIEND_AREAS 58 +// Unlock Condition +#define UNLOCK_SHOP_STORY 0 +#define UNLOCK_SHOP_POST_GAME 1 +#define UNLOCK_WONDER_MAIL 2 +#define UNLOCK_LEGENDARY_REQUEST 3 + #define NONE 0 #define BOUNTIFUL_SEA 1 #define TREASURE_SEA 2 @@ -11,7 +17,7 @@ #define DEEP_SEA_FLOOR 4 #define DEEP_SEA_CURRENT 5 #define SEAFLOOR_CAVE 6 -#define SHALLOW_CAVE 7 +#define SHALLOW_BEACH 7 #define MT_DEEPGREEN 8 #define MT_CLEFT 9 #define MT_MOONVIEW 10 -- cgit v1.2.3