summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-03-08 22:33:40 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-03-08 22:33:40 -0500
commit88c37818800e1216dc7d40cfefa0a9ab5f249671 (patch)
tree696db4e84623dbf79ff170554a7c8a749c30fb15 /data
parentb7cfa9d36537b8ae53012eb88d59f8b842fb35c4 (diff)
Move text pointer tables into C
Diffstat (limited to 'data')
-rw-r--r--data/contest.s136
-rw-r--r--data/text/contest_text_pointers.inc78
2 files changed, 0 insertions, 214 deletions
diff --git a/data/contest.s b/data/contest.s
index a0aaa62f2..aba96d54f 100644
--- a/data/contest.s
+++ b/data/contest.s
@@ -6,142 +6,6 @@
.section .rodata
.align 2, 0
-@ 8587C50
- .include "data/text/contest_text_pointers.inc"
-
- .align 2
-gUnknown_08587D5C:: @ 8587D5C
- .4byte gText_0827D5C1
- .4byte gText_0827D5DC
- .4byte gText_0827D600
- .4byte gText_0827D612
- .4byte gText_0827D612
- .4byte gText_0827D62D
- .4byte gText_0827D654
- .4byte gText_0827D67E
- .4byte gText_0827D69C
- .4byte gText_0827D6BA
- .4byte gText_0827D6E5
- .4byte gText_0827D706
- .4byte gText_0827D71D
-
- .align 2
-gUnknown_08587D90:: @ 8587D90
- .4byte gText_0827D743
- .4byte gText_0827D764
- .4byte gText_0827D785
- .4byte gText_0827D7A5
- .4byte gText_0827D7C8
- .4byte gText_0827D7E8
- .4byte gText_0827D831
- .4byte gText_0827D855
- .4byte gText_0827D830
- .4byte gText_0827D872
- .4byte gText_0827D88F
- .4byte gText_0827D8B5
- .4byte gText_0827D8E4
- .4byte gText_0827D8FE
- .4byte gText_0827D926
- .4byte gText_0827D947
- .4byte gText_0827D961
- .4byte gText_0827D986
- .4byte gText_0827D9B1
- .4byte gText_0827D9D9
- .4byte gText_0827DA03
- .4byte gText_0827DA31
- .4byte gText_0827DA5B
- .4byte gText_0827DA85
- .4byte gText_0827DAB2
- .4byte gText_0827DADA
- .4byte gText_0827DB03
- .4byte gText_0827D830
- .4byte gText_0827D830
- .4byte gText_0827D830
- .4byte gText_0827DB1F
- .4byte gText_0827DB4E
-
- .align 2
-gUnknown_08587E10:: @ 8587E10
- .4byte gText_827DB75
- .4byte gText_827DBB0
- .4byte gText_827DBE0
- .4byte gText_827DC0F
- .4byte gText_827DC45
- .4byte gText_827DC7C
- .4byte gText_827DCB4
- .4byte gText_827DCE7
- .4byte gText_827DD12
- .4byte gText_827DD3D
- .4byte gText_827DD6F
- .4byte gText_827DD8E
- .4byte gText_827DDC7
- .4byte gText_827DDF2
- .4byte gText_827DE14
- .4byte gText_827DE44
- .4byte gText_827DE73
- .4byte gText_827DEA5
- .4byte gText_827DED9
- .4byte gText_827DF02
- .4byte gText_827DF3A
- .4byte gText_827DF63
- .4byte gText_827DF8C
- .4byte gText_827DFB8
- .4byte gText_827DFE2
- .4byte gText_827E00C
- .4byte gText_827E02F
- .4byte gText_827E05F
- .4byte gText_827E08B
- .4byte gText_827E0B5
- .4byte gText_827E0DD
- .4byte gText_827E107
- .4byte gText_827E143
- .4byte gText_827E17F
- .4byte gText_827E1BB
- .4byte gText_827E1F3
- .4byte gText_827E220
- .4byte gText_827E254
- .4byte gText_827E289
- .4byte gText_827E2C5
- .4byte gText_0827E2FE
- .4byte gText_0827E32E
- .4byte gText_0827E35B
- .4byte gText_0827E38D
- .4byte gText_0827E3C1
- .4byte gText_0827E3EB
- .4byte gText_0827E416
- .4byte gText_0827E448
- .4byte gText_0827E473
- .4byte gText_0827E4A6
- .4byte gText_0827E4D5
- .4byte gText_0827E504
- .4byte gText_0827E531
- .4byte gText_0827E55A
- .4byte gText_0827E5B2
- .4byte gText_0827E5D0
- .4byte gText_0827E606
- .4byte gText_0827E638
- .4byte gText_0827E658
- .4byte gText_0827E68B
- .4byte gText_0827E6C4
- .4byte gText_0827E7BA
-
- .align 2
-gUnknown_08587F08:: @ 8587F08
- .4byte gText_0827E85F
- .4byte gText_0827E868
- .4byte gText_0827E86F
- .4byte gText_0827E878
- .4byte gText_0827E882
-
- .align 2
-gUnknown_08587F1C:: @ 8587F1C
- .4byte gText_0827E894
- .4byte gText_0827E89E
- .4byte gText_0827E8AA
- .4byte gText_0827E8B4
- .4byte gText_0827E8BF
- .4byte gText_0827E8CA
-
.align 2
gUnknown_08587F34:: @ 8587F34
.4byte 0x00000580, 0x000015e9, 0x000005c2, 0x000031a3
diff --git a/data/text/contest_text_pointers.inc b/data/text/contest_text_pointers.inc
deleted file mode 100644
index f9cf4b70e..000000000
--- a/data/text/contest_text_pointers.inc
+++ /dev/null
@@ -1,78 +0,0 @@
- .align 2
-gContestEffectDescriptionPointers:: @ 8587C50
- .4byte gContestEffect00hDescription
- .4byte gContestEffect01hDescription
- .4byte gContestEffect02hDescription
- .4byte gContestEffect03hDescription
- .4byte gContestEffect04hDescription
- .4byte gContestEffect05hDescription
- .4byte gContestEffect06hDescription
- .4byte gContestEffect07hDescription
- .4byte gContestEffect08hDescription
- .4byte gContestEffect09hDescription
- .4byte gContestEffect0AhDescription
- .4byte gContestEffect0BhDescription
- .4byte gContestEffect0ChDescription
- .4byte gContestEffect0DhDescription
- .4byte gContestEffect0EhDescription
- .4byte gContestEffect0FhDescription
- .4byte gContestEffect10hDescription
- .4byte gContestEffect11hDescription
- .4byte gContestEffect12hDescription
- .4byte gContestEffect13hDescription
- .4byte gContestEffect14hDescription
- .4byte gContestEffect15hDescription
- .4byte gContestEffect16hDescription
- .4byte gContestEffect17hDescription
- .4byte gContestEffect18hDescription
- .4byte gContestEffect19hDescription
- .4byte gContestEffect1AhDescription
- .4byte gContestEffect1BhDescription
- .4byte gContestEffect1ChDescription
- .4byte gContestEffect1DhDescription
- .4byte gContestEffect1EhDescription
- .4byte gContestEffect1FhDescription
- .4byte gContestEffect20hDescription
- .4byte gContestEffect21hDescription
- .4byte gContestEffect22hDescription
- .4byte gContestEffect23hDescription
- .4byte gContestEffect24hDescription
- .4byte gContestEffect25hDescription
- .4byte gContestEffect26hDescription
- .4byte gContestEffect27hDescription
- .4byte gContestEffect28hDescription
- .4byte gContestEffect29hDescription
- .4byte gContestEffect2AhDescription
- .4byte gContestEffect2BhDescription
- .4byte gContestEffect2ChDescription
- .4byte gContestEffect2DhDescription
- .4byte gContestEffect2EhDescription
- .4byte gContestEffect2FhDescription
-
-@ 8587D10
-@ Unreferenced array of pointers to move names.
-@ All of the moves except Conversion are combo starters, so this may have
-@ been an early list of combo starters.
- .align 2
- .4byte gUnusedContestMoveName0
- .4byte gUnusedContestMoveName0
- .4byte gUnusedContestMoveName1
- .4byte gUnusedContestMoveName2
- .4byte gUnusedContestMoveName3
- .4byte gUnusedContestMoveName4
- .4byte gUnusedContestMoveName5
- .4byte gUnusedContestMoveName6
- .4byte gUnusedContestMoveName7
- .4byte gUnusedContestMoveName8
- .4byte gUnusedContestMoveName9
- .4byte gUnusedContestMoveName10
- .4byte gUnusedContestMoveName11
- .4byte gUnusedContestMoveName12
-
- .align 2
-gContestMoveTypeTextPointers:: @ 8587D48
- .4byte gContestMoveTypeCoolText
- .4byte gContestMoveTypeBeautyText
- .4byte gContestMoveTypeCuteText
- .4byte gContestMoveTypeSmartText
- .4byte gContestMoveTypeToughText