diff --git a/data/data_8270000.s b/data/data_8270000.s index 32e5ca3e3..999cc2183 100644 --- a/data/data_8270000.s +++ b/data/data_8270000.s @@ -3,88 +3,6 @@ .global gUnknown_8270000 gUnknown_8270000: @ 8270000 @ replacing .incbin "baserom.gba", 0x00270000, 0x2724 -.byte 0x02, 0x00, 0x00, 0x00 -.byte 0x01, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x10, 0x00, 0x00, 0x00 -.byte 0x11, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x01, 0x00, 0x00, 0x00 -.byte 0xde, 0xff, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.4byte gUnkData_80E7628 -.byte 0x05, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00 -.byte 0x03, 0x00, 0x00, 0x00 -.byte 0x0c, 0x00, 0x00, 0x00 -.byte 0x0c, 0x00, 0x00, 0x00 -.byte 0x0e, 0x00, 0x00, 0x00 -.byte 0x0e, 0x00, 0x00, 0x00 -.byte 0x0d, 0x00, 0x00, 0x00 -.byte 0x0e, 0x00, 0x00, 0x00 -.byte 0x0c, 0x00, 0x00, 0x00 -.byte 0x0d, 0x00, 0x00, 0x00 -.byte 0x0d, 0x00, 0x00, 0x00 -.byte 0x0b, 0x00, 0x00, 0x00 -.byte 0x0b, 0x00, 0x00, 0x00 -.byte 0x0b, 0x00, 0x00, 0x00 -.byte 0x10, 0x00, 0x00, 0x00 -.byte 0x11, 0x00, 0x00, 0x00 -.byte 0x12, 0x00, 0x00, 0x00 -.byte 0x13, 0x00, 0x00, 0x00 -.byte 0x14, 0x00, 0x00, 0x00 -.byte 0x15, 0x00, 0x00, 0x00 -.byte 0x1a, 0x00, 0x00, 0x00 -.byte 0x18, 0x00, 0x00, 0x00 -.byte 0x1b, 0x00, 0x00, 0x00 -.byte 0x16, 0x00, 0x00, 0x00 -.byte 0x19, 0x00, 0x00, 0x00 -.byte 0x17, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 diff --git a/src/adventure_log.c b/src/adventure_log.c index 1b8f3fd21..32846c6b2 100644 --- a/src/adventure_log.c +++ b/src/adventure_log.c @@ -11,7 +11,7 @@ #include "text.h" #include "structs/struct_sub80095e4.h" -static EWRAM_DATA_2 struct_Sub80095E4_2 *sAdventureLog = {0}; +static EWRAM_INIT struct_Sub80095E4_2 *sAdventureLog = {NULL}; #include "data/adventure_log.h" diff --git a/src/code_8023144.c b/src/code_8023144.c index 5d6736145..3ffd6fdff 100644 --- a/src/code_8023144.c +++ b/src/code_8023144.c @@ -16,6 +16,10 @@ static EWRAM_INIT u32 gUnknown_203B298 = {1}; static EWRAM_INIT u16 gUnknown_203B29C = {0}; static EWRAM_INIT u16 gUnknown_203B29E = {0}; +EWRAM_INIT s32 gUnknown_203B2A0 = 2; +EWRAM_INIT s32 gUnknown_203B2A4 = 1; +EWRAM_INIT u16 gUnknown_203B2A8 = 0; +EWRAM_INIT u16 gUnknown_203B2AA = 0; static IWRAM_DATA unkStruct_3001B5C *gUnknown_3001B5C = {NULL}; diff --git a/src/code_8024458.c b/src/code_8024458.c index a900360a5..7734c9af6 100644 --- a/src/code_8024458.c +++ b/src/code_8024458.c @@ -11,7 +11,7 @@ #include "pokemon_3.h" #include "text.h" -static EWRAM_DATA_2 struct unkStruct_203B2AC *sUnknown_203B2AC = {0}; +static EWRAM_INIT struct unkStruct_203B2AC *sUnknown_203B2AC = {NULL}; #include "data/code_8024458.h" diff --git a/src/code_802DB28.c b/src/code_802DB28.c index ac45cfda9..8205833b3 100644 --- a/src/code_802DB28.c +++ b/src/code_802DB28.c @@ -12,7 +12,7 @@ #include "pokemon.h" #include "text.h" -static EWRAM_DATA_2 struct unkStruct_203B2FC *sUnknown_203B2FC = {0}; +static EWRAM_INIT struct unkStruct_203B2FC *sUnknown_203B2FC = {NULL}; #include "data/code_802DB28.h" diff --git a/src/code_802DE84.c b/src/code_802DE84.c index 5b502fe63..943d909a1 100644 --- a/src/code_802DE84.c +++ b/src/code_802DE84.c @@ -8,7 +8,7 @@ #include "pokemon_mail.h" #include "text.h" -static EWRAM_DATA_2 struct unkStruct_203B300 *sUnknown_203B300 = {0}; +static EWRAM_INIT struct unkStruct_203B300 *sUnknown_203B300 = {NULL}; #include "data/code_802DE84.h" diff --git a/src/code_8031D70.c b/src/code_8031D70.c index 3903193d4..50fd743b0 100644 --- a/src/code_8031D70.c +++ b/src/code_8031D70.c @@ -23,7 +23,7 @@ struct unkStruct_203B334 u8 unk78[4]; }; -EWRAM_DATA_2 struct unkStruct_203B334 *gUnknown_203B334 = {0}; +EWRAM_INIT struct unkStruct_203B334 *gUnknown_203B334 = {NULL}; extern unkStruct_203B480 *gUnknown_203B480; const UnkTextStruct2 gUnknown_80E1FA8 = { diff --git a/src/code_8072F3C.c b/src/code_8072F3C.c index 48473590d..29c6f7496 100644 --- a/src/code_8072F3C.c +++ b/src/code_8072F3C.c @@ -27,7 +27,7 @@ struct unkStruct_203B314 struct struct_Sub80095E4_2 sBC; }; -EWRAM_DATA_2 struct unkStruct_203B314 *gUnknown_203B314 = {0}; +EWRAM_INIT struct unkStruct_203B314 *gUnknown_203B314 = {NULL}; const UnkTextStruct2 gUnknown_80E06FC = { 0x00, 0x00, 0x00, 0x00, diff --git a/src/credits1.c b/src/credits1.c index 8e66b3580..0008e6101 100644 --- a/src/credits1.c +++ b/src/credits1.c @@ -6,7 +6,7 @@ #include "memory.h" #include "text.h" -static EWRAM_DATA_2 Credits1Work *sCredits1Work = {0}; +static EWRAM_INIT Credits1Work *sCredits1Work = {NULL}; extern const UnkTextStruct2 gUnknown_80E4A10; extern const UnkTextStruct2 gUnknown_80E4A28; diff --git a/src/credits2.c b/src/credits2.c index a206ce4c3..4e4073545 100644 --- a/src/credits2.c +++ b/src/credits2.c @@ -5,7 +5,7 @@ #include "input.h" #include "memory.h" -static EWRAM_DATA_2 Credits2Work *sCredits2Work = {0}; +static EWRAM_INIT Credits2Work *sCredits2Work = {NULL}; #include "data/credits2.h" diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c index 399846252..bad311ce8 100644 --- a/src/friend_area_action_menu.c +++ b/src/friend_area_action_menu.c @@ -23,7 +23,7 @@ #include "sprite.h" #include "text.h" -static EWRAM_DATA_2 struct unkStruct_203B2BC *sUnknown_203B2BC = {0}; +static EWRAM_INIT struct unkStruct_203B2BC *sUnknown_203B2BC = {NULL}; void sub_8027D40(u32, BulkItem *heldItem); void sub_8027794(void); diff --git a/src/friend_list_menu.c b/src/friend_list_menu.c index 70796aa72..4f391f3c9 100644 --- a/src/friend_list_menu.c +++ b/src/friend_list_menu.c @@ -25,7 +25,7 @@ #include "pokemon.h" #include "text.h" -EWRAM_DATA_2 unkStruct_203B2B4 *gUnknown_203B2B4 = {0}; +EWRAM_INIT unkStruct_203B2B4 *gUnknown_203B2B4 = {NULL}; #include "data/friend_list_menu.h" diff --git a/src/friend_rescue.c b/src/friend_rescue.c index 797f31491..c5926d6f1 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -212,7 +212,7 @@ extern u8 gUnknown_80E4964[]; extern u8 gUnknown_80E499C[]; extern u8 gUnknown_80E49C4[]; -EWRAM_DATA_2 WonderMailStruct_203B33C *gUnknown_203B33C = {0}; +EWRAM_INIT WonderMailStruct_203B33C *gUnknown_203B33C = {NULL}; extern u8 sub_8039880(void); diff --git a/src/load_screen.c b/src/load_screen.c index 7f0e64c4b..f816767a4 100644 --- a/src/load_screen.c +++ b/src/load_screen.c @@ -38,10 +38,7 @@ struct LoadScreen /* 0x258 */ u8 formattedHelperInfo[0x24]; }; -EWRAM_DATA_2 struct LoadScreen *gLoadScreen = {0}; -EWRAM_DATA_2 MenuItem gUnknown_203B378[2] = {0}; -EWRAM_DATA_2 u32 gUnknown_203B388[12] = {0}; -EWRAM_DATA_2 u32 gUnknown_203B3B8[12] = {0}; +EWRAM_INIT struct LoadScreen *gLoadScreen = {NULL}; extern unkStruct_203B484 *gUnknown_203B484; @@ -69,7 +66,19 @@ const UnkTextStruct2 gUnknown_80E7610 = { NULL }; -const u8 gUnkData_80E7628[] = {0x20, 0x00, 0x00, 0x00}; +EWRAM_INIT MenuItem gUnknown_203B378[2] = { + [0] = { + .text = " ", + .menuAction = 5, + }, + [1] = { + .text = NULL, + .menuAction = 3, + } +}; + +EWRAM_INIT u32 gUnknown_203B388[12] = {0xC, 0xC, 0xE, 0xE, 0xD, 0xE, 0xC, 0xD, 0xD, 0xB, 0xB, 0xB}; +EWRAM_INIT u32 gUnknown_203B3B8[12] = {0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x1A, 0x18, 0x1B, 0x16, 0x19, 0x17}; const UnkTextStruct2 gUnknown_80E762C = { 0x00, 0x00, 0x00, 0x00, diff --git a/src/luminous_cave.c b/src/luminous_cave.c index fe4c0ea94..edbb0cf20 100644 --- a/src/luminous_cave.c +++ b/src/luminous_cave.c @@ -59,7 +59,7 @@ enum LuminousCaveMenuActions }; -static EWRAM_DATA_2 LuminousCaveWork *sLuminousCaveWork = {0}; +static EWRAM_INIT LuminousCaveWork *sLuminousCaveWork = {NULL}; #include "data/luminous_cave.h" diff --git a/src/mailbox.c b/src/mailbox.c index 2e1b65946..2e3a5a1f1 100644 --- a/src/mailbox.c +++ b/src/mailbox.c @@ -18,7 +18,7 @@ #include "wonder_mail_802C4C8.h" #include "wonder_mail_802C860.h" -EWRAM_DATA_2 struct unkStruct_203B304 *gUnknown_203B304 = {0}; +EWRAM_INIT struct unkStruct_203B304 *gUnknown_203B304 = {NULL}; const UnkTextStruct2 gUnknown_80E0284 = { diff --git a/src/main_menu1.c b/src/main_menu1.c index b39e972d9..8a79f8eb2 100644 --- a/src/main_menu1.c +++ b/src/main_menu1.c @@ -35,7 +35,7 @@ // NOTE: 0x2E // Deletes the Save -static EWRAM_DATA_2 MainMenu1Work *sMainMenu = {0}; +static EWRAM_INIT MainMenu1Work *sMainMenu = {NULL}; #include "data/main_menu1.h" diff --git a/src/main_menu2.c b/src/main_menu2.c index 8f83268b8..220930b9d 100644 --- a/src/main_menu2.c +++ b/src/main_menu2.c @@ -11,9 +11,9 @@ #include "save.h" #include "text.h" -static EWRAM_DATA_2 MainMenu2Work *sUnknown_203B34C = {0}; -static EWRAM_DATA_2 u32 sUnknown_203B350 = {0}; -static EWRAM_DATA_2 u32 sUnknown_203B354 = {0}; +static EWRAM_INIT MainMenu2Work *sUnknown_203B34C = {NULL}; +static EWRAM_INIT u32 sUnknown_203B350 = {MENU_DEBUG}; +static EWRAM_INIT u32 sUnknown_203B354 = {MENU_SEND_ITEMS}; #include "data/main_menu2.h" @@ -295,4 +295,4 @@ bool8 sub_80363E0(void) if (sUnknown_203B34C->unk0 == 12) return FALSE; return TRUE; -} \ No newline at end of file +} diff --git a/src/makuhita_dojo1.c b/src/makuhita_dojo1.c index d6ac388b4..bfcf7f211 100644 --- a/src/makuhita_dojo1.c +++ b/src/makuhita_dojo1.c @@ -14,7 +14,7 @@ #include "pokemon.h" #include "text.h" -static EWRAM_DATA_2 MakuhitaDojoWork1 *sMakuhitaDojoWork1 = {0}; +static EWRAM_INIT MakuhitaDojoWork1 *sMakuhitaDojoWork1 = {NULL}; #include "data/makuhita_dojo1.h" diff --git a/src/makuhita_dojo2.c b/src/makuhita_dojo2.c index 289641f01..0555b3045 100644 --- a/src/makuhita_dojo2.c +++ b/src/makuhita_dojo2.c @@ -13,7 +13,7 @@ #include "menu_input.h" #include "text.h" -static EWRAM_DATA_2 MakuhitaDojoWork2 *sMakuhitaDojoWork2 = {0}; +static EWRAM_INIT MakuhitaDojoWork2 *sMakuhitaDojoWork2 = {NULL}; #include "data/makuhita_dojo2.h" // 80E07EC diff --git a/src/mission_reward.c b/src/mission_reward.c index 15c0f98f4..ddb071465 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -26,10 +26,7 @@ struct unkStruct_203B310 UnkTextStruct2 unk24[4]; }; -EWRAM_DATA_2 struct unkStruct_203B310 *gUnknown_203B310 = {0}; - -extern u8 gFormatBuffer_FriendArea[]; -extern u8 gSpeakerNameBuffer[]; +EWRAM_INIT struct unkStruct_203B310 *gUnknown_203B310 = {NULL}; enum FriendRewardStates { diff --git a/src/other_menus1.c b/src/other_menus1.c index 4f1a30682..1c0c21a60 100644 --- a/src/other_menus1.c +++ b/src/other_menus1.c @@ -18,7 +18,7 @@ #include "sprite.h" #include "text.h" -static EWRAM_DATA_2 unkStruct_203B35C *sUnknown_203B35C = {0}; +static EWRAM_INIT unkStruct_203B35C *sUnknown_203B35C = {NULL}; #include "data/other_menus1.h" @@ -492,4 +492,4 @@ void sub_8037900(void) UNUSED static void nullsub_202(void) { -} \ No newline at end of file +} diff --git a/src/party_list_menu.c b/src/party_list_menu.c index c29350bbe..420c611a8 100644 --- a/src/party_list_menu.c +++ b/src/party_list_menu.c @@ -25,7 +25,7 @@ #include "text_util.h" #include "text.h" -static EWRAM_DATA_2 unkStruct_203B2B8 *sUnknown_203B2B8 = {0}; +static EWRAM_INIT unkStruct_203B2B8 *sUnknown_203B2B8 = {NULL}; #include "data/party_list_menu.h" diff --git a/src/pelipper_board.c b/src/pelipper_board.c index 8ce19a7e3..43d2d0b16 100644 --- a/src/pelipper_board.c +++ b/src/pelipper_board.c @@ -18,7 +18,7 @@ #include "wonder_mail_802C4C8.h" #include "wonder_mail_802C860.h" -EWRAM_DATA_2 struct unkStruct_203B308 *gPelipperBoard = {0}; +EWRAM_INIT struct unkStruct_203B308 *gPelipperBoard = {NULL}; const UnkTextStruct2 gUnknown_80E0330 = { diff --git a/src/pokemon_news1.c b/src/pokemon_news1.c index a56f66db9..b88b50255 100644 --- a/src/pokemon_news1.c +++ b/src/pokemon_news1.c @@ -12,9 +12,9 @@ #include "menu_input.h" #include "text.h" -static EWRAM_DATA_2 struct unkStruct_203B2CC *sUnknown_203B2CC = {0}; -static EWRAM_DATA_2 u16 sUnknown_203B2D0 = {0}; -static EWRAM_DATA_2 u16 sUnknown_203B2D2 = {0}; +static EWRAM_INIT struct unkStruct_203B2CC *sUnknown_203B2CC = {NULL}; +static EWRAM_INIT u16 sUnknown_203B2D0 = {0}; +static EWRAM_INIT u16 sUnknown_203B2D2 = {0}; #include "data/pokemon_news1.h" diff --git a/src/pokemon_news2.c b/src/pokemon_news2.c index 12b7abc12..3008c523b 100644 --- a/src/pokemon_news2.c +++ b/src/pokemon_news2.c @@ -11,7 +11,7 @@ #include "menu_input.h" #include "text.h" -static EWRAM_DATA_2 struct unkStruct_203B2D4 *sUnknown_203B2D4 = {0}; +static EWRAM_INIT struct unkStruct_203B2D4 *sUnknown_203B2D4 = {NULL}; #include "data/pokemon_news2.h" diff --git a/src/pokemon_news3.c b/src/pokemon_news3.c index 432f4d75f..e8be8f5a7 100644 --- a/src/pokemon_news3.c +++ b/src/pokemon_news3.c @@ -17,8 +17,8 @@ #include "text.h" #include "string_format.h" -static EWRAM_DATA_2 struct unkStruct_203B2D8 *sUnknown_203B2D8 = {0}; -static EWRAM_DATA_2 u16 sUnknown_203B2DC = {0}; +static EWRAM_INIT struct unkStruct_203B2D8 *sUnknown_203B2D8 = {NULL}; +static EWRAM_INIT u16 sUnknown_203B2DC = {0}; #include "data/pokemon_news3.h" diff --git a/src/post_office_guide1.c b/src/post_office_guide1.c index 7500d5591..76f5cd9ea 100644 --- a/src/post_office_guide1.c +++ b/src/post_office_guide1.c @@ -24,7 +24,7 @@ enum PostOfficeStates extern u8 gSpeakerNameBuffer[]; -static EWRAM_DATA_2 PostOfficeWork *sPostOfficeHelper = {0}; +static EWRAM_INIT PostOfficeWork *sPostOfficeHelper = {NULL}; #include "data/post_office_guide1.h" diff --git a/src/post_office_guide2.c b/src/post_office_guide2.c index 9af8a43e6..c5e99e742 100644 --- a/src/post_office_guide2.c +++ b/src/post_office_guide2.c @@ -18,7 +18,7 @@ #include "text.h" #include "string_format.h" -static EWRAM_DATA_2 unkStruct_203B330 *sUnknown_203B330 = {0}; +static EWRAM_INIT unkStruct_203B330 *sUnknown_203B330 = {NULL}; #include "data/post_office_guide2.h" diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c index cfecc723a..87220eff3 100644 --- a/src/rescue_password_menu.c +++ b/src/rescue_password_menu.c @@ -22,9 +22,9 @@ EWRAM_DATA u8 gRescuePasswordBuffer[RESCUE_PASSWORD_SIZE] = {0}; extern unkStruct_203B484 *gUnknown_203B484; -EWRAM_DATA_2 u8 gUnknown_203B368 = {0}; -EWRAM_DATA_2 u32 gUnknown_203B36C = {0}; -EWRAM_DATA_2 struct RescuePasswordMenu *gRescuePasswordMenu = {0}; +EWRAM_INIT u8 gUnknown_203B368 = {1}; +EWRAM_INIT u32 gUnknown_203B36C = {65502}; +EWRAM_INIT struct RescuePasswordMenu *gRescuePasswordMenu = {NULL}; const UnkTextStruct2 gUnknown_80E71E4 = { 0x00, 0x00, 0x00, 0x00, diff --git a/src/save_menu.c b/src/save_menu.c index 7d4274083..e8112b02f 100644 --- a/src/save_menu.c +++ b/src/save_menu.c @@ -10,7 +10,7 @@ #include "sprite.h" #include "text.h" -static EWRAM_DATA_2 SaveMenuWork *sUnknown_203B364 = {0}; +static EWRAM_INIT SaveMenuWork *sUnknown_203B364 = {NULL}; const UnkTextStruct2 gUnknown_80E6F20 = { diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 9ae508095..7ee792b70 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -25,7 +25,7 @@ #include "wonder_mail_4.h" #include "wonder_mail_5.h" -static EWRAM_DATA_2 WonderMailStruct_203B2C4 *sUnknown_203B2C4 = {0}; +static EWRAM_INIT WonderMailStruct_203B2C4 *sUnknown_203B2C4 = {NULL}; #define THANK_YOU_MAIL_MAIN_MENU 0 #define ANYTHING_ELSE_THANK_YOU_MAIN_MENU 1 diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c index 1271db154..a9b1415ef 100644 --- a/src/trade_items_menu.c +++ b/src/trade_items_menu.c @@ -16,7 +16,7 @@ #include "text.h" #include "trade_items_menu.h" -static EWRAM_DATA_2 struct TradeItemsMenu *sTradeItemsMenu = {0}; +static EWRAM_INIT struct TradeItemsMenu *sTradeItemsMenu = {NULL}; #include "data/trade_items_menu.h" diff --git a/src/unk_menu_203B360.c b/src/unk_menu_203B360.c index e8fd87df9..2c3e7ea06 100644 --- a/src/unk_menu_203B360.c +++ b/src/unk_menu_203B360.c @@ -20,7 +20,7 @@ typedef struct unkStruct_203B360 u32 unk1B0; // sprite count? } unkStruct_203B360; -static EWRAM_DATA_2 unkStruct_203B360 *sUnknown_203B360 = {0}; +static EWRAM_INIT unkStruct_203B360 *sUnknown_203B360 = {NULL}; const UnkTextStruct2 gUnknown_80E6E7C = { 0x00, 0x00, 0x00, 0x00, diff --git a/src/wonder_mail.c b/src/wonder_mail.c index e7d42aa72..d53fd48cb 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -23,7 +23,7 @@ #include "wonder_mail_4.h" #include "wonder_mail_5.h" -static EWRAM_DATA_2 WonderMailStruct_203B2C0 *sUnknown_203B2C0 = {0}; +static EWRAM_INIT WonderMailStruct_203B2C0 *sUnknown_203B2C0 = {NULL}; extern void sub_8011C28(u32); diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c index 4346f3bdf..839c18d29 100644 --- a/src/wonder_mail_2.c +++ b/src/wonder_mail_2.c @@ -36,7 +36,7 @@ enum States { EXIT_STATE = 5 }; -static EWRAM_DATA_2 struct unkStruct_203B2C8 *sUnknown_203B2C8 = {0}; +static EWRAM_INIT struct unkStruct_203B2C8 *sUnknown_203B2C8 = {NULL}; extern void sub_80920D8(u8 *buffer); extern void sub_802B548(u32); diff --git a/src/wonder_mail_3_mid.c b/src/wonder_mail_3_mid.c index 17e5f0a2f..e344f72a1 100644 --- a/src/wonder_mail_3_mid.c +++ b/src/wonder_mail_3_mid.c @@ -21,7 +21,7 @@ struct unkStruct_203B30C MenuItem unkB0[8]; UnkTextStruct2 unkF0[4]; }; -static EWRAM_DATA_2 struct unkStruct_203B30C *gUnknown_203B30C = {0}; +static EWRAM_INIT struct unkStruct_203B30C *gUnknown_203B30C = {NULL}; extern void sub_802EFEC(u32); extern void sub_802F148(void); diff --git a/src/wonder_mail_4.c b/src/wonder_mail_4.c index 5189d3ded..a7be19ec0 100644 --- a/src/wonder_mail_4.c +++ b/src/wonder_mail_4.c @@ -22,7 +22,7 @@ struct unkStruct_203B320 u32 wonderMailType; struct_Sub80095E4_2 s28; }; -static EWRAM_DATA_2 struct unkStruct_203B320 *gUnknown_203B320 = {0}; +static EWRAM_INIT struct unkStruct_203B320 *gUnknown_203B320 = {NULL}; extern unkStruct_203B480 *gUnknown_203B480; diff --git a/src/wonder_mail_5.c b/src/wonder_mail_5.c index 4f1d8c86e..9486643b0 100644 --- a/src/wonder_mail_5.c +++ b/src/wonder_mail_5.c @@ -24,7 +24,7 @@ struct unkStruct_203B324 UnkTextStruct2 unk18[4]; }; -static EWRAM_DATA_2 struct unkStruct_203B324 *gUnknown_203B324 = {0}; +static EWRAM_INIT struct unkStruct_203B324 *gUnknown_203B324 = {NULL}; extern unkStruct_203B480 *gUnknown_203B480; diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c index d81e03a38..486d6316e 100644 --- a/src/wonder_mail_6.c +++ b/src/wonder_mail_6.c @@ -21,7 +21,7 @@ struct unkStruct_203B328 /* 0x108 */ struct MonPortraitMsg monPortrait; u32 wonderMailType; }; -static EWRAM_DATA_2 struct unkStruct_203B328 *gUnknown_203B328 = {0}; +static EWRAM_INIT struct unkStruct_203B328 *gUnknown_203B328 = {NULL}; extern unkStruct_203B480 *gUnknown_203B480; diff --git a/src/wonder_mail_802C10C.c b/src/wonder_mail_802C10C.c index 78666ca5b..23f80463a 100644 --- a/src/wonder_mail_802C10C.c +++ b/src/wonder_mail_802C10C.c @@ -11,8 +11,8 @@ #include "text.h" #include "wonder_mail_802C10C.h" -static EWRAM_DATA_2 struct unkStruct_203B2E0 *gUnknown_203B2E0 = {0}; -static EWRAM_DATA_2 u16 gUnknown_203B2E4 = {0}; +static EWRAM_INIT struct unkStruct_203B2E0 *gUnknown_203B2E0 = {NULL}; +static EWRAM_INIT u16 gUnknown_203B2E4 = {0}; #include "data/wonder_mail_802C10C.h" diff --git a/src/wonder_mail_802C4C8.c b/src/wonder_mail_802C4C8.c index 6f9ba7aad..4ecafc075 100644 --- a/src/wonder_mail_802C4C8.c +++ b/src/wonder_mail_802C4C8.c @@ -14,8 +14,8 @@ #include "text.h" #include "wonder_mail_802C4C8.h" -static EWRAM_DATA_2 struct unkStruct_203B2E0* gUnknown_203B2E8 = {0}; -static EWRAM_DATA_2 u16 gUnknown_203B2EC = {0}; +static EWRAM_INIT struct unkStruct_203B2E0* gUnknown_203B2E8 = {NULL}; +static EWRAM_INIT u16 gUnknown_203B2EC = {0}; #include "data/wonder_mail_802C4C8.h" diff --git a/src/wonder_mail_802C860.c b/src/wonder_mail_802C860.c index 331a4038b..a7c3beb22 100644 --- a/src/wonder_mail_802C860.c +++ b/src/wonder_mail_802C860.c @@ -13,7 +13,7 @@ #include "wonder_mail_802C860.h" #include "text.h" -static EWRAM_DATA_2 struct unkStruct_203B2F0 *sUnknown_203B2F0 = {0}; +static EWRAM_INIT struct unkStruct_203B2F0 *sUnknown_203B2F0 = {NULL}; #include "data/wonder_mail_802C860.h" diff --git a/src/wonder_mail_802CDD4.c b/src/wonder_mail_802CDD4.c index 98cace658..2cdb48b5b 100644 --- a/src/wonder_mail_802CDD4.c +++ b/src/wonder_mail_802CDD4.c @@ -13,7 +13,7 @@ #include "text.h" #include "wonder_mail_802CDD4.h" -static EWRAM_DATA_2 struct_Sub80095E4_2 *sUnknown_203B2F4 = {0}; +static EWRAM_INIT struct_Sub80095E4_2 *sUnknown_203B2F4 = {NULL}; #include "data/wonder_mail_802CDD4.h" diff --git a/src/wonder_mail_802D098.c b/src/wonder_mail_802D098.c index 246346f26..4b6650dcc 100644 --- a/src/wonder_mail_802D098.c +++ b/src/wonder_mail_802D098.c @@ -43,7 +43,7 @@ enum menuActions { OLD_MAIL_ACTION }; -static EWRAM_DATA_2 unkStruct_203B2F8 *sUnknown_203B2F8 = {0}; +static EWRAM_INIT unkStruct_203B2F8 *sUnknown_203B2F8 = {NULL}; #include "data/wonder_mail_802D098.h" diff --git a/sym_ewram2.txt b/sym_ewram2.txt index 69f8d6365..141a74c04 100644 --- a/sym_ewram2.txt +++ b/sym_ewram2.txt @@ -1,60 +1,6 @@ .align 2 -gUnknown_203B2A0: /* 203B2A0 (sub_8023868 - sub_8023C60) */ - .space 0x4 -gUnknown_203B2A4: /* 203B2A4 (sub_8023868 - sub_8023C60) */ - .space 0x4 - -gUnknown_203B2A8: /* 203B2A8 (sub_8023868 - sub_8023C60) */ - .space 0x2 - -gUnknown_203B2AA: /* 203B2AA (sub_8023868 - sub_8023C60) */ - .space 0x2 - -.include "src/code_8024458.o" -.include "src/luminous_cave.o" -.include "src/friend_list_menu.o" -.include "src/party_list_menu.o" -.include "src/friend_area_action_menu.o" -.include "src/wonder_mail.o" -.include "src/thank_you_wonder_mail.o" -.include "src/wonder_mail_2.o" -.include "src/pokemon_news1.o" -.include "src/pokemon_news2.o" -.include "src/pokemon_news3.o" -.include "src/wonder_mail_802C10C.o" -.include "src/wonder_mail_802C4C8.o" -.include "src/wonder_mail_802C860.o" -.include "src/wonder_mail_802CDD4.o" -.include "src/wonder_mail_802D098.o" -.include "src/code_802DB28.o" -.include "src/code_802DE84.o" -.include "src/mailbox.o" -.include "src/pelipper_board.o" -.include "src/wonder_mail_3_mid.o" -.include "src/mission_reward.o" -.include "src/code_8072F3C.o" -.include "src/makuhita_dojo1.o" -.include "src/makuhita_dojo2.o" -.include "src/wonder_mail_4.o" -.include "src/wonder_mail_5.o" -.include "src/wonder_mail_6.o" -.include "src/post_office_guide1.o" -.include "src/post_office_guide2.o" -.include "src/code_8031D70.o" -.include "src/adventure_log.o" -.include "src/friend_rescue.o" -.include "src/credits1.o" -.include "src/credits2.o" -.include "src/main_menu1.o" -.include "src/main_menu2.o" -.include "src/trade_items_menu.o" -.include "src/other_menus1.o" -.include "src/unk_menu_203B360.o" -.include "src/save_menu.o" -.include "src/rescue_password_menu.o" -.include "src/load_screen.o" .include "src/wonder_mail_main_menu.o" .include "src/debug_menu1.o" .include "src/debug_menu2.o" diff --git a/sym_ewram_init.txt b/sym_ewram_init.txt index 184f3f5ce..2f27377be 100644 --- a/sym_ewram_init.txt +++ b/sym_ewram_init.txt @@ -55,3 +55,46 @@ .include "src/wigglytuff_shop3.o" .include "src/code_80227B8.o" .include "src/code_8023144.o" +.include "src/code_8024458.o" +.include "src/luminous_cave.o" +.include "src/friend_list_menu.o" +.include "src/party_list_menu.o" +.include "src/friend_area_action_menu.o" +.include "src/wonder_mail.o" +.include "src/thank_you_wonder_mail.o" +.include "src/wonder_mail_2.o" +.include "src/pokemon_news1.o" +.include "src/pokemon_news2.o" +.include "src/pokemon_news3.o" +.include "src/wonder_mail_802C10C.o" +.include "src/wonder_mail_802C4C8.o" +.include "src/wonder_mail_802C860.o" +.include "src/wonder_mail_802CDD4.o" +.include "src/wonder_mail_802D098.o" +.include "src/code_802DB28.o" +.include "src/code_802DE84.o" +.include "src/mailbox.o" +.include "src/pelipper_board.o" +.include "src/wonder_mail_3_mid.o" +.include "src/mission_reward.o" +.include "src/code_8072F3C.o" +.include "src/makuhita_dojo1.o" +.include "src/makuhita_dojo2.o" +.include "src/wonder_mail_4.o" +.include "src/wonder_mail_5.o" +.include "src/wonder_mail_6.o" +.include "src/post_office_guide1.o" +.include "src/post_office_guide2.o" +.include "src/code_8031D70.o" +.include "src/adventure_log.o" +.include "src/friend_rescue.o" +.include "src/credits1.o" +.include "src/credits2.o" +.include "src/main_menu1.o" +.include "src/main_menu2.o" +.include "src/trade_items_menu.o" +.include "src/other_menus1.o" +.include "src/unk_menu_203B360.o" +.include "src/save_menu.o" +.include "src/rescue_password_menu.o" +.include "src/load_screen.o"