diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-08-12 12:54:07 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-08-12 12:54:07 -0700 |
| commit | 2dd5fc23d4d34890e17a412ae9ad80e23c7aa50d (patch) | |
| tree | f537d11172aca6f048cd8612a85f84c2482208a8 /data | |
| parent | a000eb4f3619c1df9326961b3afe8a4392c05827 (diff) | |
Prepare learn_move for merge
Diffstat (limited to 'data')
| -rw-r--r-- | data/learn_move.s | 93 | ||||
| -rw-r--r-- | data/maps/FallarborTown_House2/scripts.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 2 insertions, 95 deletions
diff --git a/data/learn_move.s b/data/learn_move.s deleted file mode 100644 index 0a2c31e58..000000000 --- a/data/learn_move.s +++ /dev/null @@ -1,93 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_085CE9F8:: @ 85CE9F8 - .incbin "graphics/interface/ui_learn_move.gbapal" - -gUnknown_085CEA18:: @ 85CEA18 - .incbin "graphics/interface/ui_learn_move.4bpp" - -gUnknown_085CEB98:: @ 85CEB98 - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0x8000 - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0x4000 - .2byte 0 - .2byte 0 - .2byte 0 - -gUnknown_085CEBB0:: @ 85CEBB0 - obj_tiles gUnknown_085CEA18, 0x180, 0x1595 - -gUnknown_085CEBB8:: @ 85CEBB8 - obj_pal gUnknown_085CE9F8, 0x1596 - -gUnknown_085CEBC0:: @ 85CEBC0 - .byte 0 - .byte 0x1B - .byte 16 - .byte 1 - .byte 0x75 - .byte 16 - .2byte 0xFFFF - .2byte 0xFFFF - .2byte 0x14CD - .2byte 0x14CD - .byte 0, 0 - -gUnknown_085CEBD0:: @ 85CEBD0 - .byte 2 - .byte 0xC0 - .byte 8 - .byte 3 - .byte 0xC0 - .byte 0x68 - .2byte 0 - .2byte 0 - .2byte 0x1531 - .2byte 0x1531 - .byte 0, 0 - -gUnknown_085CEBE0:: @ 85CEBE0 - .2byte 8 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - -gUnknown_085CEBE8:: @ 85CEBE8 - .2byte 9 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - -gUnknown_085CEBF0:: @ 85CEBF0 - .2byte 10 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - -gUnknown_085CEBF8:: @ 85CEBF8 - .2byte 11 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - -gUnknown_085CEC00:: @ 85CEC00 - .4byte gUnknown_085CEBE0 - .4byte gUnknown_085CEBE8 - .4byte gUnknown_085CEBF0 - .4byte gUnknown_085CEBF8 - -gUnknown_085CEC10:: @ 85CEC10 - spr_template 0x1595, 0x1596, gUnknown_085CEB98, gUnknown_085CEC00, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_085CEC28:: @ 85CEC28 - .4byte 0x1F0 - .4byte 0x11E1 diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index b78756e0a..7ab0666e8 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -38,7 +38,7 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 FallarborTown_House2_EventScript_20140C:: @ 820140C msgbox FallarborTown_House2_Text_2015C3, 4 - special sub_8160638 + special TeachMoveTutorMove waitstate compare VAR_0x8004, 0 goto_eq FallarborTown_House2_EventScript_2013D6 diff --git a/data/specials.inc b/data/specials.inc index 86355f484..01bb9cb89 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 sub_8160638 + def_special TeachMoveTutorMove def_special GetRecordedCyclingRoadResults def_special Special_BeginCyclingRoadChallenge def_special GetPlayerAvatarBike |