From 648c6c7093f5173694562929f615380f297ad306 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 13:41:12 +0100 Subject: Move `gStringVar` declarations to text.h --- src/main_menu.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/main_menu.c') diff --git a/src/main_menu.c b/src/main_menu.c index 7adbda096..63b1e9b99 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -71,8 +71,6 @@ extern const u8 gSystemText_NewPara[]; extern u8 gSpriteAffineAnimTable_81E79AC[]; -extern u8 gStringVar4[]; - extern u8 unk_2000000[]; //Task data -- cgit v1.2.3 From c9722602cb47eb5b6ecbccddf13df5f286a8ef7b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:13:04 +0100 Subject: Sort includes --- src/main_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main_menu.c') diff --git a/src/main_menu.c b/src/main_menu.c index 63b1e9b99..dee9af852 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -2,6 +2,7 @@ #include "main_menu.h" #include "asm.h" #include "decompress.h" +#include "event_data.h" #include "menu.h" #include "mystery_event_menu.h" #include "option_menu.h" @@ -16,7 +17,6 @@ #include "task.h" #include "text.h" #include "title_screen.h" -#include "event_data.h" #define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24)) -- cgit v1.2.3 From b1925402a0c7ffa4ca9470ef2ad9afc9a1baaf06 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 22 Jan 2017 23:22:12 -0600 Subject: start decompiling naming_screen --- src/main_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main_menu.c') diff --git a/src/main_menu.c b/src/main_menu.c index dee9af852..c586e2b08 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1081,7 +1081,7 @@ static void Task_NewGameSpeech22(u8 taskId) if (!gPaletteFade.active) { SetPresetPlayerName(1); - DoNamingScreen(0, &gSaveBlock2, gSaveBlock2.playerGender, 0, 0, CB_ContinueNewGameSpeechPart2); + DoNamingScreen(0, gSaveBlock2.playerName, gSaveBlock2.playerGender, 0, 0, CB_ContinueNewGameSpeechPart2); } } -- cgit v1.2.3 From b9ff56bd89ac11a9b40b34f834dcf7a5be4d90a6 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Fri, 27 Jan 2017 13:06:20 -0500 Subject: define more data in C (#219) * define some graphics data in C * define wild pokemon in C * use less #ifdefs * define data in berry.c --- src/main_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main_menu.c') diff --git a/src/main_menu.c b/src/main_menu.c index c586e2b08..f47b3bb47 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -69,7 +69,7 @@ extern const u8 gUnknown_081E7834[]; extern const u8 gUnknown_081E796C[]; extern const u8 gSystemText_NewPara[]; -extern u8 gSpriteAffineAnimTable_81E79AC[]; +extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E79AC[]; extern u8 unk_2000000[]; @@ -1256,7 +1256,7 @@ static void Task_NewGameSpeech30(u8 taskId) spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID]; gSprites[spriteId].oam.affineMode = 1; - gSprites[spriteId].affineAnims = (union AffineAnimCmd **)gSpriteAffineAnimTable_81E79AC; + gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_81E79AC; InitSpriteAffineAnim(&gSprites[spriteId]); StartSpriteAffineAnim(&gSprites[spriteId], 0); gSprites[spriteId].callback = ShrinkPlayerSprite; -- cgit v1.2.3 From 6035511c139549a0291b6b3d43b9b080f792b2b6 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Mar 2017 04:00:15 +0100 Subject: reorganize and add new headers for many files --- src/main_menu.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main_menu.c') diff --git a/src/main_menu.c b/src/main_menu.c index f47b3bb47..3c8df52d4 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -17,6 +17,7 @@ #include "task.h" #include "text.h" #include "title_screen.h" +#include "naming_screen.h" #define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24)) -- cgit v1.2.3