summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_pyramid.s94
-rw-r--r--data/contest_ai.s144
-rw-r--r--data/learn_move.s93
-rw-r--r--data/maps/FallarborTown_House2/scripts.inc2
-rw-r--r--data/pokemon_summary_screen.s507
-rw-r--r--data/specials.inc2
-rw-r--r--data/text/nature_names.inc102
7 files changed, 96 insertions, 848 deletions
diff --git a/data/battle_pyramid.s b/data/battle_pyramid.s
new file mode 100644
index 000000000..7327fb1f8
--- /dev/null
+++ b/data/battle_pyramid.s
@@ -0,0 +1,94 @@
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
+ .section .rodata
+
+ .align 2
+gUnknown_0861F2B4:: @ 861F2B4
+ .4byte 0x000011f0, 0x000001e1, 0x000021de
+
+ .align 2
+gUnknown_0861F2C0:: @ 861F2C0
+ .4byte 0x00000000, sub_81C5460, sub_81C5518, 0x00000000, 0x00080000, 0x07003021
+
+ .align 2
+gUnknown_0861F2D8:: @ 861F2D8
+ .4byte gMenuText_Use, sub_81C61E0
+ .4byte gMenuText_Toss, sub_81C62C4
+ .4byte gMenuText_Give, sub_81C6648
+ .4byte gText_Cancel2, sub_81C6258
+ .4byte gMenuText_Use, sub_81C679C
+ .4byte gText_EmptyString2, NULL
+
+gUnknown_0861F308:: @ 861F308
+ .byte 0x00, 0x02, 0x01, 0x03
+
+gUnknown_0861F30C:: @ 861F30C
+ .byte 0x01, 0x03
+
+gUnknown_0861F30E:: @ 861F30E
+ .byte 0x04, 0x03
+
+gUnknown_0861F310:: @ 861F310
+ .byte 0x03, 0x00, 0x00, 0x00
+
+gUnknown_0861F314:: @ 861F314
+ .4byte sub_81C654C
+ .4byte sub_81C63D0
+
+gUnknown_0861F31C:: @ 861F31C
+ .byte 0x00, 0x02, 0x03, 0x00, 0x03, 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00
+
+ .align 2
+gUnknown_0861F328:: @ 861F328
+ window_template 0x00, 0x0e, 0x02, 0x0f, 0x10, 0x0f, 0x001e
+ window_template 0x00, 0x00, 0x0d, 0x0e, 0x06, 0x0f, 0x010e
+ window_template 0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0162
+ window_template 0x01, 0x18, 0x11, 0x05, 0x02, 0x0f, 0x01ce
+ null_window_template
+
+ .align 2
+gUnknown_0861F350:: @ 861F350
+ window_template 0x01, 0x16, 0x11, 0x07, 0x02, 0x0f, 0x01d8
+ window_template 0x01, 0x16, 0x0f, 0x07, 0x04, 0x0f, 0x01d8
+ window_template 0x01, 0x0f, 0x0f, 0x0e, 0x04, 0x0f, 0x01d8
+ window_template 0x01, 0x0f, 0x0d, 0x0e, 0x06, 0x0f, 0x01d8
+
+ .align 2
+gUnknown_0861F370:: @ 861F370
+ window_template 0x01, 0x18, 0x0f, 0x05, 0x04, 0x0f, 0x01d8
+
+ .align 2
+gOamData_861F378:: @ 861F378
+ .2byte 0x0100, 0xc000, 0x0400, 0x0000
+
+ .align 2
+gSpriteAnim_861F380:: @ 861F380
+ .2byte 0x0000, 0x0004, 0xffff, 0x0000
+
+ .align 2
+gSpriteAnimTable_861F388:: @ 861F388
+ .4byte gSpriteAnim_861F380
+
+ .align 2
+gSpriteAffineAnim_861F38C:: @ 861F38C
+ .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+ .align 2
+gSpriteAffineAnim_861F39C:: @ 861F39C
+ .2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000
+ .2byte 0x7fff, 0x0000, 0x0000, 0x0000
+
+ .align 2
+gSpriteAffineAnimTable_861F3C4:: @ 861F3C4
+ .4byte gSpriteAffineAnim_861F38C
+ .4byte gSpriteAffineAnim_861F39C
+
+ .align 2
+gUnknown_0861F3CC:: @ 861F3CC
+ obj_tiles gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024
+
+ .align 2
+gUnknown_0861F3D4:: @ 861F3D4
+ spr_template 0x1024, 0x1024, gOamData_861F378, gSpriteAnimTable_861F388, NULL, gSpriteAffineAnimTable_861F3C4, SpriteCallbackDummy
+
diff --git a/data/contest_ai.s b/data/contest_ai.s
deleted file mode 100644
index c7cb848a7..000000000
--- a/data/contest_ai.s
+++ /dev/null
@@ -1,144 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_085CDD00:: @ 85CDD00
- .4byte sub_81564DC
- .4byte sub_8156530
- .4byte sub_8156550
- .4byte sub_8156594
- .4byte sub_81565D8
- .4byte sub_815661C
- .4byte sub_8156660
- .4byte sub_8156684
- .4byte sub_81566C8
- .4byte sub_815670C
- .4byte sub_8156750
- .4byte sub_8156794
- .4byte sub_81567BC
- .4byte sub_8156800
- .4byte sub_8156844
- .4byte sub_8156888
- .4byte sub_81568CC
- .4byte sub_815690C
- .4byte sub_8156950
- .4byte sub_8156994
- .4byte sub_81569D8
- .4byte sub_8156A1C
- .4byte sub_8156A48
- .4byte sub_8156A98
- .4byte sub_8156AE8
- .4byte sub_8156B38
- .4byte sub_8156B88
- .4byte sub_8156BB4
- .4byte sub_8156C04
- .4byte sub_8156C54
- .4byte sub_8156CA4
- .4byte sub_8156CF4
- .4byte sub_8156D18
- .4byte sub_8156D5C
- .4byte sub_8156DA0
- .4byte sub_8156DE4
- .4byte sub_8156E2C
- .4byte sub_8156E74
- .4byte sub_8156EBC
- .4byte sub_8156F04
- .4byte sub_8156F44
- .4byte sub_8156F88
- .4byte sub_8156FCC
- .4byte sub_8157018
- .4byte sub_815705C
- .4byte sub_81570A0
- .4byte sub_815712C
- .4byte sub_8157174
- .4byte sub_8157200
- .4byte sub_8157248
- .4byte sub_81572A4
- .4byte sub_81572E8
- .4byte sub_815732C
- .4byte sub_8157370
- .4byte sub_81573B4
- .4byte sub_8157410
- .4byte sub_8157454
- .4byte sub_8157498
- .4byte sub_81574DC
- .4byte sub_8157520
- .4byte sub_8157578
- .4byte sub_81575BC
- .4byte sub_8157600
- .4byte sub_8157644
- .4byte sub_8157688
- .4byte sub_8157700
- .4byte sub_8157748
- .4byte sub_8157790
- .4byte sub_8157808
- .4byte sub_8157850
- .4byte sub_8157898
- .4byte sub_81578F8
- .4byte sub_8157940
- .4byte sub_8157988
- .4byte sub_81579CC
- .4byte sub_8157A10
- .4byte sub_8157A54
- .4byte sub_8157A98
- .4byte sub_8157ADC
- .4byte sub_8157B38
- .4byte sub_8157B7C
- .4byte sub_8157BC0
- .4byte sub_8157C04
- .4byte sub_8157C48
- .4byte sub_8157C94
- .4byte sub_8157CDC
- .4byte sub_8157D24
- .4byte sub_8157D60
- .4byte sub_8157DA8
- .4byte sub_8157DF0
- .4byte sub_8157E3C
- .4byte sub_8157E84
- .4byte sub_8157ECC
- .4byte sub_8157F14
- .4byte sub_8157F5C
- .4byte sub_8157FA0
- .4byte sub_8157FE8
- .4byte sub_8158030
- .4byte sub_8158078
- .4byte sub_81580C0
- .4byte sub_8158108
- .4byte sub_815814C
- .4byte sub_8158190
- .4byte sub_81581D4
- .4byte sub_8158218
- .4byte sub_8158254
- .4byte sub_8158298
- .4byte sub_81582DC
- .4byte sub_8158320
- .4byte sub_8158364
- .4byte sub_81583B8
- .4byte sub_81583FC
- .4byte sub_8158440
- .4byte sub_815846C
- .4byte sub_815849C
- .4byte sub_81584D4
- .4byte sub_8158508
- .4byte sub_815853C
- .4byte sub_815858C
- .4byte sub_81585DC
- .4byte sub_815862C
- .4byte sub_815867C
- .4byte sub_81586D0
- .4byte sub_8158724
- .4byte sub_8158778
- .4byte sub_81587CC
- .4byte sub_815881C
- .4byte sub_815886C
- .4byte dp15_call
- .4byte sub_81588BC
- .4byte sub_8158948
- .4byte sub_81589A4
- .4byte sub_81589EC
- .4byte sub_8158A34
- .4byte sub_8158AA0
- .4byte sub_8158AE8
-
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/pokemon_summary_screen.s b/data/pokemon_summary_screen.s
deleted file mode 100644
index 0c22aa6cd..000000000
--- a/data/pokemon_summary_screen.s
+++ /dev/null
@@ -1,507 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-@ 861CAAC
- .include "data/text/nature_names.inc"
-
- .align 2
-gUnknown_0861CBB4:: @ 861CBB4
- .4byte 0x000001f0, 0x000013b9, 0x0000239a, 0x000033db
-
- .align 2
-gUnknown_0861CBC4:: @ 861CBC4
- .incbin "graphics/interface/unk_tilemap2.bin"
-
- .align 2
-gUnknown_0861CBEC:: @ 861CBEC
- .4byte gUnknown_0861CBC4
- .byte 0x01, 0x00, 0x0a, 0x02, 0x00, 0x12
-
- .align 2
-gUnknown_0861CBF8:: @ 861CBF8
- .4byte gUnknown_0861CBC4
- .byte 0x01, 0x00, 0x0a, 0x02, 0x00, 0x32
-
- .align 2
-gUnknown_0861CC04:: @ 861CC04
- .4byte gSummaryScreenPowAcc_Tilemap
- .byte 0x00
- .byte 0x00
- .byte 0x0A
- .byte 0x07
- .byte 0x00
- .byte 0x2D
-
- .align 2
-gUnknown_0861CC10:: @ 861CC10
- .4byte gUnknown_08DC3C34
- .byte 0x00
- .byte 0x00
- .byte 0x0A
- .byte 0x07
- .byte 0x00
- .byte 0x2D
-
- .align 2
-gUnknown_0861CC1C:: @ 861CC1C
- .byte 0x00, 0x02, 0x03, 0x01, 0x04, 0x05, 0x00, 0x00
-
- .align 2
-gUnknown_0861CC24:: @ 861CC24
- window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0001
- window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0017
- window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x002d
- window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0043
- window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0059
- window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0069
- window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0079
- window_template 0x00, 0x0b, 0x04, 0x00, 0x02, 0x06, 0x0089
- window_template 0x00, 0x0b, 0x04, 0x12, 0x02, 0x06, 0x0089
- window_template 0x00, 0x0b, 0x06, 0x12, 0x02, 0x06, 0x00ad
- window_template 0x00, 0x0a, 0x07, 0x06, 0x06, 0x06, 0x00d1
- window_template 0x00, 0x16, 0x07, 0x05, 0x06, 0x06, 0x00f5
- window_template 0x00, 0x0a, 0x0e, 0x0b, 0x04, 0x06, 0x0113
- window_template 0x00, 0x00, 0x12, 0x06, 0x02, 0x06, 0x013f
- window_template 0x00, 0x01, 0x0f, 0x09, 0x04, 0x06, 0x014b
- window_template 0x00, 0x01, 0x0f, 0x05, 0x04, 0x06, 0x016f
- window_template 0x00, 0x16, 0x04, 0x00, 0x02, 0x06, 0x0183
- window_template 0x00, 0x01, 0x02, 0x04, 0x02, 0x07, 0x0183
- window_template 0x00, 0x01, 0x0c, 0x09, 0x02, 0x06, 0x018b
- window_template 0x00, 0x01, 0x0e, 0x09, 0x04, 0x06, 0x019d
- null_window_template
-
- .align 2
-gUnknown_0861CCCC:: @ 861CCCC
- window_template 0x00, 0x0b, 0x04, 0x0b, 0x02, 0x06, 0x01c1
- window_template 0x00, 0x16, 0x04, 0x07, 0x02, 0x06, 0x01d7
- window_template 0x00, 0x0b, 0x09, 0x12, 0x04, 0x06, 0x01e5
- window_template 0x00, 0x0b, 0x0e, 0x12, 0x06, 0x06, 0x022d
-
- .align 2
-gUnknown_0861CCEC:: @ 861CCEC
- window_template 0x00, 0x0a, 0x04, 0x0a, 0x02, 0x06, 0x01c1
- window_template 0x00, 0x14, 0x04, 0x0a, 0x02, 0x06, 0x01d5
- window_template 0x00, 0x10, 0x07, 0x06, 0x06, 0x06, 0x01e9
- window_template 0x00, 0x1b, 0x07, 0x03, 0x06, 0x06, 0x020d
- window_template 0x00, 0x18, 0x0e, 0x06, 0x04, 0x06, 0x021f
-
- .align 2
-gUnknown_0861CD14:: @ 861CD14
- window_template 0x00, 0x0f, 0x04, 0x09, 0x0a, 0x06, 0x01c1
- window_template 0x00, 0x18, 0x04, 0x06, 0x0a, 0x08, 0x021b
- window_template 0x00, 0x0a, 0x0f, 0x14, 0x04, 0x06, 0x0257
-
-gUnknown_0861CD2C:: @ 861CD2C
- .byte 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x00, 0x05, 0x06, 0x00, 0x07, 0x08, 0x00, 0x09, 0x0a, 0x00, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x00, 0x07, 0x08, 0x0d, 0x0f, 0x0e, 0x00, 0x01, 0x02, 0x00, 0x03
- .byte 0x04, 0x00, 0x05, 0x06, 0x00, 0x07, 0x08
-
-gUnknown_0861CD53:: @ 861CD53
- .incbin "graphics/interface/summary_a_button.4bpp"
-
-gUnknown_0861CDD3:: @ 861CDD3
- .incbin "graphics/interface/summary_b_button.4bpp"
-
- .align 2
-gUnknown_0861CE54:: @ 861CE54
- .4byte sub_81C2E00
- .4byte sub_81C3530
- .4byte sub_81C3984
- .4byte sub_81C3D08
-
- .align 2
-gUnknown_0861CE64:: @ 861CE64
- .4byte sub_81C2E40
- .4byte sub_81C3554
- .4byte sub_81C39F0
- .4byte sub_81C3D54
-
-gUnknown_0861CE74:: @ 861CE74
- .string "{COLOR LIGHT_RED}{SHADOW GREEN}$"
-
-gUnknown_0861CE7B:: @ 861CE7B
- .string "{COLOR WHITE}{SHADOW DARK_GREY}$"
-
-gUnknown_0861CE82:: @ 861CE82
- .string "{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n"
- .string "{SPECIAL_F7 0x02}\n"
- .string "{SPECIAL_F7 0x03}$"
-
-gUnknown_0861CE8E:: @ 861CE8E
- .string "{SPECIAL_F7 0x00}\n"
- .string "{SPECIAL_F7 0x01}\n"
- .string "{SPECIAL_F7 0x02}$"
-
-gUnknown_0861CE97:: @ 861CE97
- .string "{PP}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}$"
-
- .align 2
-gOamData_861CEA0:: @ 861CEA0
- .2byte 0x4000, 0x8000, 0x0400, 0x0000
-
- .align 2
-gSpriteAnim_861CEA8:: @ 861CEA8
- .2byte 0x0000, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CEB0:: @ 861CEB0
- .2byte 0x0008, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CEB8:: @ 861CEB8
- .2byte 0x0010, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CEC0:: @ 861CEC0
- .2byte 0x0018, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CEC8:: @ 861CEC8
- .2byte 0x0020, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CED0:: @ 861CED0
- .2byte 0x0028, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CED8:: @ 861CED8
- .2byte 0x0030, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CEE0:: @ 861CEE0
- .2byte 0x0038, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CEE8:: @ 861CEE8
- .2byte 0x0040, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CEF0:: @ 861CEF0
- .2byte 0x0048, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CEF8:: @ 861CEF8
- .2byte 0x0050, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF00:: @ 861CF00
- .2byte 0x0058, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF08:: @ 861CF08
- .2byte 0x0060, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF10:: @ 861CF10
- .2byte 0x0068, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF18:: @ 861CF18
- .2byte 0x0070, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF20:: @ 861CF20
- .2byte 0x0078, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF28:: @ 861CF28
- .2byte 0x0080, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF30:: @ 861CF30
- .2byte 0x0088, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF38:: @ 861CF38
- .2byte 0x0090, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF40:: @ 861CF40
- .2byte 0x0098, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF48:: @ 861CF48
- .2byte 0x00a0, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF50:: @ 861CF50
- .2byte 0x00a8, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861CF58:: @ 861CF58
- .2byte 0x00b0, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_861CF60:: @ 861CF60
- .4byte gSpriteAnim_861CEA8
- .4byte gSpriteAnim_861CEB0
- .4byte gSpriteAnim_861CEB8
- .4byte gSpriteAnim_861CEC0
- .4byte gSpriteAnim_861CEC8
- .4byte gSpriteAnim_861CED0
- .4byte gSpriteAnim_861CED8
- .4byte gSpriteAnim_861CEE0
- .4byte gSpriteAnim_861CEE8
- .4byte gSpriteAnim_861CEF0
- .4byte gSpriteAnim_861CEF8
- .4byte gSpriteAnim_861CF00
- .4byte gSpriteAnim_861CF08
- .4byte gSpriteAnim_861CF10
- .4byte gSpriteAnim_861CF18
- .4byte gSpriteAnim_861CF20
- .4byte gSpriteAnim_861CF28
- .4byte gSpriteAnim_861CF30
- .4byte gSpriteAnim_861CF38
- .4byte gSpriteAnim_861CF40
- .4byte gSpriteAnim_861CF48
- .4byte gSpriteAnim_861CF50
- .4byte gSpriteAnim_861CF58
-
- .align 2
-gUnknown_0861CFBC:: @ 861CFBC
- obj_tiles gMoveTypes_Gfx, 0x1700, 0x7532
-
- .align 2
-gUnknown_0861CFC4:: @ 861CFC4
- spr_template 0x7532, 0x7532, gOamData_861CEA0, gSpriteAnimTable_861CF60, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_0861CFDC:: @ 861CFDC
- .byte 0x0d, 0x0d, 0x0e, 0x0e, 0x0d, 0x0d, 0x0f, 0x0e, 0x0d, 0x0f, 0x0d, 0x0e, 0x0f, 0x0d, 0x0e, 0x0e, 0x0f, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0d, 0x00
-
- .align 2
-gOamData_861CFF4:: @ 861CFF4
- .2byte 0x0000, 0x4000, 0x0400, 0x0000
-
- .align 2
-gSpriteAnim_861CFFC:: @ 861CFFC
- .2byte 0x0000, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D004:: @ 861D004
- .2byte 0x0004, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D00C:: @ 861D00C
- .2byte 0x0008, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D014:: @ 861D014
- .2byte 0x000c, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D01C:: @ 861D01C
- .2byte 0x0010, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D024:: @ 861D024
- .2byte 0x0010, 0x0040, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D02C:: @ 861D02C
- .2byte 0x0014, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D034:: @ 861D034
- .2byte 0x0018, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D03C:: @ 861D03C
- .2byte 0x0018, 0x0040, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D044:: @ 861D044
- .2byte 0x001c, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_861D04C:: @ 861D04C
- .4byte gSpriteAnim_861CFFC
- .4byte gSpriteAnim_861D004
- .4byte gSpriteAnim_861D00C
- .4byte gSpriteAnim_861D014
- .4byte gSpriteAnim_861D01C
- .4byte gSpriteAnim_861D024
- .4byte gSpriteAnim_861D02C
- .4byte gSpriteAnim_861D034
- .4byte gSpriteAnim_861D03C
- .4byte gSpriteAnim_861D044
-
- .align 2
-gUnknown_0861D074:: @ 861D074
- obj_tiles gUnknown_08D97BEC, 0x0400, 0x7530
-
- .align 2
-gUnknown_0861D07C:: @ 861D07C
- obj_pal gUnknown_08D97CF4, 0x7530
-
- .align 2
-gUnknown_0861D084:: @ 861D084
- spr_template 0x7530, 0x7530, gOamData_861CFF4, gSpriteAnimTable_861D04C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gOamData_861D09C:: @ 861D09C
- .2byte 0x4000, 0x4000, 0x0c00, 0x0000
-
- .align 2
-gSpriteAnim_861D0A4:: @ 861D0A4
- .2byte 0x0000, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D0AC:: @ 861D0AC
- .2byte 0x0004, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D0B4:: @ 861D0B4
- .2byte 0x0008, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D0BC:: @ 861D0BC
- .2byte 0x000c, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D0C4:: @ 861D0C4
- .2byte 0x0010, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D0CC:: @ 861D0CC
- .2byte 0x0014, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_861D0D4:: @ 861D0D4
- .2byte 0x0018, 0x0000, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_861D0DC:: @ 861D0DC
- .4byte gSpriteAnim_861D0A4
- .4byte gSpriteAnim_861D0AC
- .4byte gSpriteAnim_861D0B4
- .4byte gSpriteAnim_861D0BC
- .4byte gSpriteAnim_861D0C4
- .4byte gSpriteAnim_861D0CC
- .4byte gSpriteAnim_861D0D4
-
- .align 2
-gUnknown_0861D0F8:: @ 861D0F8
- obj_tiles gStatusGfx_Icons, 0x0380, 0x7531
-
- .align 2
-gUnknown_0861D100:: @ 861D100
- obj_pal gStatusPal_Icons, 0x7531
-
- .align 2
-gUnknown_0861D108:: @ 861D108
- spr_template 0x7531, 0x7531, gOamData_861D09C, gSpriteAnimTable_861D0DC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gUnknown_0861D120:: @ 861D120
- .incbin "graphics/interface/summary_markings.gbapal"
-
- .align 2
-gUnknown_0861D140:: @ 861D140
- .incbin "graphics/interface/region_map.gbapal"
-
- .align 2
-gUnknown_0861D1A0:: @ 861D1A0
- .incbin "graphics/interface/region_map.8bpp.lz"
-
- .align 2
-gUnknown_0861DEF4:: @ 861DEF4
- .incbin "graphics/interface/region_map.bin.lz"
-
- .align 2
-gUnknown_0861E208:: @ 861E208
- .incbin "graphics/interface/region_map_affine.8bpp.lz"
-
- .align 2
-gUnknown_0861EF64:: @ 861EF64
- .incbin "graphics/interface/region_map_affine.bin.lz"
-
- .align 2
-gUnknown_0861F2B4:: @ 861F2B4
- .4byte 0x000011f0, 0x000001e1, 0x000021de
-
- .align 2
-gUnknown_0861F2C0:: @ 861F2C0
- .4byte 0x00000000, sub_81C5460, sub_81C5518, 0x00000000, 0x00080000, 0x07003021
-
- .align 2
-gUnknown_0861F2D8:: @ 861F2D8
- .4byte gMenuText_Use, sub_81C61E0
- .4byte gMenuText_Toss, sub_81C62C4
- .4byte gMenuText_Give, sub_81C6648
- .4byte gText_Cancel2, sub_81C6258
- .4byte gMenuText_Use, sub_81C679C
- .4byte gText_EmptyString2, NULL
-
-gUnknown_0861F308:: @ 861F308
- .byte 0x00, 0x02, 0x01, 0x03
-
-gUnknown_0861F30C:: @ 861F30C
- .byte 0x01, 0x03
-
-gUnknown_0861F30E:: @ 861F30E
- .byte 0x04, 0x03
-
-gUnknown_0861F310:: @ 861F310
- .byte 0x03, 0x00, 0x00, 0x00
-
-gUnknown_0861F314:: @ 861F314
- .4byte sub_81C654C
- .4byte sub_81C63D0
-
-gUnknown_0861F31C:: @ 861F31C
- .byte 0x00, 0x02, 0x03, 0x00, 0x03, 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00
-
- .align 2
-gUnknown_0861F328:: @ 861F328
- window_template 0x00, 0x0e, 0x02, 0x0f, 0x10, 0x0f, 0x001e
- window_template 0x00, 0x00, 0x0d, 0x0e, 0x06, 0x0f, 0x010e
- window_template 0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0162
- window_template 0x01, 0x18, 0x11, 0x05, 0x02, 0x0f, 0x01ce
- null_window_template
-
- .align 2
-gUnknown_0861F350:: @ 861F350
- window_template 0x01, 0x16, 0x11, 0x07, 0x02, 0x0f, 0x01d8
- window_template 0x01, 0x16, 0x0f, 0x07, 0x04, 0x0f, 0x01d8
- window_template 0x01, 0x0f, 0x0f, 0x0e, 0x04, 0x0f, 0x01d8
- window_template 0x01, 0x0f, 0x0d, 0x0e, 0x06, 0x0f, 0x01d8
-
- .align 2
-gUnknown_0861F370:: @ 861F370
- window_template 0x01, 0x18, 0x0f, 0x05, 0x04, 0x0f, 0x01d8
-
- .align 2
-gOamData_861F378:: @ 861F378
- .2byte 0x0100, 0xc000, 0x0400, 0x0000
-
- .align 2
-gSpriteAnim_861F380:: @ 861F380
- .2byte 0x0000, 0x0004, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_861F388:: @ 861F388
- .4byte gSpriteAnim_861F380
-
- .align 2
-gSpriteAffineAnim_861F38C:: @ 861F38C
- .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gSpriteAffineAnim_861F39C:: @ 861F39C
- .2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000
- .2byte 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gSpriteAffineAnimTable_861F3C4:: @ 861F3C4
- .4byte gSpriteAffineAnim_861F38C
- .4byte gSpriteAffineAnim_861F39C
-
- .align 2
-gUnknown_0861F3CC:: @ 861F3CC
- obj_tiles gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024
-
- .align 2
-gUnknown_0861F3D4:: @ 861F3D4
- spr_template 0x1024, 0x1024, gOamData_861F378, gSpriteAnimTable_861F388, NULL, gSpriteAffineAnimTable_861F3C4, SpriteCallbackDummy
-
diff --git a/data/specials.inc b/data/specials.inc
index d0d04837a..9cc3d41ea 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
diff --git a/data/text/nature_names.inc b/data/text/nature_names.inc
deleted file mode 100644
index 31e2876e2..000000000
--- a/data/text/nature_names.inc
+++ /dev/null
@@ -1,102 +0,0 @@
-gHardyNatureName:: @ 861CAAC
- .string "HARDY$"
-
-gLonelyNatureName:: @ 861CAB2
- .string "LONELY$"
-
-gBraveNatureName:: @ 861CAB9
- .string "BRAVE$"
-
-gAdamantNatureName:: @ 861CABF
- .string "ADAMANT$"
-
-gNaughtyNatureName:: @ 861CAC7
- .string "NAUGHTY$"
-
-gBoldNatureName:: @ 861CACF
- .string "BOLD$"
-
-gDocileNatureName:: @ 861CAD4
- .string "DOCILE$"
-
-gRelaxedNatureName:: @ 861CADB
- .string "RELAXED$"
-
-gImpishNatureName:: @ 861CAE3
- .string "IMPISH$"
-
-gLaxNatureName:: @ 861CAEA
- .string "LAX$"
-
-gTimidNatureName:: @ 861CAEE
- .string "TIMID$"
-
-gHastyNatureName:: @ 861CAF4
- .string "HASTY$"
-
-gSeriousNatureName:: @ 861CAFA
- .string "SERIOUS$"
-
-gJollyNatureName:: @ 861CB02
- .string "JOLLY$"
-
-gNaiveNatureName:: @ 861CB08
- .string "NAIVE$"
-
-gModestNatureName:: @ 861CB0E
- .string "MODEST$"
-
-gMildNatureName:: @ 861CB15
- .string "MILD$"
-
-gQuietNatureName:: @ 861CB1A
- .string "QUIET$"
-
-gBashfulNatureName:: @ 861CB20
- .string "BASHFUL$"
-
-gRashNatureName:: @ 861CB28
- .string "RASH$"
-
-gCalmNatureName:: @ 861CB2D
- .string "CALM$"
-
-gGentleNatureName:: @ 861CB32
- .string "GENTLE$"
-
-gSassyNatureName:: @ 861CB39
- .string "SASSY$"
-
-gCarefulNatureName:: @ 861CB3F
- .string "CAREFUL$"
-
-gQuirkyNatureName:: @ 861CB47
- .string "QUIRKY$"
-
- .align 2
-gNatureNamePointers:: @ 861CB50
- .4byte gHardyNatureName
- .4byte gLonelyNatureName
- .4byte gBraveNatureName
- .4byte gAdamantNatureName
- .4byte gNaughtyNatureName
- .4byte gBoldNatureName
- .4byte gDocileNatureName
- .4byte gRelaxedNatureName
- .4byte gImpishNatureName
- .4byte gLaxNatureName
- .4byte gTimidNatureName
- .4byte gHastyNatureName
- .4byte gSeriousNatureName
- .4byte gJollyNatureName
- .4byte gNaiveNatureName
- .4byte gModestNatureName
- .4byte gMildNatureName
- .4byte gQuietNatureName
- .4byte gBashfulNatureName
- .4byte gRashNatureName
- .4byte gCalmNatureName
- .4byte gGentleNatureName
- .4byte gSassyNatureName
- .4byte gCarefulNatureName
- .4byte gQuirkyNatureName
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 04:02:48 +0000