summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_frontier_1.s351
-rw-r--r--asm/battle_frontier_2.s6
-rw-r--r--asm/battle_tower.s66
3 files changed, 36 insertions, 387 deletions
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s
index 193bd5e34..7ebc2f256 100644
--- a/asm/battle_frontier_1.s
+++ b/asm/battle_frontier_1.s
@@ -7,357 +7,6 @@
-
-
- thumb_func_start sub_8195960
-sub_8195960: @ 8195960
- push {lr}
- ldr r1, =gUnknown_0860DE50
- ldr r0, =gSpecialVar_0x8004
- ldrh r0, [r0]
- lsls r0, 2
- adds r0, r1
- ldr r0, [r0]
- bl _call_via_r0
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8195960
-
- thumb_func_start sub_8195980
-sub_8195980: @ 8195980
- push {r4-r7,lr}
- ldr r4, =gSaveBlock2Ptr
- ldr r0, [r4]
- ldr r1, =0x00000ca9
- adds r0, r1
- ldrb r0, [r0]
- lsls r0, 30
- lsrs r5, r0, 30
- ldr r0, =0x000040ce
- bl VarGet
- lsls r0, 16
- lsrs r7, r0, 16
- ldr r0, [r4]
- ldr r2, =0x00000ca8
- adds r0, r2
- movs r6, 0
- strb r6, [r0]
- ldr r1, [r4]
- adds r2, 0xA
- adds r0, r1, r2
- strh r6, [r0]
- ldr r0, =0x00000ca9
- adds r1, r0
- ldrb r2, [r1]
- movs r0, 0x5
- negs r0, r0
- ands r0, r2
- strb r0, [r1]
- ldr r1, [r4]
- ldr r2, =0x00000ca9
- adds r1, r2
- ldrb r2, [r1]
- movs r0, 0x9
- negs r0, r0
- ands r0, r2
- strb r0, [r1]
- ldr r4, [r4]
- ldr r0, =0x00000cdc
- adds r3, r4, r0
- ldr r2, =gUnknown_0860DE98
- lsls r1, r5, 2
- lsls r0, r7, 3
- adds r1, r0
- adds r1, r2
- ldr r0, [r3]
- ldr r1, [r1]
- ands r0, r1
- cmp r0, 0
- bne _081959F2
- lsls r0, r5, 1
- lsls r1, r7, 2
- adds r0, r1
- ldr r2, =0x00000dc8
- adds r1, r4, r2
- adds r1, r0
- strh r6, [r1]
-_081959F2:
- ldr r0, =gSaveBlock1Ptr
- ldr r0, [r0]
- movs r1, 0x4
- ldrsb r1, [r0, r1]
- movs r2, 0x5
- ldrsb r2, [r0, r2]
- movs r3, 0x1
- negs r3, r3
- movs r0, 0
- bl saved_warp2_set
- ldr r0, =gTrainerBattleOpponent_A
- strh r6, [r0]
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8195980
-
- thumb_func_start sub_8195A38
-sub_8195A38: @ 8195A38
- push {r4-r7,lr}
- ldr r5, =gSaveBlock2Ptr
- ldr r0, [r5]
- ldr r1, =0x00000ca9
- adds r0, r1
- ldrb r0, [r0]
- lsls r0, 30
- lsrs r7, r0, 30
- ldr r0, =0x000040ce
- bl VarGet
- lsls r0, 16
- lsrs r6, r0, 16
- ldr r0, =gSpecialVar_0x8005
- ldrh r0, [r0]
- cmp r0, 0x1
- beq _08195A90
- cmp r0, 0x1
- bgt _08195A74
- cmp r0, 0
- beq _08195A7A
- b _08195AD0
- .pool
-_08195A74:
- cmp r0, 0x2
- beq _08195AB0
- b _08195AD0
-_08195A7A:
- ldr r0, =gSpecialVar_Result
- ldr r1, [r5]
- ldr r2, =0x00000dc6
- adds r1, r2
- ldrh r1, [r1]
- strh r1, [r0]
- b _08195AD0
- .pool
-_08195A90:
- ldr r3, =gSpecialVar_Result
- ldr r0, [r5]
- lsls r1, r7, 1
- lsls r2, r6, 2
- adds r1, r2
- ldr r2, =0x00000dc8
- adds r0, r2
- adds r0, r1
- ldrh r0, [r0]
- strh r0, [r3]
- b _08195AD0
- .pool
-_08195AB0:
- ldr r4, =gSpecialVar_Result
- ldr r2, [r5]
- ldr r0, =0x00000cdc
- adds r2, r0
- ldr r3, =gUnknown_0860DE98
- lsls r0, r7, 2
- lsls r1, r6, 3
- adds r0, r1
- adds r0, r3
- ldr r1, [r2]
- ldr r0, [r0]
- ands r1, r0
- negs r0, r1
- orrs r0, r1
- lsrs r0, 31
- strh r0, [r4]
-_08195AD0:
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8195A38
-
- thumb_func_start sub_8195AE4
-sub_8195AE4: @ 8195AE4
- push {r4-r6,lr}
- ldr r6, =gSaveBlock2Ptr
- ldr r0, [r6]
- ldr r1, =0x00000ca9
- adds r0, r1
- ldrb r0, [r0]
- lsls r0, 30
- lsrs r5, r0, 30
- ldr r0, =0x000040ce
- bl VarGet
- lsls r0, 16
- lsrs r4, r0, 16
- ldr r0, =gSpecialVar_0x8005
- ldrh r0, [r0]
- cmp r0, 0x1
- beq _08195B3C
- cmp r0, 0x1
- bgt _08195B20
- cmp r0, 0
- beq _08195B26
- b _08195BA0
- .pool
-_08195B20:
- cmp r0, 0x2
- beq _08195B5C
- b _08195BA0
-_08195B26:
- ldr r0, [r6]
- ldr r1, =gSpecialVar_0x8006
- ldrh r1, [r1]
- ldr r2, =0x00000dc6
- adds r0, r2
- strh r1, [r0]
- b _08195BA0
- .pool
-_08195B3C:
- ldr r2, [r6]
- lsls r0, r5, 1
- lsls r1, r4, 2
- adds r0, r1
- ldr r1, =0x00000dc8
- adds r2, r1
- adds r2, r0
- ldr r0, =gSpecialVar_0x8006
- ldrh r0, [r0]
- strh r0, [r2]
- b _08195BA0
- .pool
-_08195B5C:
- ldr r0, =gSpecialVar_0x8006
- ldrh r0, [r0]
- cmp r0, 0
- beq _08195B88
- ldr r2, [r6]
- ldr r0, =0x00000cdc
- adds r2, r0
- ldr r3, =gUnknown_0860DE98
- lsls r1, r5, 2
- lsls r0, r4, 3
- adds r1, r0
- adds r1, r3
- ldr r0, [r2]
- ldr r1, [r1]
- orrs r0, r1
- b _08195B9E
- .pool
-_08195B88:
- ldr r2, [r6]
- ldr r1, =0x00000cdc
- adds r2, r1
- ldr r3, =gUnknown_0860DEA8
- lsls r1, r5, 2
- lsls r0, r4, 3
- adds r1, r0
- adds r1, r3
- ldr r0, [r2]
- ldr r1, [r1]
- ands r0, r1
-_08195B9E:
- str r0, [r2]
-_08195BA0:
- pop {r4-r6}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8195AE4
-
- thumb_func_start sub_8195BB0
-sub_8195BB0: @ 8195BB0
- push {r4,lr}
- ldr r0, =0x000040ce
- bl VarGet
- lsls r0, 16
- ldr r1, =gSaveBlock2Ptr
- ldr r2, [r1]
- ldr r3, =0x00000ca9
- adds r1, r2, r3
- ldrb r1, [r1]
- lsls r1, 30
- lsrs r1, 29
- lsrs r0, 14
- adds r1, r0
- ldr r0, =0x00000dc8
- adds r2, r0
- adds r2, r1
- ldrh r0, [r2]
- cmp r0, 0x31
- bhi _08195C00
- ldr r4, =gSpecialVar_Result
- bl Random
- lsls r0, 16
- lsrs r0, 16
- movs r1, 0x3
- bl __umodsi3
- strh r0, [r4]
- b _08195C16
- .pool
-_08195C00:
- cmp r0, 0x62
- bhi _08195C10
- ldr r1, =gSpecialVar_Result
- movs r0, 0x3
- b _08195C14
- .pool
-_08195C10:
- ldr r1, =gSpecialVar_Result
- movs r0, 0x4
-_08195C14:
- strh r0, [r1]
-_08195C16:
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8195BB0
-
- thumb_func_start sub_8195C20
-sub_8195C20: @ 8195C20
- push {r4,lr}
- ldr r4, =gTrainerBattleOpponent_A
- bl Random
- lsls r0, 16
- lsrs r0, 16
- movs r1, 0xFF
- bl __umodsi3
- lsls r0, 16
- lsrs r0, 16
- lsls r1, r0, 2
- adds r1, r0
- lsrs r1, 6
- strh r1, [r4]
- ldrh r0, [r4]
- movs r1, 0
- bl sub_8162614
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8195C20
-
- thumb_func_start sub_8195C50
-sub_8195C50: @ 8195C50
- push {lr}
- ldr r3, =gTrainerBattleOpponent_A
- ldrh r1, [r3]
- ldr r0, =0x0000012b
- cmp r1, r0
- bhi _08195C6C
- ldr r2, =gFacilityTrainers
- movs r0, 0x34
- muls r1, r0
- ldr r0, [r2]
- adds r0, r1
- adds r0, 0xC
- bl ConvertBattleFrontierTrainerSpeechToString
-_08195C6C:
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8195C50
-
thumb_func_start sub_8195C7C
sub_8195C7C: @ 8195C7C
push {r4-r7,lr}
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index e7cb14530..1a2233a97 100644
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -20059,7 +20059,7 @@ _081A4E46:
bl ZeroEnemyPartyMons
movs r1, 0
str r1, [sp, 0x18]
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x1C]
@@ -23702,7 +23702,7 @@ sub_81A6CD0: @ 81A6CD0
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x24]
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x20]
@@ -29517,7 +29517,7 @@ _081A9C56:
bl SetMonData
cmp r5, 0
beq _081A9CD4
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r5, r0, 24
ldr r1, [sp, 0x10]
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 1ece38af9..bdc49fed2 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -391,7 +391,7 @@ _081622B2:
adds r4, r1, r0
mov r0, r10
str r2, [sp, 0x38]
- bl BattleFrontierGetOpponentLvl
+ bl GetFrontierEnemyMonLevel
ldrb r1, [r4]
lsls r0, 24
lsrs r0, 24
@@ -551,7 +551,7 @@ _08162414:
bl __udivsi3
lsls r0, 16
lsrs r5, r0, 16
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
subs r4, 0x2
cmp r4, 0x1
bhi _08162488
@@ -784,7 +784,7 @@ sub_8162614: @ 8162614
adds r6, r4, 0
lsls r1, 24
lsrs r5, r1, 24
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -962,7 +962,7 @@ sub_81627A4: @ 81627A4
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -1335,7 +1335,7 @@ GetFrontierTrainerFrontSpriteId: @ 8162AA0
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -1462,7 +1462,7 @@ GetFrontierOpponentClass: @ 8162BD8
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -1602,7 +1602,7 @@ sub_8162D34: @ 8162D34
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -1704,7 +1704,7 @@ GetFrontierTrainerName: @ 8162E20
lsls r1, 16
lsrs r5, r1, 16
movs r4, 0
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r5, r0
@@ -1854,7 +1854,7 @@ sub_8162F68: @ 8162F68
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r4, r0
@@ -2025,7 +2025,7 @@ sub_81630C4: @ 81630C4
add r4, sp, 0x14
movs r0, 0xFF
strb r0, [r4]
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x20]
@@ -2551,7 +2551,7 @@ RandomizeFacilityTrainerMonId: @ 8163524
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gFacilityTrainers
@@ -2728,7 +2728,7 @@ _081636A4:
movs r0, 0x1F
_081636A6:
str r0, [sp, 0x18]
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x14]
@@ -3029,7 +3029,7 @@ _0816390A:
thumb_func_start sub_8163914
sub_8163914: @ 8163914
push {lr}
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
ldr r0, =gSpecialVar_0x8005
ldrh r0, [r0]
cmp r0, 0
@@ -3979,7 +3979,7 @@ _081641E6:
lsls r0, r1, 24
lsrs r0, 24
str r2, [sp, 0x18]
- bl BattleFrontierGetOpponentLvl
+ bl GetFrontierEnemyMonLevel
ldrb r1, [r4]
lsls r0, 24
lsrs r0, 24
@@ -4091,7 +4091,7 @@ sub_81642A0: @ 81642A0
movs r2, 0
bl GetMonData
str r0, [sp, 0x20]
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
movs r7, 0
ldr r0, [sp, 0x18]
lsls r0, 24
@@ -4464,7 +4464,7 @@ _081645B8:
lsls r0, r1, 24
lsrs r0, 24
str r3, [sp, 0x48]
- bl BattleFrontierGetOpponentLvl
+ bl GetFrontierEnemyMonLevel
ldrb r1, [r4]
lsls r0, 24
lsrs r0, 24
@@ -4556,7 +4556,7 @@ sub_81646BC: @ 81646BC
movs r0, 0
mov r9, r0
mov r10, r0
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
movs r0, 0xFA
lsls r0, 1
cmp r5, r0
@@ -4705,7 +4705,7 @@ sub_8164828: @ 8164828
mov r5, r8
push {r5-r7}
sub sp, 0x8
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
bl sub_81A39C4
lsls r0, 16
lsrs r0, 16
@@ -6073,7 +6073,7 @@ sub_8165404: @ 8165404
sub sp, 0x70
lsls r0, 16
lsrs r7, r0, 16
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
ldr r0, =0x00000c03
cmp r7, r0
beq _08165420
@@ -6228,7 +6228,7 @@ _08165564:
bls _0816556C
b _081656E8
_0816556C:
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x50]
@@ -7083,8 +7083,8 @@ _08165C2A:
.pool
thumb_func_end sub_8165B88
- thumb_func_start GetFrontierEnemyMonLevel
-GetFrontierEnemyMonLevel: @ 8165C40
+ thumb_func_start GetFacilityEnemyMonLevel
+GetFacilityEnemyMonLevel: @ 8165C40
push {lr}
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -7104,20 +7104,20 @@ GetFrontierEnemyMonLevel: @ 8165C40
ldrb r0, [r2]
lsls r0, 30
lsrs r0, 30
- bl BattleFrontierGetOpponentLvl
+ bl GetFrontierEnemyMonLevel
b _08165C88
.pool
_08165C84:
- bl sub_8165D78
+ bl GetTentEnemyMonLevel
_08165C88:
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end GetFrontierEnemyMonLevel
+ thumb_func_end GetFacilityEnemyMonLevel
- thumb_func_start BattleFrontierGetOpponentLvl
-BattleFrontierGetOpponentLvl: @ 8165C90
+ thumb_func_start GetFrontierEnemyMonLevel
+GetFrontierEnemyMonLevel: @ 8165C90
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -7138,7 +7138,7 @@ _08165CA2:
_08165CB0:
pop {r1}
bx r1
- thumb_func_end BattleFrontierGetOpponentLvl
+ thumb_func_end GetFrontierEnemyMonLevel
thumb_func_start sub_8165CB4
sub_8165CB4: @ 8165CB4
@@ -7246,8 +7246,8 @@ _08165D72:
bx r1
thumb_func_end sub_8165D40
- thumb_func_start sub_8165D78
-sub_8165D78: @ 8165D78
+ thumb_func_start GetTentEnemyMonLevel
+GetTentEnemyMonLevel: @ 8165D78
push {lr}
ldr r0, =0x000040cf
bl VarGet
@@ -7300,7 +7300,7 @@ _08165E02:
pop {r1}
bx r1
.pool
- thumb_func_end sub_8165D78
+ thumb_func_end GetTentEnemyMonLevel
thumb_func_start sub_8165E18
sub_8165E18: @ 8165E18
@@ -7384,7 +7384,7 @@ sub_8165EA4: @ 8165EA4
lsls r2, 24
lsrs r2, 24
str r2, [sp, 0x1C]
- bl sub_8165D78
+ bl GetTentEnemyMonLevel
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x20]
@@ -7756,7 +7756,7 @@ sub_8166188: @ 8166188
ands r0, r1
cmp r0, 0
beq _081661E8
- bl GetFrontierEnemyMonLevel
+ bl GetFacilityEnemyMonLevel
lsls r0, 24
movs r5, 0
ldr r7, =gBaseStats
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-09 09:10:20 +0000