ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 11:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename move tutor to move relearner

Browse Source
This commit is contained in:
Phlosioneer 2019-03-04 20:56:39 -05:00
parent 27aa27a2e9
commit cae63cf1c7
12 changed files with 273 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
asm/rom_81D1C44.s
View File

@ -1579,12 +1579,12 @@ _081D2800:
.pool .pool
thumb_func_end sub_81D2754 thumb_func_end sub_81D2754
thumb_func_start InitMoveTutorWindows thumb_func_start InitMoveRelearnerWindows
InitMoveTutorWindows: @ 81D2824 InitMoveRelearnerWindows: @ 81D2824
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r0, =gMoveTutorWindowTemplates ldr r0, =gMoveRelearnerWindowTemplates
bl InitWindows bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r0, 0 movs r0, 0
@ -1645,21 +1645,21 @@ _081D288E:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end InitMoveTutorWindows thumb_func_end InitMoveRelearnerWindows
thumb_func_start nullsub_79 thumb_func_start nullsub_79
nullsub_79: @ 81D28C4 nullsub_79: @ 81D28C4
bx lr bx lr
thumb_func_end nullsub_79 thumb_func_end nullsub_79
thumb_func_start LoadMoveTutorMovesList thumb_func_start LoadMoveRelearnerMovesList
LoadMoveTutorMovesList: @ 81D28C8 LoadMoveRelearnerMovesList: @ 81D28C8
push {r4-r7,lr} push {r4-r7,lr}
lsls r1, 16 lsls r1, 16
lsrs r4, r1, 16 lsrs r4, r1, 16
ldr r3, =gMultiuseListMenuTemplate ldr r3, =gMultiuseListMenuTemplate
adds r2, r3, 0 adds r2, r3, 0
ldr r1, =gMoveTutorMovesListTemplate ldr r1, =gMoveRelearnerMovesListTemplate
ldm r1!, {r5-r7} ldm r1!, {r5-r7}
stm r2!, {r5-r7} stm r2!, {r5-r7}
ldm r1!, {r5-r7} ldm r1!, {r5-r7}
@ -1679,10 +1679,10 @@ _081D28F4:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end LoadMoveTutorMovesList thumb_func_end LoadMoveRelearnerMovesList
thumb_func_start MoveTutorLoadBattleMoveDescription thumb_func_start MoveRelearnerLoadBattleMoveDescription
MoveTutorLoadBattleMoveDescription: @ 81D28FC MoveRelearnerLoadBattleMoveDescription: @ 81D28FC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@ -1884,16 +1884,16 @@ _081D2AB6:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end MoveTutorLoadBattleMoveDescription thumb_func_end MoveRelearnerLoadBattleMoveDescription
thumb_func_start MoveTutorMenuLoadContestMoveDescription thumb_func_start MoveRelearnerMenuLoadContestMoveDescription
MoveTutorMenuLoadContestMoveDescription: @ 81D2ACC MoveRelearnerMenuLoadContestMoveDescription: @ 81D2ACC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
sub sp, 0xC sub sp, 0xC
adds r4, r0, 0 adds r4, r0, 0
bl MoveTutorShowHideHearts bl MoveRelearnerShowHideHearts
movs r0, 0x1 movs r0, 0x1
movs r1, 0x11 movs r1, 0x11
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
@ -1997,10 +1997,10 @@ _081D2BB8:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end MoveTutorMenuLoadContestMoveDescription thumb_func_end MoveRelearnerMenuLoadContestMoveDescription
thumb_func_start MoveTutorCursorCallback thumb_func_start MoveRelearnerCursorCallback
MoveTutorCursorCallback: @ 81D2BD0 MoveRelearnerCursorCallback: @ 81D2BD0
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r1, 24 lsls r1, 24
@ -2011,16 +2011,16 @@ MoveTutorCursorCallback: @ 81D2BD0
bl PlaySE bl PlaySE
_081D2BE2: _081D2BE2:
adds r0, r4, 0 adds r0, r4, 0
bl MoveTutorLoadBattleMoveDescription bl MoveRelearnerLoadBattleMoveDescription
adds r0, r4, 0 adds r0, r4, 0
bl MoveTutorMenuLoadContestMoveDescription bl MoveRelearnerMenuLoadContestMoveDescription
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end MoveTutorCursorCallback thumb_func_end MoveRelearnerCursorCallback
thumb_func_start MoveTutorPrintText thumb_func_start MoveRelearnerPrintText
MoveTutorPrintText: @ 81D2BF4 MoveRelearnerPrintText: @ 81D2BF4
push {r4,lr} push {r4,lr}
sub sp, 0x10 sub sp, 0x10
adds r4, r0, 0 adds r4, r0, 0
@ -2052,10 +2052,10 @@ MoveTutorPrintText: @ 81D2BF4
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end MoveTutorPrintText thumb_func_end MoveRelearnerPrintText
thumb_func_start MoveTutorRunTextPrinters thumb_func_start MoveRelearnerRunTextPrinters
MoveTutorRunTextPrinters: @ 81D2C3C MoveRelearnerRunTextPrinters: @ 81D2C3C
push {lr} push {lr}
bl RunTextPrinters bl RunTextPrinters
movs r0, 0x3 movs r0, 0x3
@ -2064,12 +2064,12 @@ MoveTutorRunTextPrinters: @ 81D2C3C
lsrs r0, 16 lsrs r0, 16
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end MoveTutorRunTextPrinters thumb_func_end MoveRelearnerRunTextPrinters
thumb_func_start MoveTutorCreateYesNoMenu thumb_func_start MoveRelearnerCreateYesNoMenu
MoveTutorCreateYesNoMenu: @ 81D2C50 MoveRelearnerCreateYesNoMenu: @ 81D2C50
push {lr} push {lr}
ldr r0, =gMoveTutorYesNoMenuTemplate ldr r0, =gMoveRelearnerYesNoMenuTemplate
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE movs r2, 0xE
movs r3, 0 movs r3, 0
@ -2077,7 +2077,7 @@ MoveTutorCreateYesNoMenu: @ 81D2C50
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end MoveTutorCreateYesNoMenu thumb_func_end MoveRelearnerCreateYesNoMenu
thumb_func_start sub_81D2C68 thumb_func_start sub_81D2C68
sub_81D2C68: @ 81D2C68 sub_81D2C68: @ 81D2C68

2
data/maps/FallarborTown_House2/scripts.inc
View File

@ -37,7 +37,7 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6
FallarborTown_House2_EventScript_20140C:: @ 820140C FallarborTown_House2_EventScript_20140C:: @ 820140C
msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT
special TeachMoveTutorMove special TeachMoveRelearnerMove
waitstate waitstate
compare VAR_0x8004, 0 compare VAR_0x8004, 0
goto_if_eq FallarborTown_House2_EventScript_2013D6 goto_if_eq FallarborTown_House2_EventScript_2013D6

8
data/rom_81D1C44.s
View File

@ -23,7 +23,7 @@ gUnknown_08625404:: @ 8625404
gUnknown_08625410:: @ 8625410 gUnknown_08625410:: @ 8625410
.byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23
gMoveTutorWindowTemplates:: @ 8625510s gMoveRelearnerWindowTemplates:: @ 8625510s
window_template 1, 1, 1, 16, 12, 0xF, 0x000A window_template 1, 1, 1, 16, 12, 0xF, 0x000A
window_template 1, 1, 1, 16, 12, 0xF, 0x00CA window_template 1, 1, 1, 16, 12, 0xF, 0x00CA
window_template 1, 19, 1, 10, 12, 0xF, 0x018A window_template 1, 19, 1, 10, 12, 0xF, 0x018A
@ -31,12 +31,12 @@ gMoveTutorWindowTemplates:: @ 8625510s
window_template 0, 22, 8, 5, 4, 0xF, 0x025A window_template 0, 22, 8, 5, 4, 0xF, 0x025A
null_window_template null_window_template
gMoveTutorYesNoMenuTemplate:: @ 8625540 gMoveRelearnerYesNoMenuTemplate:: @ 8625540
window_template 0, 22, 8, 5, 4, 0xF, 0x025A window_template 0, 22, 8, 5, 4, 0xF, 0x025A
gMoveTutorMovesListTemplate:: @ 8625548 struct ListMenuTemplate gMoveRelearnerMovesListTemplate:: @ 8625548 struct ListMenuTemplate
.4byte NULL .4byte NULL
.4byte MoveTutorCursorCallback .4byte MoveRelearnerCursorCallback
.4byte NULL .4byte NULL
.2byte 0 .2byte 0
.2byte 0 .2byte 0

