dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

battle tent start and create frontier struct in saveblock

Browse Source
This commit is contained in:
DizzyEggg
2018-06-17 12:30:09 +02:00
parent f807eb1f2d
commit 0fe3e612eb
23 changed files with 464 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

580
asm/battle_tent.s
View File

@@ -5,586 +5,6 @@
.text
thumb_func_start sub_81B99B4
sub_81B99B4: @ 81B99B4
push {lr}
ldr r1, =gUnknown_086160B4
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_81B99B4
thumb_func_start sub_81B99D4
sub_81B99D4: @ 81B99D4
push {lr}
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, =0x00000ca8
adds r0, r2
movs r2, 0
strb r2, [r0]
ldr r1, [r1]
ldr r3, =0x00000cb2
adds r0, r1, r3
strh r2, [r0]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
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
pop {r0}
bx r0
.pool
thumb_func_end sub_81B99D4
thumb_func_start sub_81B9A28
sub_81B9A28: @ 81B9A28
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6a
adds r0, r2
ldrh r0, [r0]
strh r0, [r1]
bx lr
.pool
thumb_func_end sub_81B9A28
thumb_func_start sub_81B9A44
sub_81B9A44: @ 81B9A44
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =gSpecialVar_0x8006
ldrh r1, [r1]
ldr r2, =0x00000e6a
adds r0, r2
strh r1, [r0]
bx lr
.pool
thumb_func_end sub_81B9A44
thumb_func_start sub_81B9A60
sub_81B9A60: @ 81B9A60
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_81B9A60
thumb_func_start sub_81B9A90
sub_81B9A90: @ 81B9A90
push {lr}
ldr r3, =gTrainerBattleOpponent_A
ldrh r1, [r3]
ldr r0, =0x0000012b
cmp r1, r0
bhi _081B9AAC
ldr r2, =gUnknown_0203BC88
movs r0, 0x34
muls r1, r0
ldr r0, [r2]
adds r0, r1
adds r0, 0xC
bl ConvertBattleFrontierTrainerSpeechToString
_081B9AAC:
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9A90
thumb_func_start sub_81B9ABC
sub_81B9ABC: @ 81B9ABC
push {r4,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
ldr r2, =0x00000ca8
adds r0, r2
strb r1, [r0]
movs r0, 0x80
lsls r0, 7
movs r1, 0
bl VarSet
ldr r1, [r4]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
bl sub_81A4C30
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9ABC
thumb_func_start sub_81B9B00
sub_81B9B00: @ 81B9B00
push {r4,r5,lr}
ldr r0, =gSaveBlock2Ptr
ldr r4, [r0]
ldr r5, =gUnknown_086160D4
bl Random
ldrh r0, [r5]
ldr r1, =0x00000e6a
adds r4, r1
strh r0, [r4]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9B00
thumb_func_start sub_81B9B28
sub_81B9B28: @ 81B9B28
push {r4,r5,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =0x00000e6a
adds r0, r1
ldrh r0, [r0]
movs r1, 0x1
bl AddBagItem
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x1
bne _081B9B70
ldr r0, [r4]
ldr r1, =0x00000e6a
adds r0, r1
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
ldr r0, [r4]
ldr r1, =0x00000e6a
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9B76
.pool
_081B9B70:
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9B76:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9B28
thumb_func_start sub_81B9B80
sub_81B9B80: @ 81B9B80
push {lr}
ldr r1, =gUnknown_086160D8
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_81B9B80
thumb_func_start sub_81B9BA0
sub_81B9BA0: @ 81B9BA0
push {lr}
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, =0x00000ca8
adds r0, r2
movs r2, 0
strb r2, [r0]
ldr r1, [r1]
ldr r3, =0x00000cb2
adds r0, r1, r3
strh r2, [r0]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
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
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9BA0
thumb_func_start sub_81B9BF4
sub_81B9BF4: @ 81B9BF4
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6c
adds r0, r2
ldrh r0, [r0]
strh r0, [r1]
bx lr
.pool
thumb_func_end sub_81B9BF4
thumb_func_start sub_81B9C10
sub_81B9C10: @ 81B9C10
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =gSpecialVar_0x8006
ldrh r1, [r1]
ldr r2, =0x00000e6c
adds r0, r2
strh r1, [r0]
bx lr
.pool
thumb_func_end sub_81B9C10
thumb_func_start sub_81B9C2C
sub_81B9C2C: @ 81B9C2C
push {r4,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
ldr r2, =0x00000ca8
adds r0, r2
strb r1, [r0]
movs r0, 0x80
lsls r0, 7
movs r1, 0
bl VarSet
ldr r1, [r4]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
bl sub_81A4C30
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9C2C
thumb_func_start sub_81B9C70
sub_81B9C70: @ 81B9C70
push {r4,r5,lr}
ldr r0, =gSaveBlock2Ptr
ldr r4, [r0]
ldr r5, =gUnknown_086160F4
bl Random
ldrh r0, [r5]
ldr r1, =0x00000e6c
adds r4, r1
strh r0, [r4]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9C70
thumb_func_start sub_81B9C98
sub_81B9C98: @ 81B9C98
push {r4,r5,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =0x00000e6c
adds r0, r1
ldrh r0, [r0]
movs r1, 0x1
bl AddBagItem
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x1
bne _081B9CE0
ldr r0, [r4]
ldr r1, =0x00000e6c
adds r0, r1
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
ldr r0, [r4]
ldr r1, =0x00000e6c
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9CE6
.pool
_081B9CE0:
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9CE6:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9C98
thumb_func_start sub_81B9CF0
sub_81B9CF0: @ 81B9CF0
push {lr}
ldr r0, =gStringVar1
ldr r1, =gTrainerBattleOpponent_A
ldrh r1, [r1]
bl GetFrontierTrainerName
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9CF0
thumb_func_start sub_81B9D08
sub_81B9D08: @ 81B9D08
push {lr}
ldr r1, =gUnknown_086160F8
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_81B9D08
thumb_func_start sub_81B9D28
sub_81B9D28: @ 81B9D28
push {lr}
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, =0x00000ca8
adds r0, r2
movs r2, 0
strb r2, [r0]
ldr r1, [r1]
ldr r3, =0x00000cb2
adds r0, r1, r3
strh r2, [r0]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
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
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9D28
thumb_func_start sub_81B9D7C
sub_81B9D7C: @ 81B9D7C
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6e
adds r0, r2
ldrh r0, [r0]
strh r0, [r1]
bx lr
.pool
thumb_func_end sub_81B9D7C
thumb_func_start sub_81B9D98
sub_81B9D98: @ 81B9D98
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =gSpecialVar_0x8006
ldrh r1, [r1]
ldr r2, =0x00000e6e
adds r0, r2
strh r1, [r0]
bx lr
.pool
thumb_func_end sub_81B9D98
thumb_func_start sub_81B9DB4
sub_81B9DB4: @ 81B9DB4
push {r4,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
ldr r2, =0x00000ca8
adds r0, r2
strb r1, [r0]
movs r0, 0x80
lsls r0, 7
movs r1, 0
bl VarSet
ldr r1, [r4]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
bl sub_81A4C30
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9DB4
thumb_func_start sub_81B9DF8
sub_81B9DF8: @ 81B9DF8
push {r4,r5,lr}
ldr r0, =gSaveBlock2Ptr
ldr r4, [r0]
ldr r5, =gUnknown_08616120
bl Random
ldrh r0, [r5]
ldr r1, =0x00000e6e
adds r4, r1
strh r0, [r4]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9DF8
thumb_func_start sub_81B9E20
sub_81B9E20: @ 81B9E20
push {r4,r5,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =0x00000e6e
adds r0, r1
ldrh r0, [r0]
movs r1, 0x1
bl AddBagItem
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x1
bne _081B9E68
ldr r0, [r4]
ldr r1, =0x00000e6e
adds r0, r1
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
ldr r0, [r4]
ldr r1, =0x00000e6e
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9E6E
.pool
_081B9E68:
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9E6E:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9E20
thumb_func_start sub_81B9E78
sub_81B9E78: @ 81B9E78
push {lr}
bl ZeroPlayerPartyMons
bl sub_819A4F8
pop {r0}
bx r0
thumb_func_end sub_81B9E78
thumb_func_start sub_81B9E88
sub_81B9E88: @ 81B9E88
push {lr}
bl sub_819DC00
pop {r0}
bx r0
thumb_func_end sub_81B9E88
thumb_func_start sub_81B9E94
sub_81B9E94: @ 81B9E94
push {lr}
movs r2, 0
ldr r1, =gMapHeader
ldrb r0, [r1, 0x14]
cmp r0, 0x8
bne _081B9EB2
ldr r3, =0xfffffe7f
adds r0, r3, 0
ldrh r1, [r1, 0x12]
adds r0, r1
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1
bhi _081B9EB2
movs r2, 0x1
_081B9EB2:
adds r0, r2, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81B9E94
thumb_func_start sub_81B9EC0
sub_81B9EC0: @ 81B9EC0