From 18d57a38021a7fee9d8f2131f776946d81c83fbe Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 19 Jun 2020 19:58:56 -0400 Subject: Document some overworld and field effects --- src/move_relearner.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/move_relearner.c') diff --git a/src/move_relearner.c b/src/move_relearner.c index 8c4cf7b2e..1c863804b 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -384,7 +384,7 @@ static void CB2_InitLearnMove(void) ResetSpriteData(); FreeAllSpritePalettes(); ResetTasks(); - clear_scheduled_bg_copies_to_vram(); + ClearScheduledBgCopiesToVram(); sMoveRelearnerStruct = AllocZeroed(sizeof(*sMoveRelearnerStruct)); sMoveRelearnerStruct->partyMon = gSpecialVar_0x8004; SetVBlankCallback(VBlankCB_MoveRelearner); @@ -412,7 +412,7 @@ static void CB2_InitLearnMoveReturnFromSelectMove(void) ResetSpriteData(); FreeAllSpritePalettes(); ResetTasks(); - clear_scheduled_bg_copies_to_vram(); + ClearScheduledBgCopiesToVram(); sMoveRelearnerStruct = AllocZeroed(sizeof(*sMoveRelearnerStruct)); sMoveRelearnerStruct->state = MENU_STATE_FADE_FROM_SUMMARY_SCREEN; sMoveRelearnerStruct->partyMon = gSpecialVar_0x8004; @@ -452,7 +452,7 @@ static void CB2_MoveRelearnerMain(void) RunTasks(); AnimateSprites(); BuildOamBuffer(); - do_scheduled_bg_tilemap_copies_to_vram(); + DoScheduledBgTilemapCopiesToVram(); UpdatePaletteFade(); } -- cgit v1.2.3 From 30142411799650c17367ce4652269e8ecca7ceef Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 20 Aug 2020 18:02:00 -0400 Subject: Give songs meaningful english names --- src/move_relearner.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/move_relearner.c') diff --git a/src/move_relearner.c b/src/move_relearner.c index 1c863804b..5f2123362 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -713,13 +713,13 @@ static void DoMoveRelearnerMain(void) { FormatAndPrintText(gText_MoveRelearnerPkmnForgotMoveAndLearnedNew); sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); } break; case MENU_STATE_PRINT_TEXT_THEN_FANFARE: if (!MoveRelearnerRunTextPrinters()) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); sMoveRelearnerStruct->state = MENU_STATE_WAIT_FOR_FANFARE; } break; -- cgit v1.2.3 From c68c2b66e8a9e4d1b6fd79c6b3403970f07b376a Mon Sep 17 00:00:00 2001 From: kiliwily <69381603+kiliwily@users.noreply.github.com> Date: Sat, 29 Aug 2020 01:02:20 +0200 Subject: add more macros --- src/move_relearner.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'src/move_relearner.c') diff --git a/src/move_relearner.c b/src/move_relearner.c index 1c863804b..3741d5973 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -150,20 +150,22 @@ #define JAM_HEART_EMPTY 2 #define JAM_HEART_FULL 3 +#define MAX_RELEARNER_MOVES (MAX_LEVEL_UP_MOVES > 25 ? MAX_LEVEL_UP_MOVES : 25) + static EWRAM_DATA struct { u8 state; - u8 heartSpriteIds[16]; /*0x001*/ - u16 movesToLearn[25]; /*0x01A*/ - u8 partyMon; /*0x044*/ - u8 moveSlot; /*0x045*/ - struct ListMenuItem menuItems[25]; /*0x0E8*/ - u8 numMenuChoices; /*0x110*/ - u8 numToShowAtOnce; /*0x111*/ - u8 moveListMenuTask; /*0x112*/ - u8 moveListScrollArrowTask; /*0x113*/ - u8 moveDisplayArrowTask; /*0x114*/ - u16 scrollOffset; /*0x116*/ + u8 heartSpriteIds[16]; /*0x001*/ + u16 movesToLearn[MAX_RELEARNER_MOVES]; /*0x01A*/ + u8 partyMon; /*0x044*/ + u8 moveSlot; /*0x045*/ + struct ListMenuItem menuItems[MAX_RELEARNER_MOVES]; /*0x0E8*/ + u8 numMenuChoices; /*0x110*/ + u8 numToShowAtOnce; /*0x111*/ + u8 moveListMenuTask; /*0x112*/ + u8 moveListScrollArrowTask; /*0x113*/ + u8 moveDisplayArrowTask; /*0x114*/ + u16 scrollOffset; /*0x116*/ } *sMoveRelearnerStruct = {0}; static EWRAM_DATA struct { -- cgit v1.2.3 From e4d26262e32ee626ad4389e6565677c35a8ba3d4 Mon Sep 17 00:00:00 2001 From: kiliwily <69381603+kiliwily@users.noreply.github.com> Date: Sat, 29 Aug 2020 01:04:42 +0200 Subject: Update move_relearner.c --- src/move_relearner.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/move_relearner.c') diff --git a/src/move_relearner.c b/src/move_relearner.c index 3741d5973..dc3e22b73 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -155,17 +155,17 @@ static EWRAM_DATA struct { u8 state; - u8 heartSpriteIds[16]; /*0x001*/ + u8 heartSpriteIds[16]; /*0x001*/ u16 movesToLearn[MAX_RELEARNER_MOVES]; /*0x01A*/ - u8 partyMon; /*0x044*/ - u8 moveSlot; /*0x045*/ + u8 partyMon; /*0x044*/ + u8 moveSlot; /*0x045*/ struct ListMenuItem menuItems[MAX_RELEARNER_MOVES]; /*0x0E8*/ - u8 numMenuChoices; /*0x110*/ - u8 numToShowAtOnce; /*0x111*/ - u8 moveListMenuTask; /*0x112*/ - u8 moveListScrollArrowTask; /*0x113*/ - u8 moveDisplayArrowTask; /*0x114*/ - u16 scrollOffset; /*0x116*/ + u8 numMenuChoices; /*0x110*/ + u8 numToShowAtOnce; /*0x111*/ + u8 moveListMenuTask; /*0x112*/ + u8 moveListScrollArrowTask; /*0x113*/ + u8 moveDisplayArrowTask; /*0x114*/ + u16 scrollOffset; /*0x116*/ } *sMoveRelearnerStruct = {0}; static EWRAM_DATA struct { -- cgit v1.2.3 From 028502fce5c2565c372c3b28760c44bc313cf59f Mon Sep 17 00:00:00 2001 From: kiliwily <69381603+kiliwily@users.noreply.github.com> Date: Sat, 29 Aug 2020 01:09:17 +0200 Subject: Update move_relearner.c --- src/move_relearner.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/move_relearner.c') diff --git a/src/move_relearner.c b/src/move_relearner.c index dc3e22b73..ac078269a 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -155,17 +155,17 @@ static EWRAM_DATA struct { u8 state; - u8 heartSpriteIds[16]; /*0x001*/ + u8 heartSpriteIds[16]; /*0x001*/ u16 movesToLearn[MAX_RELEARNER_MOVES]; /*0x01A*/ - u8 partyMon; /*0x044*/ - u8 moveSlot; /*0x045*/ + u8 partyMon; /*0x044*/ + u8 moveSlot; /*0x045*/ struct ListMenuItem menuItems[MAX_RELEARNER_MOVES]; /*0x0E8*/ - u8 numMenuChoices; /*0x110*/ - u8 numToShowAtOnce; /*0x111*/ - u8 moveListMenuTask; /*0x112*/ - u8 moveListScrollArrowTask; /*0x113*/ - u8 moveDisplayArrowTask; /*0x114*/ - u16 scrollOffset; /*0x116*/ + u8 numMenuChoices; /*0x110*/ + u8 numToShowAtOnce; /*0x111*/ + u8 moveListMenuTask; /*0x112*/ + u8 moveListScrollArrowTask; /*0x113*/ + u8 moveDisplayArrowTask; /*0x114*/ + u16 scrollOffset; /*0x116*/ } *sMoveRelearnerStruct = {0}; static EWRAM_DATA struct { -- cgit v1.2.3