2
data/specials.inc
View File

@ -235,7 +235,7 @@ gSpecials:: @ 81DBA64
def_special sub_81B9770 def_special sub_81B9770
def_special sub_81B9718 def_special sub_81B9718
def_special sub_81B96D0 def_special sub_81B96D0
def_special TeachMoveTutorMove def_special TeachMoveRelearnerMove
def_special GetRecordedCyclingRoadResults def_special GetRecordedCyclingRoadResults
def_special Special_BeginCyclingRoadChallenge def_special Special_BeginCyclingRoadChallenge
def_special GetPlayerAvatarBike def_special GetPlayerAvatarBike

7
include/move_relearner.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef GUARD_MOVE_RELEARNER_H
#define GUARD_MOVE_RELEARNER_H
void TeachMoveRelearnerMove(void);
void MoveRelearnerShowHideHearts(s32);
#endif //GUARD_MOVE_RELEARNER_H

7
include/move_tutor.h
View File

@ -1,7 +0,0 @@
#ifndef GUARD_LEARN_MOVE_H
#define GUARD_LEARN_MOVE_H
void TeachMoveTutorMove(void);
void MoveTutorShowHideHearts(s32);
#endif //GUARD_LEARN_MOVE_H

10
include/pokenav.h
View File

@ -20,11 +20,11 @@ void sub_81D1EC0(void);
void sub_81D1D04(u8); void sub_81D1D04(u8);
bool8 sub_81D1C44(u8); bool8 sub_81D1C44(u8);
bool8 sub_81D4A58(struct EventObject*); bool8 sub_81D4A58(struct EventObject*);
void MoveTutorPrintText(u8 *); void MoveRelearnerPrintText(u8 *);
u16 MoveTutorRunTextPrinters(void); u16 MoveRelearnerRunTextPrinters(void);
void MoveTutorCreateYesNoMenu(void); void MoveRelearnerCreateYesNoMenu(void);
u8 LoadMoveTutorMovesList(const struct ListMenuItem *items, u16 numChoices); u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices);
void InitMoveTutorWindows(bool8 useContextWindow); void InitMoveRelearnerWindows(bool8 useContextWindow);
bool8 EventObjectIsFarawayIslandMew(struct EventObject *); bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
u32 sub_81D427C(void); u32 sub_81D427C(void);
void sub_81D4998(void); void sub_81D4998(void);

16
include/strings.h
View File

@ -859,15 +859,15 @@ extern const u8 gText_Winona[];
extern const u8 gText_Phoebe[]; extern const u8 gText_Phoebe[];
extern const u8 gText_Glacia[]; extern const u8 gText_Glacia[];
extern const u8 gText_MoveTutorPkmnLearnedMove[]; extern const u8 gText_MoveRelearnerPkmnLearnedMove[];
extern const u8 gText_MoveTutorPkmnTryingToLearnMove[]; extern const u8 gText_MoveRelearnerPkmnTryingToLearnMove[];
extern const u8 gText_MoveTutorWhichMoveToForget[]; extern const u8 gText_MoveRelearnerWhichMoveToForget[];
extern const u8 gText_MoveTutorStopTryingToTeachMove[]; extern const u8 gText_MoveRelearnerStopTryingToTeachMove[];
extern const u8 gText_MoveTutorAndPoof[]; extern const u8 gText_MoveRelearnerAndPoof[];
extern const u8 gText_MoveTutorPkmnForgotMoveAndLearnedNew[]; extern const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[];
extern const u8 gText_TeachWhichMoveToPkmn[]; extern const u8 gText_TeachWhichMoveToPkmn[];
extern const u8 gText_MoveTutorGiveUp[]; extern const u8 gText_MoveRelearnerGiveUp[];
extern const u8 gText_MoveTutorTeachMoveConfirm[]; extern const u8 gText_MoveRelearnerTeachMoveConfirm[];
extern const u8 gText_Kira[]; extern const u8 gText_Kira[];
extern const u8 gText_Amy[]; extern const u8 gText_Amy[];

4
ld_script.txt
View File

