pret/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-03 16:15:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

battle tower data

Browse Source
This commit is contained in:
YamaArashi
2016-01-27 19:26:48 -08:00
parent 01249e00c2
commit 6b1a22202f
8 changed files with 6858 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/rom.s
+9 -9
View File
@@ -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
constants/battle_tower_constants.s
+70
View File
@@ -0,0 +1,70 @@
.set F_EV_SPREAD_HP, 1 << 0
.set F_EV_SPREAD_ATTACK, 1 << 1
.set F_EV_SPREAD_DEFENSE, 1 << 2
.set F_EV_SPREAD_SPEED, 1 << 3
.set F_EV_SPREAD_SP_ATTACK, 1 << 4
.set F_EV_SPREAD_SP_DEFENSE, 1 << 5
.set BATTLE_TOWER_ITEM_NONE, 0
.set BATTLE_TOWER_ITEM_KINGS_ROCK, 1
.set BATTLE_TOWER_ITEM_SITRUS_BERRY, 2
.set BATTLE_TOWER_ITEM_ORAN_BERRY, 3
.set BATTLE_TOWER_ITEM_CHESTO_BERRY, 4
.set BATTLE_TOWER_ITEM_HARD_STONE, 5
.set BATTLE_TOWER_ITEM_FOCUS_BAND, 6
.set BATTLE_TOWER_ITEM_PERSIM_BERRY, 7
.set BATTLE_TOWER_ITEM_MIRACLE_SEED, 8
.set BATTLE_TOWER_ITEM_BERRY_JUICE, 9
.set BATTLE_TOWER_ITEM_MACHO_BRACE, 10
.set BATTLE_TOWER_ITEM_SILVER_POWDER, 11
.set BATTLE_TOWER_ITEM_CHERI_BERRY, 12
.set BATTLE_TOWER_ITEM_BLACK_GLASSES, 13
.set BATTLE_TOWER_ITEM_BLACK_BELT, 14
.set BATTLE_TOWER_ITEM_SOUL_DEW, 15
.set BATTLE_TOWER_ITEM_CHOICE_BAND, 16
.set BATTLE_TOWER_ITEM_MAGNET, 17
.set BATTLE_TOWER_ITEM_SILK_SCARF, 18
.set BATTLE_TOWER_ITEM_WHITE_HERB, 19
.set BATTLE_TOWER_ITEM_DEEP_SEA_SCALE, 20
.set BATTLE_TOWER_ITEM_DEEP_SEA_TOOTH, 21
.set BATTLE_TOWER_ITEM_MYSTIC_WATER, 22
.set BATTLE_TOWER_ITEM_SHARP_BEAK, 23
.set BATTLE_TOWER_ITEM_QUICK_CLAW, 24
.set BATTLE_TOWER_ITEM_LEFTOVERS, 25
.set BATTLE_TOWER_ITEM_RAWST_BERRY, 26
.set BATTLE_TOWER_ITEM_LIGHT_BALL, 27
.set BATTLE_TOWER_ITEM_POISON_BARB, 28
.set BATTLE_TOWER_ITEM_NEVER_MELT_ICE, 29
.set BATTLE_TOWER_ITEM_ASPEAR_BERRY, 30
.set BATTLE_TOWER_ITEM_SPELL_TAG, 31
.set BATTLE_TOWER_ITEM_BRIGHT_POWDER, 32
.set BATTLE_TOWER_ITEM_LEPPA_BERRY, 33
.set BATTLE_TOWER_ITEM_SCOPE_LENS, 34
.set BATTLE_TOWER_ITEM_TWISTED_SPOON, 35
.set BATTLE_TOWER_ITEM_METAL_COAT, 36
.set BATTLE_TOWER_ITEM_MENTAL_HERB, 37
.set BATTLE_TOWER_ITEM_CHARCOAL, 38
.set BATTLE_TOWER_ITEM_PECHA_BERRY, 39
.set BATTLE_TOWER_ITEM_SOFT_SAND, 40
.set BATTLE_TOWER_ITEM_LUM_BERRY, 41
.set BATTLE_TOWER_ITEM_DRAGON_SCALE, 42
.set BATTLE_TOWER_ITEM_DRAGON_FANG, 43
.set BATTLE_TOWER_ITEM_IAPAPA_BERRY, 44
.set BATTLE_TOWER_ITEM_WIKI_BERRY, 45
.set BATTLE_TOWER_ITEM_SEA_INCENSE, 46
.set BATTLE_TOWER_ITEM_SHELL_BELL, 47
.set BATTLE_TOWER_ITEM_SALAC_BERRY, 48
.set BATTLE_TOWER_ITEM_LANSAT_BERRY, 49
.set BATTLE_TOWER_ITEM_APICOT_BERRY, 50
.set BATTLE_TOWER_ITEM_STARF_BERRY, 51
.set BATTLE_TOWER_ITEM_LIECHI_BERRY, 52
.set BATTLE_TOWER_ITEM_STICK, 53
.set BATTLE_TOWER_ITEM_LAX_INCENSE, 54
.set BATTLE_TOWER_ITEM_AGUAV_BERRY, 55
.set BATTLE_TOWER_ITEM_FIGY_BERRY, 56
.set BATTLE_TOWER_ITEM_THICK_CLUB, 57
.set BATTLE_TOWER_ITEM_MAGO_BERRY, 58
.set BATTLE_TOWER_ITEM_METAL_POWDER, 59
.set BATTLE_TOWER_ITEM_PETAYA_BERRY, 60
.set BATTLE_TOWER_ITEM_LUCKY_PUNCH, 61
.set BATTLE_TOWER_ITEM_GANLON_BERRY, 62
constants/constants.s
+1
View File
@@ -14,3 +14,4 @@
.include "constants/map_constants.s"
.include "constants/berry_constants.s"
.include "constants/field_object_constants.s"
.include "constants/battle_tower_constants.s"
data/battle_tower/held_items.s
+64
View File
@@ -0,0 +1,64 @@
gBattleTowerHeldItems: ; 8403860
.2byte ITEM_NONE
.2byte ITEM_KINGS_ROCK
.2byte ITEM_SITRUS_BERRY
.2byte ITEM_ORAN_BERRY
.2byte ITEM_CHESTO_BERRY
.2byte ITEM_HARD_STONE
.2byte ITEM_FOCUS_BAND
.2byte ITEM_PERSIM_BERRY
.2byte ITEM_MIRACLE_SEED
.2byte ITEM_BERRY_JUICE
.2byte ITEM_MACHO_BRACE
.2byte ITEM_SILVER_POWDER
.2byte ITEM_CHERI_BERRY
.2byte ITEM_BLACK_GLASSES
.2byte ITEM_BLACK_BELT
.2byte ITEM_SOUL_DEW
.2byte ITEM_CHOICE_BAND
.2byte ITEM_MAGNET
.2byte ITEM_SILK_SCARF
.2byte ITEM_WHITE_HERB
.2byte ITEM_DEEP_SEA_SCALE
.2byte ITEM_DEEP_SEA_TOOTH
.2byte ITEM_MYSTIC_WATER
.2byte ITEM_SHARP_BEAK
.2byte ITEM_QUICK_CLAW
.2byte ITEM_LEFTOVERS
.2byte ITEM_RAWST_BERRY
.2byte ITEM_LIGHT_BALL
.2byte ITEM_POISON_BARB
.2byte ITEM_NEVER_MELT_ICE
.2byte ITEM_ASPEAR_BERRY
.2byte ITEM_SPELL_TAG
.2byte ITEM_BRIGHT_POWDER
.2byte ITEM_LEPPA_BERRY
.2byte ITEM_SCOPE_LENS
.2byte ITEM_TWISTED_SPOON
.2byte ITEM_METAL_COAT
.2byte ITEM_MENTAL_HERB
.2byte ITEM_CHARCOAL
.2byte ITEM_PECHA_BERRY
.2byte ITEM_SOFT_SAND
.2byte ITEM_LUM_BERRY
.2byte ITEM_DRAGON_SCALE
.2byte ITEM_DRAGON_FANG
.2byte ITEM_IAPAPA_BERRY
.2byte ITEM_WIKI_BERRY
.2byte ITEM_SEA_INCENSE
.2byte ITEM_SHELL_BELL
.2byte ITEM_SALAC_BERRY
.2byte ITEM_LANSAT_BERRY
.2byte ITEM_APICOT_BERRY
.2byte ITEM_STARF_BERRY
.2byte ITEM_LIECHI_BERRY
.2byte ITEM_STICK
.2byte ITEM_LAX_INCENSE
.2byte ITEM_AGUAV_BERRY
.2byte ITEM_FIGY_BERRY
.2byte ITEM_THICK_CLUB
.2byte ITEM_MAGO_BERRY
.2byte ITEM_METAL_POWDER
.2byte ITEM_PETAYA_BERRY
.2byte ITEM_LUCKY_PUNCH
.2byte ITEM_GANLON_BERRY
data/battle_tower/level_100_mons.s
+2702
View File
File diff suppressed because it is too large Load Diff
data/battle_tower/level_50_mons.s
+2702
View File
File diff suppressed because it is too large Load Diff
data/battle_tower/trainers.s
+1302
View File
File diff suppressed because it is too large Load Diff
data/data2.s
+8 -11
View File
@@ -5798,20 +5798,17 @@ gUnknown_08402E40: ; 8402E40
gUnknown_08402E80: ; 8402E80
.incbin "baserom.gba", 0x00402e80, 0x80
gUnknown_08402F00: ; 8402F00
.incbin "baserom.gba", 0x00402f00, 0xc
; 8402F00
.include "data/battle_tower/trainers.s"
gUnknown_08402F0C: ; 8402F0C
.incbin "baserom.gba", 0x00402f0c, 0x954
; 8403860
.include "data/battle_tower/held_items.s"
gUnknown_08403860: ; 8403860
.incbin "baserom.gba", 0x00403860, 0x80
; 84038E0
.include "data/battle_tower/level_50_mons.s"
gUnknown_084038E0: ; 84038E0
.incbin "baserom.gba", 0x004038e0, 0x12c0
gUnknown_08404BA0: ; 8404BA0
.incbin "baserom.gba", 0x00404ba0, 0x12c0
; 8404BA0
.include "data/battle_tower/level_100_mons.s"
gUnknown_08405E60: ; 8405E60
.incbin "baserom.gba", 0x00405e60, 0x1e