diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/FallarborTown_House2/scripts.inc | 2 | ||||
| -rw-r--r-- | data/rom_81D1C44.s | 8 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 2f2ec1b3f..d0305ad4b 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -37,7 +37,7 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 FallarborTown_House2_EventScript_20140C:: @ 820140C msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT - special TeachMoveTutorMove + special TeachMoveRelearnerMove waitstate compare VAR_0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_2013D6 diff --git a/data/rom_81D1C44.s b/data/rom_81D1C44.s index f9625c9ca..1b5435175 100644 --- a/data/rom_81D1C44.s +++ b/data/rom_81D1C44.s @@ -23,7 +23,7 @@ gUnknown_08625404:: @ 8625404 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 -gMoveTutorWindowTemplates:: @ 8625510s +gMoveRelearnerWindowTemplates:: @ 8625510s window_template 1, 1, 1, 16, 12, 0xF, 0x000A window_template 1, 1, 1, 16, 12, 0xF, 0x00CA window_template 1, 19, 1, 10, 12, 0xF, 0x018A @@ -31,12 +31,12 @@ gMoveTutorWindowTemplates:: @ 8625510s window_template 0, 22, 8, 5, 4, 0xF, 0x025A null_window_template -gMoveTutorYesNoMenuTemplate:: @ 8625540 +gMoveRelearnerYesNoMenuTemplate:: @ 8625540 window_template 0, 22, 8, 5, 4, 0xF, 0x025A -gMoveTutorMovesListTemplate:: @ 8625548 struct ListMenuTemplate +gMoveRelearnerMovesListTemplate:: @ 8625548 struct ListMenuTemplate .4byte NULL - .4byte MoveTutorCursorCallback + .4byte MoveRelearnerCursorCallback .4byte NULL .2byte 0 .2byte 0 diff --git a/data/specials.inc b/data/specials.inc index d57c76bde..9364dcc46 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -235,7 +235,7 @@ gSpecials:: @ 81DBA64 def_special sub_81B9770 def_special sub_81B9718 def_special sub_81B96D0 - def_special TeachMoveTutorMove + def_special TeachMoveRelearnerMove def_special GetRecordedCyclingRoadResults def_special Special_BeginCyclingRoadChallenge def_special GetPlayerAvatarBike |