summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-01-27 19:26:48 -0800
committerYamaArashi <shadow962@live.com>2016-01-27 19:26:48 -0800
commit6b1a22202feb59ea2cb6441deb55cfd836b50d99 (patch)
tree1122b6e8a5d6086dd22faf9fe2e757377335651f /asm
parent01249e00c2641536e51c30425ec83a553ffad528 (diff)
battle tower data
Diffstat (limited to 'asm')
-rw-r--r--asm/rom.s18
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/rom.s b/asm/rom.s
index 7989ec4ce..3fb24703f 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -634581,7 +634581,7 @@ sub_81349FC: ; 81349FC
lsls r0, 3
b _08134A38
.align 2
-_08134A14: .4byte gUnknown_08402F00
+_08134A14: .4byte gBattleTowerTrainers
_08134A18:
cmp r1, 0xC7
bhi _08134A34
@@ -634955,7 +634955,7 @@ _08134CD2:
bx r1
.align 2
_08134CD8: .4byte gTrainerClassToPicIndex
-_08134CDC: .4byte gUnknown_08402F00
+_08134CDC: .4byte gBattleTowerTrainers
thumb_func_end get_trainer_class_pic_index
thumb_func_start get_trainer_class_name_index
@@ -634993,7 +634993,7 @@ _08134D0C:
b _08134D40
.align 2
_08134D24: .4byte gTrainerClassToNameIndex
-_08134D28: .4byte gUnknown_08402F00
+_08134D28: .4byte gBattleTowerTrainers
_08134D2C:
ldr r2, _08134D48
ldrb r0, [r1]
@@ -635060,7 +635060,7 @@ _08134D94:
ble _08134D94
b _08134DC8
.align 2
-_08134DA4: .4byte gUnknown_08402F00
+_08134DA4: .4byte gBattleTowerTrainers
_08134DA8:
movs r3, 0
ldrb r0, [r1]
@@ -635241,7 +635241,7 @@ _08134ED8:
.align 2
_08134EF4: .4byte 0x02024ea4
_08134EF8: .4byte 0x00000554
-_08134EFC: .4byte gUnknown_08404BA0
+_08134EFC: .4byte gBattleTowerLevel100Mons
_08134F00:
ldr r3, _08134F54
mov r10, r3
@@ -635288,8 +635288,8 @@ _08134F48:
movs r4, 0
b _08134F64
.align 2
-_08134F54: .4byte gUnknown_084038E0
-_08134F58: .4byte gUnknown_08402F00
+_08134F54: .4byte gBattleTowerLevel50Mons
+_08134F58: .4byte gBattleTowerTrainers
_08134F5C: .4byte 0x00000564
_08134F60:
adds r4, 0x64
@@ -635451,7 +635451,7 @@ _08135082:
bx r0
.align 2
_08135094: .4byte 0x030045c0
-_08135098: .4byte gUnknown_08403860
+_08135098: .4byte gBattleTowerHeldItems
thumb_func_end sub_8134DD4
thumb_func_start sub_813509C
@@ -635957,7 +635957,7 @@ _08135498:
bl sub_813545C
b _081354C4
.align 2
-_081354B0: .4byte gUnknown_08402F0C
+_081354B0: .4byte gBattleTowerTrainers + 0xC
_081354B4:
ldrb r1, [r1]
movs r0, 0xA4