@ -226,7 +226,7 @@ SECTIONS {
src/battle_controller_safari.o(.text); src/battle_controller_safari.o(.text);
src/fldeff_sweetscent.o(.text); src/fldeff_sweetscent.o(.text);
src/battle_anim_effects_3.o(.text); src/battle_anim_effects_3.o(.text);
src/move_tutor.o(.text); src/move_relearner.o(.text);
src/fldeff_softboiled.o(.text); src/fldeff_softboiled.o(.text);
src/decoration_inventory.o(.text); src/decoration_inventory.o(.text);
src/roamer.o(.text); src/roamer.o(.text);
@ -535,7 +535,7 @@ SECTIONS {
src/contest_ai.o(.rodata); src/contest_ai.o(.rodata);
src/battle_controller_safari.o(.rodata); src/battle_controller_safari.o(.rodata);
src/battle_anim_effects_3.o(.rodata); src/battle_anim_effects_3.o(.rodata);
src/move_tutor.o(.rodata); src/move_relearner.o(.rodata);
src/roamer.o(.rodata); src/roamer.o(.rodata);
src/battle_tower.o(.rodata); src/battle_tower.o(.rodata);
src/use_pokeblock.o(.rodata); src/use_pokeblock.o(.rodata);

412
src/move_tutor.c → src/move_relearner.c
View File

@ -7,7 +7,7 @@
#include "event_data.h" #include "event_data.h"
#include "field_screen_effect.h" #include "field_screen_effect.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "move_tutor.h" #include "move_relearner.h"
#include "list_menu.h" #include "list_menu.h"
#include "alloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
@ -26,42 +26,42 @@
#include "constants/songs.h" #include "constants/songs.h"
/* /*
* Move tutor state machine * Move relearner state machine
* ------------------------ * ------------------------
* *
* Entry point: TeachMoveTutorMove * Entry point: TeachMoveRelearnerMove
* *
* TeachMoveTutorMove * TeachMoveRelearnerMove
* Task_WaitForFadeOut * Task_WaitForFadeOut
* CB2_InitLearnMove * CB2_InitLearnMove
* - Creates moveDisplayArrowTask to listen to right/left buttons. * - Creates moveDisplayArrowTask to listen to right/left buttons.
* - Creates moveListScrollArrowTask to listen to up/down buttons. * - Creates moveListScrollArrowTask to listen to up/down buttons.
* - Whenever the selected move changes (and once on init), the MoveTutorCursorCallback * - Whenever the selected move changes (and once on init), the MoveRelearnerCursorCallback
* is called (see gMoveTutorMovesListTemplate). That callback will reload the contest * is called (see gMoveRelearnerMovesListTemplate). That callback will reload the contest
* display and battle display windows for the new move. Both are always loaded in * display and battle display windows for the new move. Both are always loaded in
* memory, but only the currently active one is copied to VRAM. The exception to this * memory, but only the currently active one is copied to VRAM. The exception to this
* is the appeal and jam hearts, which are sprites. MoveTutorShowHideHearts is called * is the appeal and jam hearts, which are sprites. MoveRelearnerShowHideHearts is called
* while reloading the contest display to control them. * while reloading the contest display to control them.
* DoMoveTutorMain: MENU_STATE_FADE_TO_BLACK * DoMoveRelearnerMain: MENU_STATE_FADE_TO_BLACK
* DoMoveTutorMain: MENU_STATE_WAIT_FOR_FADE * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_FADE
* - Go to MENU_STATE_IDLE_BATTLE_MODE * - Go to MENU_STATE_IDLE_BATTLE_MODE
* *
* DoMoveTutorMain: MENU_STATE_SETUP_BATTLE_MODE * DoMoveRelearnerMain: MENU_STATE_SETUP_BATTLE_MODE
* DoMoveTutorMain: MENU_STATE_IDLE_BATTLE_MODE * DoMoveRelearnerMain: MENU_STATE_IDLE_BATTLE_MODE
* - If the player selected a move (pressed A), go to MENU_STATE_PRINT_TEACH_MOVE_PROMPT. * - If the player selected a move (pressed A), go to MENU_STATE_PRINT_TEACH_MOVE_PROMPT.
* - If the player cancelled (pressed B), go to MENU_STATE_PRINT_GIVE_UP_PROMPT. * - If the player cancelled (pressed B), go to MENU_STATE_PRINT_GIVE_UP_PROMPT.
* - If the player pressed left or right, swap the move display window to contest mode, * - If the player pressed left or right, swap the move display window to contest mode,
* and go to MENU_STATE_SETUP_CONTEST_MODE. * and go to MENU_STATE_SETUP_CONTEST_MODE.
* *
* DoMoveTutorMain: MENU_STATE_SETUP_CONTEST_MODE * DoMoveRelearnerMain: MENU_STATE_SETUP_CONTEST_MODE
* DoMoveTutorMain: MENU_STATE_IDLE_CONTEST_MODE * DoMoveRelearnerMain: MENU_STATE_IDLE_CONTEST_MODE
* - If the player selected a move, go to MENU_STATE_PRINT_TEACH_MOVE_PROMPT. * - If the player selected a move, go to MENU_STATE_PRINT_TEACH_MOVE_PROMPT.
* - If the player cancelled, go to MENU_STATE_PRINT_GIVE_UP_PROMPT * - If the player cancelled, go to MENU_STATE_PRINT_GIVE_UP_PROMPT
* - If the player pressed left or right, swap the move display window to battle mode, * - If the player pressed left or right, swap the move display window to battle mode,
* and go to MENU_STATE_SETUP_BATTLE_MODE. * and go to MENU_STATE_SETUP_BATTLE_MODE.
* *
* DoMoveTutorMain: MENU_STATE_PRINT_TEACH_MOVE_PROMPT * DoMoveRelearnerMain: MENU_STATE_PRINT_TEACH_MOVE_PROMPT
* DoMoveTutorMain: MENU_STATE_TEACH_MOVE_CONFIRM * DoMoveRelearnerMain: MENU_STATE_TEACH_MOVE_CONFIRM
* - Wait for the player to confirm. * - Wait for the player to confirm.
* - If cancelled, go to either MENU_STATE_SETUP_BATTLE_MODE or MENU_STATE_SETUP_CONTEST_MODE. * - If cancelled, go to either MENU_STATE_SETUP_BATTLE_MODE or MENU_STATE_SETUP_CONTEST_MODE.
* - If confirmed and the pokemon had an empty move slot, set VAR_0x8004 to TRUE and go to * - If confirmed and the pokemon had an empty move slot, set VAR_0x8004 to TRUE and go to
@ -69,41 +69,41 @@
* - If confirmed and the pokemon doesn't have an empty move slot, go to * - If confirmed and the pokemon doesn't have an empty move slot, go to
* MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT. * MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT.
* *
* DoMoveTutorMain: MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT * DoMoveRelearnerMain: MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT
* DoMoveTutorMain: MENU_STATE_WAIT_FOR_TRYING_TO_LEARN * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_TRYING_TO_LEARN
* DoMoveTutorMain: MENU_STATE_CONFIRM_DELETE_OLD_MOVE * DoMoveRelearnerMain: MENU_STATE_CONFIRM_DELETE_OLD_MOVE
* - If the player confirms, go to MENU_STATE_PRINT_WHICH_MOVE_PROMPT. * - If the player confirms, go to MENU_STATE_PRINT_WHICH_MOVE_PROMPT.
* - If the player cancels, go to MENU_STATE_PRINT_STOP_TEACHING * - If the player cancels, go to MENU_STATE_PRINT_STOP_TEACHING
* *
* DoMoveTutorMain: MENU_STATE_PRINT_STOP_TEACHING * DoMoveRelearnerMain: MENU_STATE_PRINT_STOP_TEACHING
* DoMoveTutorMain: MENU_STATE_WAIT_FOR_STOP_TEACHING * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_STOP_TEACHING
* DoMoveTutorMain: MENU_STATE_CONFIRM_STOP_TEACHING * DoMoveRelearnerMain: MENU_STATE_CONFIRM_STOP_TEACHING
* - If the player confirms, go to MENU_STATE_CHOOSE_SETUP_STATE. * - If the player confirms, go to MENU_STATE_CHOOSE_SETUP_STATE.
* - If the player cancels, go back to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT. * - If the player cancels, go back to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT.
* *
* DoMoveTutorMain: MENU_STATE_PRINT_WHICH_MOVE_PROMPT * DoMoveRelearnerMain: MENU_STATE_PRINT_WHICH_MOVE_PROMPT
* DoMoveTutorMain: MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN * DoMoveRelearnerMain: MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN
* - Go to ShowSelectMovePokemonSummaryScreen. When done, control returns to * - Go to ShowSelectMovePokemonSummaryScreen. When done, control returns to
* CB2_InitLearnMoveReturnFromSelectMove. * CB2_InitLearnMoveReturnFromSelectMove.
* *
* DoMoveTutorMain: MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE * DoMoveRelearnerMain: MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE
* DoMoveTutorMain: MENU_STATE_PRINT_TEXT_THEN_FANFARE * DoMoveRelearnerMain: MENU_STATE_PRINT_TEXT_THEN_FANFARE
* DoMoveTutorMain: MENU_STATE_WAIT_FOR_FANFARE * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_FANFARE
* DoMoveTutorMain: MENU_STATE_WAIT_FOR_A_BUTTON * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_A_BUTTON
* DoMoveTutorMain: MENU_STATE_FADE_AND_RETURN * DoMoveRelearnerMain: MENU_STATE_FADE_AND_RETURN
* DoMoveTutorMain: MENU_STATE_RETURN_TO_FIELD * DoMoveRelearnerMain: MENU_STATE_RETURN_TO_FIELD
* - Clean up and go to CB2_ReturnToField. * - Clean up and go to CB2_ReturnToField.
* *
* DoMoveTutorMain: MENU_STATE_PRINT_GIVE_UP_PROMPT * DoMoveRelearnerMain: MENU_STATE_PRINT_GIVE_UP_PROMPT
* DoMoveTutorMain: MENU_STATE_GIVE_UP_CONFIRM * DoMoveRelearnerMain: MENU_STATE_GIVE_UP_CONFIRM
* - If the player confirms, go to MENU_STATE_FADE_AND_RETURN, and set VAR_0x8004 to FALSE. * - If the player confirms, go to MENU_STATE_FADE_AND_RETURN, and set VAR_0x8004 to FALSE.
* - If the player cancels, go to either MENU_STATE_SETUP_BATTLE_MODE or * - If the player cancels, go to either MENU_STATE_SETUP_BATTLE_MODE or
* MENU_STATE_SETUP_CONTEST_MODE. * MENU_STATE_SETUP_CONTEST_MODE.
* *
* CB2_InitLearnMoveReturnFromSelectMove: * CB2_InitLearnMoveReturnFromSelectMove:
* - Do most of the same stuff as CB2_InitLearnMove. * - Do most of the same stuff as CB2_InitLearnMove.
* DoMoveTutorMain: MENU_STATE_FADE_FROM_SUMMARY_SCREEN * DoMoveRelearnerMain: MENU_STATE_FADE_FROM_SUMMARY_SCREEN
* DoMoveTutorMain: MENU_STATE_TRY_OVERWRITE_MOVE * DoMoveRelearnerMain: MENU_STATE_TRY_OVERWRITE_MOVE
* - If any of the pokemon's existing moves were chosen, overwrite the move and * - If any of the pokemon's existing moves were chosen, overwrite the move and
* go to MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE and set VAR_0x8004 to TRUE. * go to MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE and set VAR_0x8004 to TRUE.
* - If the chosen move is the one the player selected before the summary screen, * - If the chosen move is the one the player selected before the summary screen,
@ -166,19 +166,19 @@ static EWRAM_DATA struct
u8 moveListScrollArrowTask; /*0x113*/ u8 moveListScrollArrowTask; /*0x113*/
u8 moveDisplayArrowTask; /*0x114*/ u8 moveDisplayArrowTask; /*0x114*/
u16 scrollOffset; /*0x116*/ u16 scrollOffset; /*0x116*/
} *sMoveTutorStruct = {0}; } *sMoveRelearnerStruct = {0};
static EWRAM_DATA struct { static EWRAM_DATA struct {
u16 listOffset; u16 listOffset;
u16 listRow; u16 listRow;
bool8 showContestInfo; bool8 showContestInfo;
} sMoveTutorMenuSate = {0}; } sMoveRelearnerMenuSate = {0};
static const u16 sMoveTutorPaletteData[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal"); static const u16 sMoveRelearnerPaletteData[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal");
// The arrow sprites in this spritesheet aren't used. The scroll-arrow system provides its own // The arrow sprites in this spritesheet aren't used. The scroll-arrow system provides its own
// arrow sprites. // arrow sprites.
static const u8 sMoveTutorSpriteSheetData[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp"); static const u8 sMoveRelearnerSpriteSheetData[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp");
static const struct OamData sHeartSpriteOamData = static const struct OamData sHeartSpriteOamData =
{ {
@ -231,16 +231,16 @@ static const struct OamData sUnusedOam2 =
.affineParam = 0, .affineParam = 0,
}; };
static const struct SpriteSheet sMoveTutorSpriteSheet = static const struct SpriteSheet sMoveRelearnerSpriteSheet =
{ {
.data = sMoveTutorSpriteSheetData, .data = sMoveRelearnerSpriteSheetData,
.size = 0x180, .size = 0x180,
.tag = 5525 .tag = 5525
}; };
static const struct SpritePalette sMoveTutorPalette = static const struct SpritePalette sMoveRelearnerPalette =
{ {
.data = sMoveTutorPaletteData, .data = sMoveRelearnerPaletteData,
.tag = 5526 .tag = 5526
}; };
@ -317,7 +317,7 @@ static const struct SpriteTemplate sConstestMoveHeartSprite =
.callback = SpriteCallbackDummy .callback = SpriteCallbackDummy
}; };
static const struct BgTemplate sMoveTutorMenuBackgroundTemplates[] = static const struct BgTemplate sMoveRelearnerMenuBackgroundTemplates[] =
{ {
{ {
.bg = 0, .bg = 0,
@ -339,23 +339,23 @@ static const struct BgTemplate sMoveTutorMenuBackgroundTemplates[] =
}, },
}; };
static void DoMoveTutorMain(void); static void DoMoveRelearnerMain(void);
static void CreateLearnableMovesList(void); static void CreateLearnableMovesList(void);
static void CreateUISprites(void); static void CreateUISprites(void);
static void CB2_MoveTutorMain(void); static void CB2_MoveRelearnerMain(void);
static void Task_WaitForFadeOut(u8 taskId); static void Task_WaitForFadeOut(u8 taskId);
static void CB2_InitLearnMove(void); static void CB2_InitLearnMove(void);
static void CB2_InitLearnMoveReturnFromSelectMove(void); static void CB2_InitLearnMoveReturnFromSelectMove(void);
static void InitMoveTutorBackgroundLayers(void); static void InitMoveRelearnerBackgroundLayers(void);
static void AddScrollArrows(void); static void AddScrollArrows(void);
static void HandleInput(u8); static void HandleInput(u8);
static void ShowTeachMoveText(u8); static void ShowTeachMoveText(u8);
static s32 GetCurrentSelectedMove(void); static s32 GetCurrentSelectedMove(void);
static void FreeMoveTutorResources(void); static void FreeMoveRelearnerResources(void);
static void RemoveScrollArrows(void); static void RemoveScrollArrows(void);
static void HideHeartSpritesAndShowTeachMoveText(bool8); static void HideHeartSpritesAndShowTeachMoveText(bool8);
static void VBlankCB_MoveTutor(void) static void VBlankCB_MoveRelearner(void)
{ {
LoadOam(); LoadOam();
ProcessSpriteCopyRequests(); ProcessSpriteCopyRequests();
@ -363,7 +363,7 @@ static void VBlankCB_MoveTutor(void)
} }
// Script arguments: The pokemon to teach is in VAR_0x8004 // Script arguments: The pokemon to teach is in VAR_0x8004
void TeachMoveTutorMove(void) void TeachMoveRelearnerMove(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
CreateTask(Task_WaitForFadeOut, 10); CreateTask(Task_WaitForFadeOut, 10);
@ -387,26 +387,26 @@ static void CB2_InitLearnMove(void)
FreeAllSpritePalettes(); FreeAllSpritePalettes();
ResetTasks(); ResetTasks();
clear_scheduled_bg_copies_to_vram(); clear_scheduled_bg_copies_to_vram();
sMoveTutorStruct = AllocZeroed(sizeof(*sMoveTutorStruct)); sMoveRelearnerStruct = AllocZeroed(sizeof(*sMoveRelearnerStruct));
sMoveTutorStruct->partyMon = gSpecialVar_0x8004; sMoveRelearnerStruct->partyMon = gSpecialVar_0x8004;
SetVBlankCallback(VBlankCB_MoveTutor); SetVBlankCallback(VBlankCB_MoveRelearner);
InitMoveTutorBackgroundLayers(); InitMoveRelearnerBackgroundLayers();
InitMoveTutorWindows(FALSE); InitMoveRelearnerWindows(FALSE);
sMoveTutorMenuSate.listOffset = 0; sMoveRelearnerMenuSate.listOffset = 0;
sMoveTutorMenuSate.listRow = 0; sMoveRelearnerMenuSate.listRow = 0;
sMoveTutorMenuSate.showContestInfo = FALSE; sMoveRelearnerMenuSate.showContestInfo = FALSE;
CreateLearnableMovesList(); CreateLearnableMovesList();
LoadSpriteSheet(&sMoveTutorSpriteSheet); LoadSpriteSheet(&sMoveRelearnerSpriteSheet);
LoadSpritePalette(&sMoveTutorPalette); LoadSpritePalette(&sMoveRelearnerPalette);
CreateUISprites(); CreateUISprites();
sMoveTutorStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveTutorMenuSate.listOffset, sMoveTutorMenuSate.listRow); sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow);
FillPalette(RGB_BLACK, 0, 2); FillPalette(RGB_BLACK, 0, 2);
SetMainCallback2(CB2_MoveTutorMain); SetMainCallback2(CB2_MoveRelearnerMain);
} }
static void CB2_InitLearnMoveReturnFromSelectMove(void) static void CB2_InitLearnMoveReturnFromSelectMove(void)
@ -415,30 +415,30 @@ static void CB2_InitLearnMoveReturnFromSelectMove(void)
FreeAllSpritePalettes(); FreeAllSpritePalettes();
ResetTasks(); ResetTasks();
clear_scheduled_bg_copies_to_vram(); clear_scheduled_bg_copies_to_vram();
sMoveTutorStruct = AllocZeroed(sizeof(*sMoveTutorStruct)); sMoveRelearnerStruct = AllocZeroed(sizeof(*sMoveRelearnerStruct));
sMoveTutorStruct->state = MENU_STATE_FADE_FROM_SUMMARY_SCREEN; sMoveRelearnerStruct->state = MENU_STATE_FADE_FROM_SUMMARY_SCREEN;
sMoveTutorStruct->partyMon = gSpecialVar_0x8004; sMoveRelearnerStruct->partyMon = gSpecialVar_0x8004;
sMoveTutorStruct->moveSlot = gSpecialVar_0x8005; sMoveRelearnerStruct->moveSlot = gSpecialVar_0x8005;
SetVBlankCallback(VBlankCB_MoveTutor); SetVBlankCallback(VBlankCB_MoveRelearner);
InitMoveTutorBackgroundLayers(); InitMoveRelearnerBackgroundLayers();
InitMoveTutorWindows(sMoveTutorMenuSate.showContestInfo); InitMoveRelearnerWindows(sMoveRelearnerMenuSate.showContestInfo);
CreateLearnableMovesList(); CreateLearnableMovesList();
LoadSpriteSheet(&sMoveTutorSpriteSheet); LoadSpriteSheet(&sMoveRelearnerSpriteSheet);
LoadSpritePalette(&sMoveTutorPalette); LoadSpritePalette(&sMoveRelearnerPalette);
CreateUISprites(); CreateUISprites();
sMoveTutorStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveTutorMenuSate.listOffset, sMoveTutorMenuSate.listRow); sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow);
FillPalette(RGB_BLACK, 0, 2); FillPalette(RGB_BLACK, 0, 2);
SetMainCallback2(CB2_MoveTutorMain); SetMainCallback2(CB2_MoveRelearnerMain);
} }
static void InitMoveTutorBackgroundLayers(void) static void InitMoveRelearnerBackgroundLayers(void)
{ {
ResetVramOamAndBgCntRegs(); ResetVramOamAndBgCntRegs();
ResetBgsAndClearDma3BusyFlags(0); ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, sMoveTutorMenuBackgroundTemplates, ARRAY_COUNT(sMoveTutorMenuBackgroundTemplates)); InitBgsFromTemplates(0, sMoveRelearnerMenuBackgroundTemplates, ARRAY_COUNT(sMoveRelearnerMenuBackgroundTemplates));
ResetAllBgsCoordinates(); ResetAllBgsCoordinates();
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 |
DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_1D_MAP |
@ -448,9 +448,9 @@ static void InitMoveTutorBackgroundLayers(void)
SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDCNT, 0);
} }
static void CB2_MoveTutorMain(void) static void CB2_MoveRelearnerMain(void)
{ {
DoMoveTutorMain(); DoMoveRelearnerMain();
RunTasks(); RunTasks();
AnimateSprites(); AnimateSprites();
BuildOamBuffer(); BuildOamBuffer();
@ -461,32 +461,32 @@ static void CB2_MoveTutorMain(void)
static void FormatAndPrintText(const u8 *src) static void FormatAndPrintText(const u8 *src)
{ {
StringExpandPlaceholders(gStringVar4, src); StringExpandPlaceholders(gStringVar4, src);
MoveTutorPrintText(gStringVar4); MoveRelearnerPrintText(gStringVar4);
} }
// See the state machine doc at the top of the file. // See the state machine doc at the top of the file.
static void DoMoveTutorMain(void) static void DoMoveRelearnerMain(void)
{ {
switch (sMoveTutorStruct->state) switch (sMoveRelearnerStruct->state)
{ {
case MENU_STATE_FADE_TO_BLACK: case MENU_STATE_FADE_TO_BLACK:
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
HideHeartSpritesAndShowTeachMoveText(FALSE); HideHeartSpritesAndShowTeachMoveText(FALSE);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
break; break;
case MENU_STATE_WAIT_FOR_FADE: case MENU_STATE_WAIT_FOR_FADE:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
sMoveTutorStruct->state = MENU_STATE_IDLE_BATTLE_MODE; sMoveRelearnerStruct->state = MENU_STATE_IDLE_BATTLE_MODE;
} }
break; break;
case MENU_STATE_UNREACHABLE: case MENU_STATE_UNREACHABLE:
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
break; break;
case MENU_STATE_SETUP_BATTLE_MODE: case MENU_STATE_SETUP_BATTLE_MODE:
HideHeartSpritesAndShowTeachMoveText(FALSE); HideHeartSpritesAndShowTeachMoveText(FALSE);
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
AddScrollArrows(); AddScrollArrows();
break; break;
case MENU_STATE_IDLE_BATTLE_MODE: case MENU_STATE_IDLE_BATTLE_MODE:
@ -494,17 +494,17 @@ static void DoMoveTutorMain(void)
break; break;
case MENU_STATE_SETUP_CONTEST_MODE: case MENU_STATE_SETUP_CONTEST_MODE:
ShowTeachMoveText(FALSE); ShowTeachMoveText(FALSE);
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
AddScrollArrows(); AddScrollArrows();
break; break;
case MENU_STATE_IDLE_CONTEST_MODE: case MENU_STATE_IDLE_CONTEST_MODE:
HandleInput(TRUE); HandleInput(TRUE);
break; break;
case MENU_STATE_PRINT_TEACH_MOVE_PROMPT: case MENU_STATE_PRINT_TEACH_MOVE_PROMPT:
if (!MoveTutorRunTextPrinters()) if (!MoveRelearnerRunTextPrinters())
{ {
MoveTutorCreateYesNoMenu(); MoveRelearnerCreateYesNoMenu();
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
} }
break; break;
case MENU_STATE_TEACH_MOVE_CONFIRM: case MENU_STATE_TEACH_MOVE_CONFIRM:
@ -513,35 +513,35 @@ static void DoMoveTutorMain(void)
if (selection == 0) if (selection == 0)
{ {
if (GiveMoveToMon(&gPlayerParty[sMoveTutorStruct->partyMon], GetCurrentSelectedMove()) != 0xFFFF) if (GiveMoveToMon(&gPlayerParty[sMoveRelearnerStruct->partyMon], GetCurrentSelectedMove()) != 0xFFFF)
{ {
FormatAndPrintText(gText_MoveTutorPkmnLearnedMove); FormatAndPrintText(gText_MoveRelearnerPkmnLearnedMove);
gSpecialVar_0x8004 = TRUE; gSpecialVar_0x8004 = TRUE;
sMoveTutorStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE;
} }
else else
{ {
sMoveTutorStruct->state = MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT; sMoveRelearnerStruct->state = MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT;
} }
} }
else if (selection == MENU_B_PRESSED || selection == 1) else if (selection == MENU_B_PRESSED || selection == 1)
{ {
if (sMoveTutorMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
{ {
sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
} }
else if (sMoveTutorMenuSate.showContestInfo == TRUE) else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)
{ {
sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
} }
} }
} }
break; break;
case MENU_STATE_PRINT_GIVE_UP_PROMPT: case MENU_STATE_PRINT_GIVE_UP_PROMPT:
if (!MoveTutorRunTextPrinters()) if (!MoveRelearnerRunTextPrinters())
{ {
MoveTutorCreateYesNoMenu(); MoveRelearnerCreateYesNoMenu();
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
} }
break; break;
case MENU_STATE_GIVE_UP_CONFIRM: case MENU_STATE_GIVE_UP_CONFIRM:
@ -551,30 +551,30 @@ static void DoMoveTutorMain(void)
if (selection == 0) if (selection == 0)
{ {
gSpecialVar_0x8004 = FALSE; gSpecialVar_0x8004 = FALSE;
sMoveTutorStruct->state = MENU_STATE_FADE_AND_RETURN; sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN;
} }
else if (selection == -1 || selection == 1) else if (selection == -1 || selection == 1)
{ {
if (sMoveTutorMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
{ {
sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
} }
else if (sMoveTutorMenuSate.showContestInfo == TRUE) else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)
{ {
sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
} }
} }
} }
break; break;
case MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT: case MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT:
FormatAndPrintText(gText_MoveTutorPkmnTryingToLearnMove); FormatAndPrintText(gText_MoveRelearnerPkmnTryingToLearnMove);
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
break; break;
case MENU_STATE_WAIT_FOR_TRYING_TO_LEARN: case MENU_STATE_WAIT_FOR_TRYING_TO_LEARN:
if (!MoveTutorRunTextPrinters()) if (!MoveRelearnerRunTextPrinters())
{ {
MoveTutorCreateYesNoMenu(); MoveRelearnerCreateYesNoMenu();
sMoveTutorStruct->state = MENU_STATE_CONFIRM_DELETE_OLD_MOVE; sMoveRelearnerStruct->state = MENU_STATE_CONFIRM_DELETE_OLD_MOVE;
} }
break; break;
case MENU_STATE_CONFIRM_DELETE_OLD_MOVE: case MENU_STATE_CONFIRM_DELETE_OLD_MOVE:
@ -583,25 +583,25 @@ static void DoMoveTutorMain(void)
if (var == 0) if (var == 0)
{ {
FormatAndPrintText(gText_MoveTutorWhichMoveToForget); FormatAndPrintText(gText_MoveRelearnerWhichMoveToForget);
sMoveTutorStruct->state = MENU_STATE_PRINT_WHICH_MOVE_PROMPT; sMoveRelearnerStruct->state = MENU_STATE_PRINT_WHICH_MOVE_PROMPT;
} }
else if (var == -1 || var == 1) else if (var == -1 || var == 1)
{ {
sMoveTutorStruct->state = MENU_STATE_PRINT_STOP_TEACHING; sMoveRelearnerStruct->state = MENU_STATE_PRINT_STOP_TEACHING;
} }
} }
break; break;
case MENU_STATE_PRINT_STOP_TEACHING: case MENU_STATE_PRINT_STOP_TEACHING:
StringCopy(gStringVar2, gMoveNames[GetCurrentSelectedMove()]); StringCopy(gStringVar2, gMoveNames[GetCurrentSelectedMove()]);
FormatAndPrintText(gText_MoveTutorStopTryingToTeachMove); FormatAndPrintText(gText_MoveRelearnerStopTryingToTeachMove);
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
break; break;
case MENU_STATE_WAIT_FOR_STOP_TEACHING: case MENU_STATE_WAIT_FOR_STOP_TEACHING:
if (!MoveTutorRunTextPrinters()) if (!MoveRelearnerRunTextPrinters())
{ {
MoveTutorCreateYesNoMenu(); MoveRelearnerCreateYesNoMenu();
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
} }
break; break;
case MENU_STATE_CONFIRM_STOP_TEACHING: case MENU_STATE_CONFIRM_STOP_TEACHING:
@ -610,55 +610,55 @@ static void DoMoveTutorMain(void)
if (var == 0) if (var == 0)
{ {
sMoveTutorStruct->state = MENU_STATE_CHOOSE_SETUP_STATE; sMoveRelearnerStruct->state = MENU_STATE_CHOOSE_SETUP_STATE;
} }
else if (var == MENU_B_PRESSED || var == 1) else if (var == MENU_B_PRESSED || var == 1)
{ {
// What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway. // What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway.
if (sMoveTutorMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
{ {
sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
} }
else if (sMoveTutorMenuSate.showContestInfo == TRUE) else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)
{ {
sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
} }
sMoveTutorStruct->state = MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT; sMoveRelearnerStruct->state = MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT;
} }
} }
break; break;
case MENU_STATE_CHOOSE_SETUP_STATE: case MENU_STATE_CHOOSE_SETUP_STATE:
if (!MoveTutorRunTextPrinters()) if (!MoveRelearnerRunTextPrinters())
{ {
FillWindowPixelBuffer(3, 0x11); FillWindowPixelBuffer(3, 0x11);
if (sMoveTutorMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
{ {
sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
} }
else if (sMoveTutorMenuSate.showContestInfo == TRUE) else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)
{ {
sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
} }
} }
break; break;
case MENU_STATE_PRINT_WHICH_MOVE_PROMPT: case MENU_STATE_PRINT_WHICH_MOVE_PROMPT:
if (!MoveTutorRunTextPrinters()) if (!MoveRelearnerRunTextPrinters())
{ {
sMoveTutorStruct->state = MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN; sMoveRelearnerStruct->state = MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
} }
break; break;
case MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN: case MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
ShowSelectMovePokemonSummaryScreen(gPlayerParty, sMoveTutorStruct->partyMon, gPlayerPartyCount - 1, CB2_InitLearnMoveReturnFromSelectMove, GetCurrentSelectedMove()); ShowSelectMovePokemonSummaryScreen(gPlayerParty, sMoveRelearnerStruct->partyMon, gPlayerPartyCount - 1, CB2_InitLearnMoveReturnFromSelectMove, GetCurrentSelectedMove());
FreeMoveTutorResources(); FreeMoveRelearnerResources();
} }
break; break;
case 21: case 21:
if (!MoveTutorRunTextPrinters()) if (!MoveRelearnerRunTextPrinters())
{ {
sMoveTutorStruct->state = MENU_STATE_FADE_AND_RETURN; sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN;
} }
break; break;
case 22: case 22:
@ -666,23 +666,23 @@ static void DoMoveTutorMain(void)
break; break;
case MENU_STATE_FADE_AND_RETURN: case MENU_STATE_FADE_AND_RETURN:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
break; break;
case MENU_STATE_RETURN_TO_FIELD: case MENU_STATE_RETURN_TO_FIELD:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
FreeMoveTutorResources(); FreeMoveRelearnerResources();
SetMainCallback2(CB2_ReturnToField); SetMainCallback2(CB2_ReturnToField);
} }
break; break;
case MENU_STATE_FADE_FROM_SUMMARY_SCREEN: case MENU_STATE_FADE_FROM_SUMMARY_SCREEN:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
sMoveTutorStruct->state++; sMoveRelearnerStruct->state++;
if (sMoveTutorMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
{ {
HideHeartSpritesAndShowTeachMoveText(TRUE); HideHeartSpritesAndShowTeachMoveText(TRUE);
} }
else if (sMoveTutorMenuSate.showContestInfo == TRUE) else if (sMoveRelearnerMenuSate.showContestInfo == TRUE)
{ {
ShowTeachMoveText(TRUE); ShowTeachMoveText(TRUE);
} }
@ -692,66 +692,66 @@ static void DoMoveTutorMain(void)
case MENU_STATE_TRY_OVERWRITE_MOVE: case MENU_STATE_TRY_OVERWRITE_MOVE:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
if (sMoveTutorStruct->moveSlot == MAX_MON_MOVES) if (sMoveRelearnerStruct->moveSlot == MAX_MON_MOVES)
{ {
sMoveTutorStruct->state = MENU_STATE_PRINT_STOP_TEACHING; sMoveRelearnerStruct->state = MENU_STATE_PRINT_STOP_TEACHING;
} }
else else
{ {
u16 moveId = GetMonData(&gPlayerParty[sMoveTutorStruct->partyMon], MON_DATA_MOVE1 + sMoveTutorStruct->moveSlot); u16 moveId = GetMonData(&gPlayerParty[sMoveRelearnerStruct->partyMon], MON_DATA_MOVE1 + sMoveRelearnerStruct->moveSlot);
StringCopy(gStringVar3, gMoveNames[moveId]); StringCopy(gStringVar3, gMoveNames[moveId]);
RemoveMonPPBonus(&gPlayerParty[sMoveTutorStruct->partyMon], sMoveTutorStruct->moveSlot); RemoveMonPPBonus(&gPlayerParty[sMoveRelearnerStruct->partyMon], sMoveRelearnerStruct->moveSlot);
SetMonMoveSlot(&gPlayerParty[sMoveTutorStruct->partyMon], GetCurrentSelectedMove(), sMoveTutorStruct->moveSlot); SetMonMoveSlot(&gPlayerParty[sMoveRelearnerStruct->partyMon], GetCurrentSelectedMove(), sMoveRelearnerStruct->moveSlot);
StringCopy(gStringVar2, gMoveNames[GetCurrentSelectedMove()]); StringCopy(gStringVar2, gMoveNames[GetCurrentSelectedMove()]);
FormatAndPrintText(gText_MoveTutorAndPoof); FormatAndPrintText(gText_MoveRelearnerAndPoof);
sMoveTutorStruct->state = MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE; sMoveRelearnerStruct->state = MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE;
gSpecialVar_0x8004 = TRUE; gSpecialVar_0x8004 = TRUE;
} }
} }
break; break;
case MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE: case MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE:
if (!MoveTutorRunTextPrinters()) if (!MoveRelearnerRunTextPrinters())
{ {
FormatAndPrintText(gText_MoveTutorPkmnForgotMoveAndLearnedNew); FormatAndPrintText(gText_MoveRelearnerPkmnForgotMoveAndLearnedNew);
sMoveTutorStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE;
PlayFanfare(MUS_FANFA1); PlayFanfare(MUS_FANFA1);
} }
break; break;
case MENU_STATE_PRINT_TEXT_THEN_FANFARE: case MENU_STATE_PRINT_TEXT_THEN_FANFARE:
if (!MoveTutorRunTextPrinters()) if (!MoveRelearnerRunTextPrinters())
{ {
PlayFanfare(MUS_FANFA1); PlayFanfare(MUS_FANFA1);
sMoveTutorStruct->state = MENU_STATE_WAIT_FOR_FANFARE; sMoveRelearnerStruct->state = MENU_STATE_WAIT_FOR_FANFARE;
} }
break; break;
case MENU_STATE_WAIT_FOR_FANFARE: case MENU_STATE_WAIT_FOR_FANFARE:
if (IsFanfareTaskInactive()) if (IsFanfareTaskInactive())
{ {
sMoveTutorStruct->state = MENU_STATE_WAIT_FOR_A_BUTTON; sMoveRelearnerStruct->state = MENU_STATE_WAIT_FOR_A_BUTTON;
} }
break; break;
case MENU_STATE_WAIT_FOR_A_BUTTON: case MENU_STATE_WAIT_FOR_A_BUTTON:
if (gMain.newKeys & A_BUTTON) if (gMain.newKeys & A_BUTTON)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sMoveTutorStruct->state = MENU_STATE_FADE_AND_RETURN; sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN;
} }
break; break;
} }
} }
static void FreeMoveTutorResources(void) static void FreeMoveRelearnerResources(void)
{ {
RemoveScrollArrows(); RemoveScrollArrows();
DestroyListMenuTask(sMoveTutorStruct->moveListMenuTask, &sMoveTutorMenuSate.listOffset, &sMoveTutorMenuSate.listRow); DestroyListMenuTask(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuSate.listOffset, &sMoveRelearnerMenuSate.listRow);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
FREE_AND_SET_NULL(sMoveTutorStruct); FREE_AND_SET_NULL(sMoveRelearnerStruct);
ResetSpriteData(); ResetSpriteData();
FreeAllSpritePalettes(); FreeAllSpritePalettes();
} }
// Note: The hearts are already made invisible by MoveTutorShowHideHearts, // Note: The hearts are already made invisible by MoveRelearnerShowHideHearts,
// which is called whenever the cursor in either list changes. // which is called whenever the cursor in either list changes.
static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites) static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites)
{ {
@ -759,7 +759,7 @@ static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites)
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = TRUE; gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = TRUE;
} }
if (!onlyHideSprites) if (!onlyHideSprites)
@ -772,8 +772,8 @@ static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites)
static void HandleInput(bool8 showContest) static void HandleInput(bool8 showContest)
{ {
s32 itemId = ListMenu_ProcessInput(sMoveTutorStruct->moveListMenuTask); s32 itemId = ListMenu_ProcessInput(sMoveRelearnerStruct->moveListMenuTask);
ListMenuGetScrollAndRow(sMoveTutorStruct->moveListMenuTask, &sMoveTutorMenuSate.listOffset, &sMoveTutorMenuSate.listRow); ListMenuGetScrollAndRow(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuSate.listOffset, &sMoveRelearnerMenuSate.listRow);
switch (itemId) switch (itemId)
{ {
@ -788,47 +788,47 @@ static void HandleInput(bool8 showContest)
if (showContest == FALSE) if (showContest == FALSE)
{ {
PutWindowTilemap(1); PutWindowTilemap(1);
sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE;
sMoveTutorMenuSate.showContestInfo = TRUE; sMoveRelearnerMenuSate.showContestInfo = TRUE;
} }
else else
{ {
PutWindowTilemap(0); PutWindowTilemap(0);
sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE;
sMoveTutorMenuSate.showContestInfo = FALSE; sMoveRelearnerMenuSate.showContestInfo = FALSE;
} }
schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(1);
MoveTutorShowHideHearts(GetCurrentSelectedMove()); MoveRelearnerShowHideHearts(GetCurrentSelectedMove());
break; break;
case LIST_CANCEL: case LIST_CANCEL:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
RemoveScrollArrows(); RemoveScrollArrows();
sMoveTutorStruct->state = MENU_STATE_PRINT_GIVE_UP_PROMPT; sMoveRelearnerStruct->state = MENU_STATE_PRINT_GIVE_UP_PROMPT;
StringExpandPlaceholders(gStringVar4, gText_MoveTutorGiveUp); StringExpandPlaceholders(gStringVar4, gText_MoveRelearnerGiveUp);
MoveTutorPrintText(gStringVar4); MoveRelearnerPrintText(gStringVar4);
break; break;
default: default:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
RemoveScrollArrows(); RemoveScrollArrows();
sMoveTutorStruct->state = MENU_STATE_PRINT_TEACH_MOVE_PROMPT; sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEACH_MOVE_PROMPT;
StringCopy(gStringVar2, gMoveNames[itemId]); StringCopy(gStringVar2, gMoveNames[itemId]);
StringExpandPlaceholders(gStringVar4, gText_MoveTutorTeachMoveConfirm); StringExpandPlaceholders(gStringVar4, gText_MoveRelearnerTeachMoveConfirm);
MoveTutorPrintText(gStringVar4); MoveRelearnerPrintText(gStringVar4);
break; break;
} }
} }
static s32 GetCurrentSelectedMove(void) static s32 GetCurrentSelectedMove(void)
{ {
return sMoveTutorStruct->menuItems[sMoveTutorMenuSate.listRow + sMoveTutorMenuSate.listOffset].id; return sMoveRelearnerStruct->menuItems[sMoveRelearnerMenuSate.listRow + sMoveRelearnerMenuSate.listOffset].id;
} }
// Theory: This used to make the heart sprites visible again (i.e. // Theory: This used to make the heart sprites visible again (i.e.
// this was the inverse of HideHeartsAndShowTeachMoveText), but the // this was the inverse of HideHeartsAndShowTeachMoveText), but the
// code was commented out. The bool argument would have been named // code was commented out. The bool argument would have been named
// "justShowHearts." The code for showing/hiding the heards was moved // "justShowHearts." The code for showing/hiding the heards was moved
// to MoveTutorShowHideHearts, which is called whenever a new move is // to MoveRelearnerShowHideHearts, which is called whenever a new move is
// selected and whenever the display mode changes. // selected and whenever the display mode changes.
static void ShowTeachMoveText(bool8 shouldDoNothingInstead) static void ShowTeachMoveText(bool8 shouldDoNothingInstead)
{ {
@ -844,57 +844,57 @@ static void CreateUISprites(void)
{ {
int i; int i;
sMoveTutorStruct->moveDisplayArrowTask = 0xFF; sMoveRelearnerStruct->moveDisplayArrowTask = 0xFF;
sMoveTutorStruct->moveListScrollArrowTask = 0xFF; sMoveRelearnerStruct->moveListScrollArrowTask = 0xFF;
AddScrollArrows(); AddScrollArrows();
// These are the appeal hearts. // These are the appeal hearts.
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {
sMoveTutorStruct->heartSpriteIds[i] = CreateSprite(&sConstestMoveHeartSprite, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 36, 0); sMoveRelearnerStruct->heartSpriteIds[i] = CreateSprite(&sConstestMoveHeartSprite, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 36, 0);
} }
// These are the jam harts. // These are the jam harts.
// The animation is used to toggle between full/empty heart sprites. // The animation is used to toggle between full/empty heart sprites.
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {
sMoveTutorStruct->heartSpriteIds[i + 8] = CreateSprite(&sConstestMoveHeartSprite, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 52, 0); sMoveRelearnerStruct->heartSpriteIds[i + 8] = CreateSprite(&sConstestMoveHeartSprite, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 52, 0);
StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]], 2); StartSpriteAnim(&gSprites[sMoveRelearnerStruct->heartSpriteIds[i + 8]], 2);
} }
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = TRUE; gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = TRUE;
} }
} }
static void AddScrollArrows(void) static void AddScrollArrows(void)
{ {
if (sMoveTutorStruct->moveDisplayArrowTask == 0xFF) if (sMoveRelearnerStruct->moveDisplayArrowTask == 0xFF)
{ {
sMoveTutorStruct->moveDisplayArrowTask = AddScrollIndicatorArrowPair(&sDisplayModeArrowsTemplate, &sMoveTutorStruct->scrollOffset); sMoveRelearnerStruct->moveDisplayArrowTask = AddScrollIndicatorArrowPair(&sDisplayModeArrowsTemplate, &sMoveRelearnerStruct->scrollOffset);
} }
if (sMoveTutorStruct->moveListScrollArrowTask == 0xFF) if (sMoveRelearnerStruct->moveListScrollArrowTask == 0xFF)
{ {
gTempScrollArrowTemplate = sMoveListScrollArrowsTemplate; gTempScrollArrowTemplate = sMoveListScrollArrowsTemplate;
gTempScrollArrowTemplate.fullyDownThreshold = sMoveTutorStruct->numMenuChoices - sMoveTutorStruct->numToShowAtOnce; gTempScrollArrowTemplate.fullyDownThreshold = sMoveRelearnerStruct->numMenuChoices - sMoveRelearnerStruct->numToShowAtOnce;
sMoveTutorStruct->moveListScrollArrowTask = AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, &sMoveTutorMenuSate.listOffset); sMoveRelearnerStruct->moveListScrollArrowTask = AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, &sMoveRelearnerMenuSate.listOffset);
} }
} }
static void RemoveScrollArrows(void) static void RemoveScrollArrows(void)
{ {
if (sMoveTutorStruct->moveDisplayArrowTask != 0xFF) if (sMoveRelearnerStruct->moveDisplayArrowTask != 0xFF)
{ {
RemoveScrollIndicatorArrowPair(sMoveTutorStruct->moveDisplayArrowTask); RemoveScrollIndicatorArrowPair(sMoveRelearnerStruct->moveDisplayArrowTask);
sMoveTutorStruct->moveDisplayArrowTask = 0xFF; sMoveRelearnerStruct->moveDisplayArrowTask = 0xFF;
} }
if (sMoveTutorStruct->moveListScrollArrowTask != 0xFF) if (sMoveRelearnerStruct->moveListScrollArrowTask != 0xFF)
{ {
RemoveScrollIndicatorArrowPair(sMoveTutorStruct->moveListScrollArrowTask); RemoveScrollIndicatorArrowPair(sMoveRelearnerStruct->moveListScrollArrowTask);
sMoveTutorStruct->moveListScrollArrowTask = 0xFF; sMoveRelearnerStruct->moveListScrollArrowTask = 0xFF;
} }
} }
@ -903,32 +903,32 @@ static void CreateLearnableMovesList(void)
s32 i; s32 i;
u8 nickname[POKEMON_NAME_LENGTH + 1]; u8 nickname[POKEMON_NAME_LENGTH + 1];
sMoveTutorStruct->numMenuChoices = GetMoveRelearnerMoves(&gPlayerParty[sMoveTutorStruct->partyMon], sMoveTutorStruct->movesToLearn); sMoveRelearnerStruct->numMenuChoices = GetMoveRelearnerMoves(&gPlayerParty[sMoveRelearnerStruct->partyMon], sMoveRelearnerStruct->movesToLearn);
for (i = 0; i < sMoveTutorStruct->numMenuChoices; i++) for (i = 0; i < sMoveRelearnerStruct->numMenuChoices; i++)
{ {
sMoveTutorStruct->menuItems[i].name = gMoveNames[sMoveTutorStruct->movesToLearn[i]]; sMoveRelearnerStruct->menuItems[i].name = gMoveNames[sMoveRelearnerStruct->movesToLearn[i]];
sMoveTutorStruct->menuItems[i].id = sMoveTutorStruct->movesToLearn[i]; sMoveRelearnerStruct->menuItems[i].id = sMoveRelearnerStruct->movesToLearn[i];
} }
GetMonData(&gPlayerParty[sMoveTutorStruct->partyMon], MON_DATA_NICKNAME, nickname); GetMonData(&gPlayerParty[sMoveRelearnerStruct->partyMon], MON_DATA_NICKNAME, nickname);
StringCopy10(gStringVar1, nickname); StringCopy10(gStringVar1, nickname);
sMoveTutorStruct->menuItems[sMoveTutorStruct->numMenuChoices].name = gText_Cancel; sMoveRelearnerStruct->menuItems[sMoveRelearnerStruct->numMenuChoices].name = gText_Cancel;
sMoveTutorStruct->menuItems[sMoveTutorStruct->numMenuChoices].id = LIST_CANCEL; sMoveRelearnerStruct->menuItems[sMoveRelearnerStruct->numMenuChoices].id = LIST_CANCEL;
sMoveTutorStruct->numMenuChoices++; sMoveRelearnerStruct->numMenuChoices++;
sMoveTutorStruct->numToShowAtOnce = LoadMoveTutorMovesList(sMoveTutorStruct->menuItems, sMoveTutorStruct->numMenuChoices); sMoveRelearnerStruct->numToShowAtOnce = LoadMoveRelearnerMovesList(sMoveRelearnerStruct->menuItems, sMoveRelearnerStruct->numMenuChoices);
} }
void MoveTutorShowHideHearts(s32 moveId) void MoveRelearnerShowHideHearts(s32 moveId)
{ {
u16 numHearts; u16 numHearts;
u16 i; u16 i;
if (!sMoveTutorMenuSate.showContestInfo || moveId == LIST_CANCEL) if (!sMoveRelearnerMenuSate.showContestInfo || moveId == LIST_CANCEL)
{ {
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = TRUE; gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = TRUE;
} }
} }
else else
@ -944,13 +944,13 @@ void MoveTutorShowHideHearts(s32 moveId)
{ {
if (i < numHearts) if (i < numHearts)
{ {
StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i]], 1); StartSpriteAnim(&gSprites[sMoveRelearnerStruct->heartSpriteIds[i]], 1);
} }
else else
{ {
StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i]], 0); StartSpriteAnim(&gSprites[sMoveRelearnerStruct->heartSpriteIds[i]], 0);
} }
gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = FALSE; gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = FALSE;
} }
numHearts = (u8)(gContestEffects[gContestMoves[moveId].effect].jam / 10); numHearts = (u8)(gContestEffects[gContestMoves[moveId].effect].jam / 10);
@ -964,13 +964,13 @@ void MoveTutorShowHideHearts(s32 moveId)
{ {
if (i < numHearts) if (i < numHearts)
{ {
StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]], 3); StartSpriteAnim(&gSprites[sMoveRelearnerStruct->heartSpriteIds[i + 8]], 3);
} }
else else
{ {
StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]], 2); StartSpriteAnim(&gSprites[sMoveRelearnerStruct->heartSpriteIds[i + 8]], 2);
} }
gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]].invisible = FALSE; gSprites[sMoveRelearnerStruct->heartSpriteIds[i + 8]].invisible = FALSE;
} }
} }
} }

