summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-10-25 21:27:10 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-10-25 21:27:10 +0200
commit1efdaebe2395c8c202b2086d485b7f348dc42783 (patch)
tree3a0c19b562e164460a1f6509bb316450aaf12f50 /data
parent549b669f2aa397c9d784de2ff9b91459ab26c060 (diff)
finish decompiling battle tower
Diffstat (limited to 'data')
-rw-r--r--data/battle_tower.s54
-rw-r--r--data/use_pokeblock.s2
2 files changed, 2 insertions, 54 deletions
diff --git a/data/battle_tower.s b/data/battle_tower.s
index 63eec4347..9f7e1ade4 100644
--- a/data/battle_tower.s
+++ b/data/battle_tower.s
@@ -677,57 +677,3 @@ gUnknown_085DD6DC:: @ 85DD6DC
@ 85DF69C
.include "data/battle_frontier/fallarbor_battle_tent_mons.inc"
-
- .align 2
-gUnknown_085DF96C:: @ 85DF96C
- .4byte sub_8161F94
- .4byte sub_8162054
- .4byte sub_81620F4
- .4byte ChooseNextBattleTowerTrainer
- .4byte sub_81621C0
- .4byte AwardBattleTowerRibbons
- .4byte SaveBattleTowerProgress
- .4byte sub_8163914
- .4byte nullsub_61
- .4byte nullsub_116
- .4byte sub_81642A0
- .4byte sub_8164828
- .4byte sub_8164B74
- .4byte sub_8164DCC
- .4byte sub_8164DE4
- .4byte sub_8164E04
-
- .align 2
-gUnknown_085DF9AC:: @ 85DF9AC
- .4byte 0x00000001, 0x00000002, 0x00004000, 0x00008000, 0x00010000, 0x00020000, 0x00040000, 0x00080000
-
- .align 2
-gUnknown_085DF9CC:: @ 85DF9CC
- .4byte 0xfffffffe, 0xfffffffd, 0xffffbfff, 0xffff7fff, 0xfffeffff, 0xfffdffff, 0xfffbffff, 0xfff7ffff
-
-gUnknown_085DF9EC:: @ 85DF9EC
- .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c
-
-gUnknown_085DF9F6:: @ 85DF9F6
- .byte 0x03, 0x04, 0x02, 0x02
-
- .align 1
-gUnknown_085DF9FA:: @ 85DF9FA
- .2byte 0x0000, 0x0063, 0x0050, 0x0077, 0x0064, 0x008b, 0x0078, 0x009f, 0x008c, 0x00b3, 0x00a0, 0x00c7, 0x00b4, 0x00db, 0x00c8, 0x012b
-
- .align 1
-gUnknown_085DFA1A:: @ 85DFA1A
- .2byte 0x0064, 0x0077, 0x0078, 0x008b, 0x008c, 0x009f, 0x00a0, 0x00b3, 0x00b4, 0x00c7, 0x00c8, 0x00db, 0x00dc, 0x00ef, 0x00c8, 0x012b
- .2byte 0x00b3, 0x008d, 0x00c8, 0x00b7
-
-gUnknown_085DFA42:: @ 85DFA42
- .byte 0x03, 0x04, 0x02, 0x02
-
- .align 1
-gUnknown_085DFA46:: @ 85DFA46
- .2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01
-
- .align 1
-gUnknown_085DFA52:: @ 85DFA52
- .2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04, 0x0000
-
diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s
index 8497f59ad..c257961d3 100644
--- a/data/use_pokeblock.s
+++ b/data/use_pokeblock.s
@@ -2,6 +2,8 @@
.include "constants/constants.inc"
.section .rodata
+
+.align 4
gUnknown_085DFA60:: @ 85DFA60
.incbin "graphics/interface/85DFA60.bin"