dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dump Battle Tower data left over from R/S-J

Browse Source
This commit is contained in:
PikalaxALT
2019-11-07 20:28:39 -05:00
parent 391ac755b3
commit e97a442590
6 changed files with 3222 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_tower.s
+33 -33
View File
@@ -968,7 +968,7 @@ _080E60A4:
_080E60C0: .4byte gFacilityClassToPicIndex
_080E60C4:
ldr r3, _080E60DC @ =gFacilityClassToPicIndex
ldr r2, _080E60E0 @ =gUnknown_83FFAC4
ldr r2, _080E60E0 @ =gBattleTowerTrainers
ldrb r1, [r1]
lsls r0, r1, 2
adds r0, r1
@@ -982,7 +982,7 @@ _080E60D6:
bx r1
.align 2, 0
_080E60DC: .4byte gFacilityClassToPicIndex
_080E60E0: .4byte gUnknown_83FFAC4
_080E60E0: .4byte gBattleTowerTrainers
thumb_func_end GetBattleTowerTrainerFrontSpriteId
thumb_func_start sub_80E60E4
@@ -1010,7 +1010,7 @@ _080E6110:
cmp r0, 0x63
bhi _080E6130
ldr r3, _080E6128 @ =gFacilityClassToTrainerClass
ldr r2, _080E612C @ =gUnknown_83FFAC4
ldr r2, _080E612C @ =gBattleTowerTrainers
ldrb r1, [r1]
lsls r0, r1, 2
adds r0, r1
@@ -1021,7 +1021,7 @@ _080E6110:
b _080E6144
.align 2, 0
_080E6128: .4byte gFacilityClassToTrainerClass
_080E612C: .4byte gUnknown_83FFAC4
_080E612C: .4byte gBattleTowerTrainers
_080E6130:
ldr r2, _080E614C @ =gFacilityClassToTrainerClass
ldrb r0, [r1]
@@ -1073,7 +1073,7 @@ _080E6184:
bhi _080E61AC
movs r3, 0
adds r5, r0, 0
ldr r6, _080E61A8 @ =gUnknown_83FFAC5
ldr r6, _080E61A8 @ =gBattleTowerTrainers + 1
_080E618E:
adds r2, r4, r3
ldrb r1, [r5]
@@ -1089,7 +1089,7 @@ _080E618E:
ble _080E618E
b _080E61CE
.align 2, 0
_080E61A8: .4byte gUnknown_83FFAC5
_080E61A8: .4byte gBattleTowerTrainers + 1
_080E61AC:
movs r3, 0
adds r5, r0, 0
@@ -1272,7 +1272,7 @@ _080E62F4:
adds r1, r2, 0
cmp r0, 0
beq _080E6320
ldr r2, _080E631C @ =gUnknown_8400E04
ldr r2, _080E631C @ =gBattleTowerLevel100Mons
mov r10, r2
movs r3, 0x64
str r3, [sp, 0x10]
@@ -1280,14 +1280,14 @@ _080E62F4:
.align 2, 0
_080E6314: .4byte gSaveBlock2Ptr
_080E6318: .4byte 0x0000055c
_080E631C: .4byte gUnknown_8400E04
_080E631C: .4byte gBattleTowerLevel100Mons
_080E6320:
ldr r0, _080E6378 @ =gUnknown_83FFB44
ldr r0, _080E6378 @ =gBattleTowerLevel50Mons
mov r10, r0
movs r2, 0x32
str r2, [sp, 0x10]
_080E6328:
ldr r2, _080E637C @ =gUnknown_83FFAC4
ldr r2, _080E637C @ =gBattleTowerTrainers
ldr r0, [r1]
ldr r3, _080E6380 @ =0x0000056c
adds r0, r3
@@ -1328,8 +1328,8 @@ _080E636A:
movs r4, 0
b _080E6388
.align 2, 0
_080E6378: .4byte gUnknown_83FFB44
_080E637C: .4byte gUnknown_83FFAC4
_080E6378: .4byte gBattleTowerLevel50Mons
_080E637C: .4byte gBattleTowerTrainers
_080E6380: .4byte 0x0000056c
_080E6384:
adds r4, 0x64
@@ -1353,7 +1353,7 @@ _080E63A2:
movs r5, 0
cmp r5, r6
bge _080E63F0
ldr r3, _080E64BC @ =gUnknown_83FFAC4
ldr r3, _080E64BC @ =sBattleTowerHeldItems
mov r9, r3
lsls r0, r7, 4
add r0, r10
@@ -1470,7 +1470,7 @@ _080E646E:
add r0, r10
ldrb r2, [r0, 0x2]
lsls r2, 1
ldr r0, _080E64BC @ =gUnknown_83FFAC4
ldr r0, _080E64BC @ =sBattleTowerHeldItems
adds r2, r0
adds r0, r4, 0
movs r1, 0xC
@@ -1491,7 +1491,7 @@ _080E64A6:
bx r0
.align 2, 0
_080E64B8: .4byte gEnemyParty
_080E64BC: .4byte gUnknown_83FFAC4
_080E64BC: .4byte sBattleTowerHeldItems
thumb_func_end sub_80E61DC
thumb_func_start sub_80E64C0
@@ -1603,7 +1603,7 @@ sub_80E6564: @ 80E6564
beq _080E6632
cmp r4, 0
beq _080E6632
ldr r0, _080E6640 @ =gUnknown_84020C4
ldr r0, _080E6640 @ =gBattleTowerBannedSpecies
ldrh r1, [r0]
ldr r5, _080E6644 @ =0x0000ffff
adds r3, r0, 0
@@ -1696,7 +1696,7 @@ _080E6632:
pop {r0}
bx r0
.align 2, 0
_080E6640: .4byte gUnknown_84020C4
_080E6640: .4byte gBattleTowerBannedSpecies
_080E6644: .4byte 0x0000ffff
thumb_func_end sub_80E6564
@@ -1775,7 +1775,7 @@ _080E6662:
movs r0, 0
mov r1, r9
strb r0, [r1]
ldr r2, _080E6734 @ =gUnknown_84020C4
ldr r2, _080E6734 @ =gBattleTowerBannedSpecies
ldrh r0, [r2]
ldr r1, _080E6738 @ =0x0000ffff
cmp r0, r1
@@ -1813,7 +1813,7 @@ _080E6724: .4byte gPlayerParty
_080E6728: .4byte gSpecialVar_Result
_080E672C: .4byte gStringVar1
_080E6730: .4byte gSpecialVar_0x8004
_080E6734: .4byte gUnknown_84020C4
_080E6734: .4byte gBattleTowerBannedSpecies
_080E6738: .4byte 0x0000ffff
_080E673C: .4byte gUnknown_83FE860
_080E6740:
@@ -1943,12 +1943,12 @@ _080E6820:
lsls r0, r1, 2
adds r0, r1
lsls r0, 2
ldr r1, _080E6838 @ =gUnknown_83FFACA
ldr r1, _080E6838 @ =gBattleTowerTrainers + 6
adds r0, r1
bl sub_80E678C
b _080E684C
.align 2, 0
_080E6838: .4byte gUnknown_83FFACA
_080E6838: .4byte gBattleTowerTrainers + 6
_080E683C:
ldrb r1, [r0]
movs r0, 0xA4
@@ -2772,14 +2772,14 @@ sub_80E6EE0: @ 80E6EE0
ldrb r0, [r2, 0x8]
cmp r0, 0
beq _080E6F0C
ldr r4, _080E6F08 @ =gUnknown_84020C4
ldr r4, _080E6F08 @ =sFemaleTrainerClasses
b _080E6F0E
.align 2, 0
_080E6F00: .4byte gSaveBlock2Ptr
_080E6F04: .4byte 0x0000055c
_080E6F08: .4byte gUnknown_84020C4
_080E6F08: .4byte sFemaleTrainerClasses
_080E6F0C:
ldr r4, _080E6FA0 @ =gUnknown_84020C4
ldr r4, _080E6FA0 @ =sMaleTrainerClasses
_080E6F0E:
ldrb r0, [r2, 0xA]
ldrb r1, [r2, 0xB]
@@ -2850,7 +2850,7 @@ _080E6F68:
pop {r0}
bx r0
.align 2, 0
_080E6FA0: .4byte gUnknown_84020C4
_080E6FA0: .4byte sMaleTrainerClasses
_080E6FA4: .4byte gSaveBlock2Ptr
_080E6FA8: .4byte gSaveBlock1Ptr
_080E6FAC: .4byte 0x00002cac
@@ -3162,7 +3162,7 @@ DetermineBattleTowerPrize: @ 80E71D0
ble _080E7220
bl Random
ldr r4, [r4]
ldr r5, _080E721C @ =gUnknown_84020E6
ldr r5, _080E721C @ =sLongStreakPrizes
lsls r0, 16
lsrs r0, 16
movs r1, 0x9
@@ -3178,11 +3178,11 @@ DetermineBattleTowerPrize: @ 80E71D0
.align 2, 0
_080E7214: .4byte gSaveBlock2Ptr
_080E7218: .4byte 0x0000055c
_080E721C: .4byte gUnknown_84020E6
_080E721C: .4byte sLongStreakPrizes
_080E7220:
bl Random
ldr r4, [r4]
ldr r5, _080E7248 @ =gUnknown_84020DA
ldr r5, _080E7248 @ =sShortStreakPrizes
lsls r0, 16
lsrs r0, 16
movs r1, 0x6
@@ -3200,7 +3200,7 @@ _080E7240:
pop {r0}
bx r0
.align 2, 0
_080E7248: .4byte gUnknown_84020DA
_080E7248: .4byte sShortStreakPrizes
thumb_func_end DetermineBattleTowerPrize
thumb_func_start GiveBattleTowerPrize
@@ -3345,13 +3345,13 @@ sub_80E7348: @ 80E7348
adds r5, r1, 0
cmp r0, 0
beq _080E7370
ldr r4, _080E736C @ =gUnknown_84020C4
ldr r4, _080E736C @ =sFemaleTrainerClasses
b _080E7372
.align 2, 0
_080E7368: .4byte gSaveBlock2Ptr
_080E736C: .4byte gUnknown_84020C4
_080E736C: .4byte sFemaleTrainerClasses
_080E7370:
ldr r4, _080E7410 @ =gUnknown_84020C4
ldr r4, _080E7410 @ =sMaleTrainerClasses
_080E7372:
ldrb r0, [r2, 0xA]
ldrb r1, [r2, 0xB]
@@ -3429,7 +3429,7 @@ _080E73E2:
pop {r0}
bx r0
.align 2, 0
_080E7410: .4byte gUnknown_84020C4
_080E7410: .4byte sMaleTrainerClasses
_080E7414: .4byte gSaveBlock1Ptr
_080E7418: .4byte 0x00002cac
_080E741C: .4byte gPlayerParty
asm/party_menu.s
+2 -2
View File
@@ -17510,7 +17510,7 @@ _081275AE:
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
ldr r3, _081275F0 @ =gUnknown_84020C4
ldr r3, _081275F0 @ =gBattleTowerBannedSpecies
lsls r1, r5, 1
adds r0, r1, r3
ldrh r0, [r0]
@@ -17539,7 +17539,7 @@ _081275E2:
.align 2, 0
_081275E8: .4byte gSaveBlock2Ptr
_081275EC: .4byte 0x0000055c
_081275F0: .4byte gUnknown_84020C4
_081275F0: .4byte gBattleTowerBannedSpecies
_081275F4: .4byte 0x0000ffff
thumb_func_end sub_8127550
baserom.ips
BIN
View File
Binary file not shown.
data/battle_tower.s
+3111 -19
View File
File diff suppressed because it is too large Load Diff
include/battle_tower.h
+1
View File
@@ -2,6 +2,7 @@
#define GUARD_BATTLE_TOWER_H
#include "global.h"
#include "constants/battle_tower.h"
u16 sub_8164FCC(u8, u8);
void sub_80E7524(struct BattleTowerEReaderTrainer *);
include/constants/battle_tower.h
+75
View File
@@ -0,0 +1,75 @@
#ifndef GUARD_CONSTANTS_BATTLE_TOWER_H
#define GUARD_CONSTANTS_BATTLE_TOWER_H
#define F_EV_SPREAD_HP 1 << 0
#define F_EV_SPREAD_ATTACK 1 << 1
#define F_EV_SPREAD_DEFENSE 1 << 2
#define F_EV_SPREAD_SPEED 1 << 3
#define F_EV_SPREAD_SP_ATTACK 1 << 4
#define F_EV_SPREAD_SP_DEFENSE 1 << 5
#define BATTLE_TOWER_ITEM_NONE 0
#define BATTLE_TOWER_ITEM_KINGS_ROCK 1
#define BATTLE_TOWER_ITEM_SITRUS_BERRY 2
#define BATTLE_TOWER_ITEM_ORAN_BERRY 3
#define BATTLE_TOWER_ITEM_CHESTO_BERRY 4
#define BATTLE_TOWER_ITEM_HARD_STONE 5
#define BATTLE_TOWER_ITEM_FOCUS_BAND 6
#define BATTLE_TOWER_ITEM_PERSIM_BERRY 7
#define BATTLE_TOWER_ITEM_MIRACLE_SEED 8
#define BATTLE_TOWER_ITEM_BERRY_JUICE 9
#define BATTLE_TOWER_ITEM_MACHO_BRACE 10
#define BATTLE_TOWER_ITEM_SILVER_POWDER 11
#define BATTLE_TOWER_ITEM_CHERI_BERRY 12
#define BATTLE_TOWER_ITEM_BLACK_GLASSES 13
#define BATTLE_TOWER_ITEM_BLACK_BELT 14
#define BATTLE_TOWER_ITEM_SOUL_DEW 15
#define BATTLE_TOWER_ITEM_CHOICE_BAND 16
#define BATTLE_TOWER_ITEM_MAGNET 17
#define BATTLE_TOWER_ITEM_SILK_SCARF 18
#define BATTLE_TOWER_ITEM_WHITE_HERB 19
#define BATTLE_TOWER_ITEM_DEEP_SEA_SCALE 20
#define BATTLE_TOWER_ITEM_DEEP_SEA_TOOTH 21
#define BATTLE_TOWER_ITEM_MYSTIC_WATER 22
#define BATTLE_TOWER_ITEM_SHARP_BEAK 23
#define BATTLE_TOWER_ITEM_QUICK_CLAW 24
#define BATTLE_TOWER_ITEM_LEFTOVERS 25
#define BATTLE_TOWER_ITEM_RAWST_BERRY 26
#define BATTLE_TOWER_ITEM_LIGHT_BALL 27
#define BATTLE_TOWER_ITEM_POISON_BARB 28
#define BATTLE_TOWER_ITEM_NEVER_MELT_ICE 29
#define BATTLE_TOWER_ITEM_ASPEAR_BERRY 30
#define BATTLE_TOWER_ITEM_SPELL_TAG 31
#define BATTLE_TOWER_ITEM_BRIGHT_POWDER 32
#define BATTLE_TOWER_ITEM_LEPPA_BERRY 33
#define BATTLE_TOWER_ITEM_SCOPE_LENS 34
#define BATTLE_TOWER_ITEM_TWISTED_SPOON 35
#define BATTLE_TOWER_ITEM_METAL_COAT 36
#define BATTLE_TOWER_ITEM_MENTAL_HERB 37
#define BATTLE_TOWER_ITEM_CHARCOAL 38
#define BATTLE_TOWER_ITEM_PECHA_BERRY 39
#define BATTLE_TOWER_ITEM_SOFT_SAND 40
#define BATTLE_TOWER_ITEM_LUM_BERRY 41
#define BATTLE_TOWER_ITEM_DRAGON_SCALE 42
#define BATTLE_TOWER_ITEM_DRAGON_FANG 43
#define BATTLE_TOWER_ITEM_IAPAPA_BERRY 44
#define BATTLE_TOWER_ITEM_WIKI_BERRY 45
#define BATTLE_TOWER_ITEM_SEA_INCENSE 46
#define BATTLE_TOWER_ITEM_SHELL_BELL 47
#define BATTLE_TOWER_ITEM_SALAC_BERRY 48
#define BATTLE_TOWER_ITEM_LANSAT_BERRY 49
#define BATTLE_TOWER_ITEM_APICOT_BERRY 50
#define BATTLE_TOWER_ITEM_STARF_BERRY 51
#define BATTLE_TOWER_ITEM_LIECHI_BERRY 52
#define BATTLE_TOWER_ITEM_STICK 53
#define BATTLE_TOWER_ITEM_LAX_INCENSE 54
#define BATTLE_TOWER_ITEM_AGUAV_BERRY 55
#define BATTLE_TOWER_ITEM_FIGY_BERRY 56
#define BATTLE_TOWER_ITEM_THICK_CLUB 57
#define BATTLE_TOWER_ITEM_MAGO_BERRY 58
#define BATTLE_TOWER_ITEM_METAL_POWDER 59
#define BATTLE_TOWER_ITEM_PETAYA_BERRY 60
#define BATTLE_TOWER_ITEM_LUCKY_PUNCH 61
#define BATTLE_TOWER_ITEM_GANLON_BERRY 62
#endif //GUARD_CONSTANTS_BATTLE_TOWER_H