16
src/strings.c
View File

@ -1742,15 +1742,15 @@ const u8 gText_TrainerHill2F[] = _("2F");
const u8 gText_TrainerHill3F[] = _("3F"); const u8 gText_TrainerHill3F[] = _("3F");
const u8 gText_TrainerHill4F[] = _("4F"); const u8 gText_TrainerHill4F[] = _("4F");
const u8 gText_TeachWhichMoveToPkmn[] = _("Teach which move to {STR_VAR_1}?"); const u8 gText_TeachWhichMoveToPkmn[] = _("Teach which move to {STR_VAR_1}?");
const u8 gText_MoveTutorTeachMoveConfirm[] = _("Teach {STR_VAR_2}?"); const u8 gText_MoveRelearnerTeachMoveConfirm[] = _("Teach {STR_VAR_2}?");
const u8 gText_MoveTutorPkmnLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); const u8 gText_MoveRelearnerPkmnLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!");
const u8 gText_MoveTutorPkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); const u8 gText_MoveRelearnerPkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?");
const u8 gText_MoveTutorStopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gText_MoveRelearnerStopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?");
const u8 gText_MoveTutorAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p"); const u8 gText_MoveRelearnerAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p");
const u8 gText_MoveTutorPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}."); const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}.");
const u8 gUnknown_085EF9C8[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}."); const u8 gUnknown_085EF9C8[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.");
const u8 gText_MoveTutorGiveUp[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?"); const u8 gText_MoveRelearnerGiveUp[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?");
const u8 gText_MoveTutorWhichMoveToForget[] = _("Which move should be\nforgotten?\p"); const u8 gText_MoveRelearnerWhichMoveToForget[] = _("Which move should be\nforgotten?\p");
const u8 gText_BattleMoves2[] = _("BATTLE MOVES"); const u8 gText_BattleMoves2[] = _("BATTLE MOVES");
const u8 gText_ContestMoves2[] = _("CONTEST MOVES"); const u8 gText_ContestMoves2[] = _("CONTEST MOVES");
const u8 gUnknown_085EFA4C[] = _("TYPE/"); const u8 gUnknown_085EFA4C[] = _("TYPE/");

2
sym_ewram.txt
View File

@ -192,7 +192,7 @@ gPlayerFacingPosition: @ 203AB40
.include "src/rom_81520A8.o" .include "src/rom_81520A8.o"
.include "src/save.o" .include "src/save.o"
.include "src/mystery_event_script.o" .include "src/mystery_event_script.o"
.include "src/move_tutor.o" .include "src/move_relearner.o"
.include "src/decoration_inventory.o" .include "src/decoration_inventory.o"
.include "src/roamer.o" .include "src/roamer.o"
.include "src/battle_tower.o" .include "src/battle_tower.o"