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

Extract baseroms from event_scripts

Browse Source
This commit is contained in:
Diegoisawesome
2017-11-10 18:12:18 -06:00
parent a6c30ba951
commit 2e40384fa2
80 changed files with 9228 additions and 1263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_2.s
+83 -83
View File
@@ -4361,14 +4361,14 @@ _0819CA4E:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _0819CAFE
.pool
_0819CA68:
movs r0, 0x2
strh r0, [r4, 0x8]
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _0819CAFE
@@ -11730,13 +11730,13 @@ _081A0734:
bne _081A0778
movs r0, 0x5
bl PlaySE
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
b _081A0768
.pool
_081A0764:
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_081A0768:
ldrb r0, [r4, 0xC]
@@ -11982,12 +11982,12 @@ sub_81A093C: @ 81A093C
lsrs r1, r0, 24
cmp r1, 0
bne _081A0954
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _081A095A
.pool
_081A0954:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081A095A:
@@ -12046,7 +12046,7 @@ sub_81A0990: @ 81A0990
thumb_func_start sub_81A09B4
sub_81A09B4: @ 81A09B4
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
adds r0, 0xB1
@@ -12070,13 +12070,13 @@ sub_81A09D0: @ 81A09D0
subs r1, r0, 0x3
cmp r1, 0
bge _081A09F4
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _081A0A1C
.pool
_081A09F4:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
cmp r1, 0x8
ble _081A09FE
movs r0, 0x1
@@ -12403,7 +12403,7 @@ sub_81A0CC0: @ 81A0CC0
lsrs r0, r1, 28
cmp r0, 0x2
bhi _081A0CE4
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
b _081A0D34
.pool
@@ -12431,22 +12431,22 @@ _081A0D08:
beq _081A0D24
b _081A0D30
_081A0D0E:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
b _081A0D34
.pool
_081A0D18:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _081A0D34
.pool
_081A0D24:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A0D34
.pool
_081A0D30:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
_081A0D34:
strh r0, [r1]
@@ -13078,7 +13078,7 @@ _081A1242:
lsls r0, 30
ldr r1, =gSpecialVar_0x8005
mov r12, r1
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
mov r8, r1
cmp r0, 0
beq _081A127C
@@ -13855,7 +13855,7 @@ _081A186C:
.4byte _081A1918
.4byte _081A1938
_081A188C:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca8
@@ -13865,7 +13865,7 @@ _081A188C:
b _081A1956
.pool
_081A18A8:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13877,7 +13877,7 @@ _081A18A8:
b _081A1956
.pool
_081A18C8:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000cb2
@@ -13887,7 +13887,7 @@ _081A18C8:
b _081A1956
.pool
_081A18E4:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13897,7 +13897,7 @@ _081A18E4:
b _081A1926
.pool
_081A1900:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =gBattleOutcome
ldrb r0, [r1]
strh r0, [r2]
@@ -13906,7 +13906,7 @@ _081A1900:
b _081A1956
.pool
_081A1918:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13919,7 +13919,7 @@ _081A1926:
b _081A1956
.pool
_081A1938:
ldr r4, =gSpecialVar_ScriptResult
ldr r4, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
movs r0, 0xD0
@@ -17183,7 +17183,7 @@ sub_81A35EC: @ 81A35EC
push {r4,lr}
ldr r0, =0x000040cf
bl VarGet
ldr r4, =gSpecialVar_ScriptResult
ldr r4, =gSpecialVar_Result
bl sub_81A3610
lsls r0, 24
lsrs r0, 24
@@ -17755,12 +17755,12 @@ sub_81A3B00: @ 81A3B00
ldr r0, =0x000003fe
cmp r1, r0
bne _081A3B20
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A3B24
.pool
_081A3B20:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_081A3B24:
strh r0, [r1]
@@ -17988,7 +17988,7 @@ sub_81A3D30: @ 81A3D30
push {r4,lr}
ldr r0, =0x000040cf
bl VarGet
ldr r4, =gSpecialVar_ScriptResult
ldr r4, =gSpecialVar_Result
lsls r0, 24
lsrs r0, 24
bl sub_81A3B30
@@ -18044,13 +18044,13 @@ sub_81A3DA0: @ 81A3DA0
ands r2, r1
cmp r2, 0
beq _081A3DC4
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _081A3DC8
.pool
_081A3DC4:
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
_081A3DC8:
pop {r0}
@@ -18390,7 +18390,7 @@ _081A404E:
bne _081A40C8
cmp r7, 0
bne _081A40E4
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
ldrb r3, [r0]
str r6, [sp]
add r1, sp, 0x10
@@ -18406,7 +18406,7 @@ _081A404E:
b _081A40E4
.pool
_081A40C8:
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
ldrb r3, [r0]
str r6, [sp]
add r1, sp, 0x10
@@ -18529,7 +18529,7 @@ _081A41E0:
strh r0, [r1]
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
ldrb r0, [r0]
ldr r1, =0x00000ca9
adds r2, r1
@@ -18767,7 +18767,7 @@ _081A43EE:
thumb_func_start sub_81A4410
sub_81A4410: @ 81A4410
push {r4,lr}
ldr r4, =gSpecialVar_ScriptResult
ldr r4, =gSpecialVar_Result
bl MoveRecordedBattleToSaveData
strh r0, [r4]
ldr r0, =gSaveBlock2Ptr
@@ -21309,7 +21309,7 @@ _081A5994:
beq _081A59C8
b _081A59EE
_081A599A:
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
ldr r2, =0x00000dd8
adds r1, r3, r2
ldrh r1, [r1]
@@ -21317,7 +21317,7 @@ _081A599A:
b _081A59EE
.pool
_081A59B0:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
lsls r1, 1
ldr r4, =0x00000dda
adds r0, r3, r4
@@ -21328,7 +21328,7 @@ _081A59B0:
_081A59C8:
cmp r1, 0
beq _081A59E0
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =0x00000cdc
adds r0, r3, r1
ldr r0, [r0]
@@ -21336,7 +21336,7 @@ _081A59C8:
b _081A59EA
.pool
_081A59E0:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r4, =0x00000cdc
adds r0, r3, r4
ldr r0, [r0]
@@ -21550,12 +21550,12 @@ sub_81A5B88: @ 81A5B88
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081A5BD6
.pool
_081A5BD0:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081A5BD6:
@@ -22026,7 +22026,7 @@ _081A5FE4:
beq _081A6030
b _081A6044
_081A5FEA:
ldr r3, =gSpecialVar_ScriptResult
ldr r3, =gSpecialVar_Result
ldr r0, [r7]
lsls r1, r6, 1
lsls r2, r5, 2
@@ -22035,7 +22035,7 @@ _081A5FEA:
b _081A603C
.pool
_081A6000:
ldr r4, =gSpecialVar_ScriptResult
ldr r4, =gSpecialVar_Result
ldr r2, [r7]
ldr r0, =0x00000cdc
adds r2, r0
@@ -22054,7 +22054,7 @@ _081A6000:
b _081A6044
.pool
_081A6030:
ldr r3, =gSpecialVar_ScriptResult
ldr r3, =gSpecialVar_Result
ldr r0, [r7]
lsls r1, r6, 1
lsls r2, r5, 2
@@ -23248,7 +23248,7 @@ sub_81A6A08: @ 81A6A08
str r0, [r1]
movs r4, 0
add r5, sp, 0x14
ldr r7, =gSpecialVar_ScriptResult
ldr r7, =gSpecialVar_Result
movs r1, 0
_081A6A1E:
mov r2, sp
@@ -23407,7 +23407,7 @@ _081A6B18:
lsrs r4, r0, 24
cmp r4, 0x2
bls _081A6B0E
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r4, 0x1
@@ -24180,7 +24180,7 @@ _081A7174:
.4byte _081A71E8
.4byte _081A720C
_081A7188:
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000e02
adds r1, r3
@@ -24189,7 +24189,7 @@ _081A7188:
b _081A723A
.pool
_081A71A0:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24203,7 +24203,7 @@ _081A71A0:
b _081A7238
.pool
_081A71C4:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24217,7 +24217,7 @@ _081A71C4:
b _081A7238
.pool
_081A71E8:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24233,7 +24233,7 @@ _081A71E8:
_081A720C:
cmp r2, 0
beq _081A7228
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
@@ -24243,7 +24243,7 @@ _081A720C:
b _081A7236
.pool
_081A7228:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r3, =0x00000cdc
adds r0, r3
@@ -24424,12 +24424,12 @@ sub_81A73B8: @ 81A73B8
ldrh r0, [r0]
cmp r0, 0xE
bls _081A73DC
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A73E0
.pool
_081A73DC:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_081A73E0:
strh r0, [r1]
@@ -24440,7 +24440,7 @@ _081A73E0:
thumb_func_start sub_81A73EC
sub_81A73EC: @ 81A73EC
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, =gUnknown_0300128C
ldrb r1, [r1]
strh r1, [r0]
@@ -24528,27 +24528,27 @@ _081A7484:
beq _081A74A4
b _081A74C2
_081A748E:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081A74C0
.pool
_081A7498:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A74C0
.pool
_081A74A4:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
b _081A74C0
.pool
_081A74B0:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _081A74C0
.pool
_081A74BC:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
_081A74C0:
strh r0, [r1]
@@ -24560,7 +24560,7 @@ _081A74C2:
thumb_func_start sub_81A74CC
sub_81A74CC: @ 81A74CC
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, =gUnknown_0300128D
ldrb r1, [r1]
strh r1, [r0]
@@ -24580,7 +24580,7 @@ sub_81A74E0: @ 81A74E0
adds r4, 0x1
adds r0, r4, 0
bl sub_81A7F38
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
pop {r4}
pop {r0}
@@ -26066,7 +26066,7 @@ _081A807A:
thumb_func_start sub_81A8090
sub_81A8090: @ 81A8090
push {r4,lr}
ldr r4, =gSpecialVar_ScriptResult
ldr r4, =gSpecialVar_Result
bl InBattlePike
lsls r0, 24
lsrs r0, 24
@@ -26110,7 +26110,7 @@ sub_81A80DC: @ 81A80DC
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r4, =gSpecialVar_ScriptResult
ldr r4, =gSpecialVar_Result
movs r0, 0
strh r0, [r4]
movs r0, 0x1
@@ -26295,7 +26295,7 @@ _081A824C:
thumb_func_start sub_81A825C
sub_81A825C: @ 81A825C
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
movs r2, 0xE1
@@ -26311,7 +26311,7 @@ sub_81A825C: @ 81A825C
thumb_func_start sub_81A827C
sub_81A827C: @ 81A827C
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =gUnknown_0861266C
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -26754,7 +26754,7 @@ _081A8634:
thumb_func_start sub_81A863C
sub_81A863C: @ 81A863C
push {r4,lr}
ldr r4, =gSpecialVar_ScriptResult
ldr r4, =gSpecialVar_Result
movs r0, 0
bl sub_81A8590
lsls r0, 24
@@ -26787,7 +26787,7 @@ sub_81A8658: @ 81A8658
ldrb r4, [r0]
adds r0, r4, 0
bl sub_81A7F38
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
pop {r4}
pop {r0}
@@ -26821,7 +26821,7 @@ sub_81A86C0: @ 81A86C0
mov r6, r9
mov r5, r8
push {r5-r7}
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
movs r0, 0
@@ -26895,7 +26895,7 @@ _081A8766:
mov r0, r9
cmp r0, 0x1
bne _081A8778
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _081A8786
@@ -27919,13 +27919,13 @@ _081A8F70:
.4byte _081A9010
.4byte _081A9028
_081A8F8C:
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000e18
b _081A8FFE
.pool
_081A8F9C:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
lsls r1, r4, 1
ldr r3, =0x00000e1a
@@ -27937,14 +27937,14 @@ _081A8F9C:
_081A8FB4:
cmp r4, 0
beq _081A8FCC
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
b _081A9030
.pool
_081A8FCC:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r3, =0x00000cdc
adds r0, r3
@@ -27954,14 +27954,14 @@ _081A8FCC:
b _081A9036
.pool
_081A8FE4:
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r2, =0x00000e1a
adds r1, r2
b _081A9000
.pool
_081A8FF8:
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000e1c
_081A8FFE:
@@ -27972,7 +27972,7 @@ _081A9000:
b _081A903A
.pool
_081A9010:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
@@ -27982,7 +27982,7 @@ _081A9010:
b _081A9036
.pool
_081A9028:
ldr r2, =gSpecialVar_ScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r3, =0x00000cdc
adds r0, r3
@@ -28211,12 +28211,12 @@ sub_81A91FC: @ 81A91FC
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081A924A
.pool
_081A9244:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081A924A:
@@ -28296,7 +28296,7 @@ CalculateBattlePyramidItemBallItemId: @ 81A9290
_081A92DE:
bl sub_81AA9E4
lsls r0, 24
ldr r1, =gSpecialVar_ScriptLastTalked
ldr r1, =gSpecialVar_LastTalked
ldrh r4, [r1]
ldr r1, =gUnknown_08613650
lsrs r0, 20
@@ -28401,7 +28401,7 @@ sub_81A93C8: @ 81A93C8
lsls r1, 4
adds r3, r0, r1
movs r2, 0
ldr r4, =gSpecialVar_ScriptLastTalked
ldr r4, =gSpecialVar_LastTalked
b _081A93F4
.pool
_081A93E4:
@@ -28712,7 +28712,7 @@ _081A9650:
thumb_func_start sub_81A966C
sub_81A966C: @ 81A966C
push {r4,lr}
ldr r4, =gSpecialVar_ScriptResult
ldr r4, =gSpecialVar_Result
bl InBattlePyramid
lsls r0, 24
lsrs r0, 24
@@ -28745,7 +28745,7 @@ _081A9698:
b _081A9754
.pool
_081A96B4:
ldr r4, =gSpecialVar_ScriptResult
ldr r4, =gSpecialVar_Result
ldrh r0, [r4]
cmp r0, 0x1
beq _081A9710
@@ -28775,7 +28775,7 @@ _081A96F4:
ldrh r0, [r0]
bl PlaySE
_081A96FC:
ldr r1, =gSpecialVar_ScriptResult
ldr r1, =gSpecialVar_Result
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
@@ -29352,7 +29352,7 @@ _081A9B86:
strb r3, [r0, 0x6]
mov r7, r10
ldr r2, [r7]
ldr r0, =gSpecialVar_ScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrh r1, [r0]
subs r1, 0x1
lsls r0, r1, 1