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

Update variable and flag names

Browse Source
This commit is contained in:
Diegoisawesome
2017-11-08 15:20:10 -06:00
parent 60bb83144b
commit e6ef86e4b0
59 changed files with 992 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_1.s
+25 -25
View File
@@ -136,7 +136,7 @@ _0818EAC8:
.4byte _0818ECD0
.4byte _0818ECF4
_0818EAF0:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
lsls r1, r5, 1
@@ -150,7 +150,7 @@ _0818EAF0:
b _0818ED10
.pool
_0818EB14:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldr r3, =0x00000cdc
@@ -170,7 +170,7 @@ _0818EB14:
b _0818ED10
.pool
_0818EB48:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -180,7 +180,7 @@ _0818EB48:
b _0818ECBE
.pool
_0818EB64:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -190,7 +190,7 @@ _0818EB64:
b _0818ECBE
.pool
_0818EB80:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -198,7 +198,7 @@ _0818EB80:
b _0818ECBA
.pool
_0818EB98:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -216,7 +216,7 @@ _0818EBB4:
bne _0818EC04
cmp r5, 0
beq _0818EBE8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -226,7 +226,7 @@ _0818EBB4:
b _0818ECBE
.pool
_0818EBE8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -238,7 +238,7 @@ _0818EBE8:
_0818EC04:
cmp r5, 0
beq _0818EC24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -248,7 +248,7 @@ _0818EC04:
b _0818ECBE
.pool
_0818EC24:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -266,7 +266,7 @@ _0818EC40:
bne _0818EC90
cmp r5, 0
beq _0818EC74
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -277,7 +277,7 @@ _0818EC40:
b _0818ED10
.pool
_0818EC74:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -289,7 +289,7 @@ _0818EC74:
_0818EC90:
cmp r5, 0
beq _0818ECB0
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -299,7 +299,7 @@ _0818EC90:
b _0818ECBE
.pool
_0818ECB0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -328,7 +328,7 @@ _0818ECD0:
b _0818ED10
.pool
_0818ECF4:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r3, =0x00000d0a
@@ -11707,12 +11707,12 @@ sub_8194EC0: @ 8194EC0
bl sub_8195358
cmp r4, r0
ble _08194EE8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _08194EEC
.pool
_08194EE8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
_08194EEC:
strh r0, [r1]
@@ -13130,7 +13130,7 @@ _08195A74:
beq _08195AB0
b _08195AD0
_08195A7A:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldr r1, [r5]
ldr r2, =0x00000dc6
adds r1, r2
@@ -13139,7 +13139,7 @@ _08195A7A:
b _08195AD0
.pool
_08195A90:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_ScriptResult
ldr r0, [r5]
lsls r1, r7, 1
lsls r2, r6, 2
@@ -13152,7 +13152,7 @@ _08195A90:
b _08195AD0
.pool
_08195AB0:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
ldr r2, [r5]
ldr r0, =0x00000cdc
adds r2, r0
@@ -13285,7 +13285,7 @@ sub_8195BB0: @ 8195BB0
ldrh r0, [r2]
cmp r0, 0x31
bhi _08195C00
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl Random
lsls r0, 16
lsrs r0, 16
@@ -13297,12 +13297,12 @@ sub_8195BB0: @ 8195BB0
_08195C00:
cmp r0, 0x62
bhi _08195C10
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x3
b _08195C14
.pool
_08195C10:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x4
_08195C14:
strh r0, [r1]
@@ -13517,12 +13517,12 @@ sub_8195DB8: @ 8195DB8
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
b _08195E06
.pool
_08195E00:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
_08195E06:
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, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
b _0819CAFE
.pool
_0819CA68:
movs r0, 0x2
strh r0, [r4, 0x8]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
b _0819CAFE
@@ -11730,13 +11730,13 @@ _081A0734:
bne _081A0778
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x7F
strh r0, [r1]
b _081A0768
.pool
_081A0764:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
b _081A095A
.pool
_081A0954:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
_081A095A:
@@ -12046,7 +12046,7 @@ sub_81A0990: @ 81A0990
thumb_func_start sub_81A09B4
sub_81A09B4: @ 81A09B4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
b _081A0A1C
.pool
_081A09F4:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
b _081A0D34
.pool
@@ -12431,22 +12431,22 @@ _081A0D08:
beq _081A0D24
b _081A0D30
_081A0D0E:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x4
b _081A0D34
.pool
_081A0D18:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x3
b _081A0D34
.pool
_081A0D24:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _081A0D34
.pool
_081A0D30:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x5
_081A0D34:
strh r0, [r1]
@@ -13078,7 +13078,7 @@ _081A1242:
lsls r0, 30
ldr r1, =gSpecialVar_0x8005
mov r12, r1
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
mov r8, r1
cmp r0, 0
beq _081A127C
@@ -13855,7 +13855,7 @@ _081A186C:
.4byte _081A1918
.4byte _081A1938
_081A188C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca8
@@ -13865,7 +13865,7 @@ _081A188C:
b _081A1956
.pool
_081A18A8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13877,7 +13877,7 @@ _081A18A8:
b _081A1956
.pool
_081A18C8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000cb2
@@ -13887,7 +13887,7 @@ _081A18C8:
b _081A1956
.pool
_081A18E4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13897,7 +13897,7 @@ _081A18E4:
b _081A1926
.pool
_081A1900:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r1, =gBattleOutcome
ldrb r0, [r1]
strh r0, [r2]
@@ -13906,7 +13906,7 @@ _081A1900:
b _081A1956
.pool
_081A1918:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13919,7 +13919,7 @@ _081A1926:
b _081A1956
.pool
_081A1938:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _081A3B24
.pool
_081A3B20:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
_081A3B24:
strh r0, [r1]
@@ -17988,7 +17988,7 @@ sub_81A3D30: @ 81A3D30
push {r4,lr}
ldr r0, =0x000040cf
bl VarGet
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
b _081A3DC8
.pool
_081A3DC4:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r2, [r0]
_081A3DC8:
pop {r0}
@@ -18390,7 +18390,7 @@ _081A404E:
bne _081A40C8
cmp r7, 0
bne _081A40E4
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrb r3, [r0]
str r6, [sp]
add r1, sp, 0x10
@@ -18406,7 +18406,7 @@ _081A404E:
b _081A40E4
.pool
_081A40C8:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl MoveRecordedBattleToSaveData
strh r0, [r4]
ldr r0, =gSaveBlock2Ptr
@@ -21309,7 +21309,7 @@ _081A5994:
beq _081A59C8
b _081A59EE
_081A599A:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldr r2, =0x00000dd8
adds r1, r3, r2
ldrh r1, [r1]
@@ -21317,7 +21317,7 @@ _081A599A:
b _081A59EE
.pool
_081A59B0:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
lsls r1, 1
ldr r4, =0x00000dda
adds r0, r3, r4
@@ -21328,7 +21328,7 @@ _081A59B0:
_081A59C8:
cmp r1, 0
beq _081A59E0
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r1, =0x00000cdc
adds r0, r3, r1
ldr r0, [r0]
@@ -21336,7 +21336,7 @@ _081A59C8:
b _081A59EA
.pool
_081A59E0:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
b _081A5BD6
.pool
_081A5BD0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
_081A5BD6:
@@ -22026,7 +22026,7 @@ _081A5FE4:
beq _081A6030
b _081A6044
_081A5FEA:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_ScriptResult
ldr r0, [r7]
lsls r1, r6, 1
lsls r2, r5, 2
@@ -22035,7 +22035,7 @@ _081A5FEA:
b _081A603C
.pool
_081A6000:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
ldr r2, [r7]
ldr r0, =0x00000cdc
adds r2, r0
@@ -22054,7 +22054,7 @@ _081A6000:
b _081A6044
.pool
_081A6030:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r7, =gSpecialVar_ScriptResult
movs r1, 0
_081A6A1E:
mov r2, sp
@@ -23407,7 +23407,7 @@ _081A6B18:
lsrs r4, r0, 24
cmp r4, 0x2
bls _081A6B0E
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
movs r4, 0x1
@@ -24180,7 +24180,7 @@ _081A7174:
.4byte _081A71E8
.4byte _081A720C
_081A7188:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldr r1, [r3]
ldr r3, =0x00000e02
adds r1, r3
@@ -24189,7 +24189,7 @@ _081A7188:
b _081A723A
.pool
_081A71A0:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24203,7 +24203,7 @@ _081A71A0:
b _081A7238
.pool
_081A71C4:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24217,7 +24217,7 @@ _081A71C4:
b _081A7238
.pool
_081A71E8:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24233,7 +24233,7 @@ _081A71E8:
_081A720C:
cmp r2, 0
beq _081A7228
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
@@ -24243,7 +24243,7 @@ _081A720C:
b _081A7236
.pool
_081A7228:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _081A73E0
.pool
_081A73DC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
_081A73E0:
strh r0, [r1]
@@ -24440,7 +24440,7 @@ _081A73E0:
thumb_func_start sub_81A73EC
sub_81A73EC: @ 81A73EC
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldr r1, =gUnknown_0300128C
ldrb r1, [r1]
strh r1, [r0]
@@ -24528,27 +24528,27 @@ _081A7484:
beq _081A74A4
b _081A74C2
_081A748E:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
b _081A74C0
.pool
_081A7498:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _081A74C0
.pool
_081A74A4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
b _081A74C0
.pool
_081A74B0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x3
b _081A74C0
.pool
_081A74BC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x4
_081A74C0:
strh r0, [r1]
@@ -24560,7 +24560,7 @@ _081A74C2:
thumb_func_start sub_81A74CC
sub_81A74CC: @ 81A74CC
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r4]
movs r0, 0x1
@@ -26295,7 +26295,7 @@ _081A824C:
thumb_func_start sub_81A825C
sub_81A825C: @ 81A825C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
movs r0, 0
@@ -26895,7 +26895,7 @@ _081A8766:
mov r0, r9
cmp r0, 0x1
bne _081A8778
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
b _081A8786
@@ -27919,13 +27919,13 @@ _081A8F70:
.4byte _081A9010
.4byte _081A9028
_081A8F8C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldr r1, [r3]
ldr r3, =0x00000e18
b _081A8FFE
.pool
_081A8F9C:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r0, [r3]
lsls r1, r4, 1
ldr r3, =0x00000e1a
@@ -27937,14 +27937,14 @@ _081A8F9C:
_081A8FB4:
cmp r4, 0
beq _081A8FCC
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
b _081A9030
.pool
_081A8FCC:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r0, [r3]
ldr r3, =0x00000cdc
adds r0, r3
@@ -27954,14 +27954,14 @@ _081A8FCC:
b _081A9036
.pool
_081A8FE4:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldr r1, [r3]
ldr r2, =0x00000e1a
adds r1, r2
b _081A9000
.pool
_081A8FF8:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldr r1, [r3]
ldr r3, =0x00000e1c
_081A8FFE:
@@ -27972,7 +27972,7 @@ _081A9000:
b _081A903A
.pool
_081A9010:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
@@ -27982,7 +27982,7 @@ _081A9010:
b _081A9036
.pool
_081A9028:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
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, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
b _081A924A
.pool
_081A9244:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
_081A924A:
@@ -28296,7 +28296,7 @@ CalculateBattlePyramidItemBallItemId: @ 81A9290
_081A92DE:
bl sub_81AA9E4
lsls r0, 24
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_ScriptLastTalked
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, =gScriptLastTalked
ldr r4, =gSpecialVar_ScriptLastTalked
b _081A93F4
.pool
_081A93E4:
@@ -28712,7 +28712,7 @@ _081A9650:
thumb_func_start sub_81A966C
sub_81A966C: @ 81A966C
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl InBattlePyramid
lsls r0, 24
lsrs r0, 24
@@ -28745,7 +28745,7 @@ _081A9698:
b _081A9754
.pool
_081A96B4:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
ldrh r0, [r4]
cmp r0, 0x1
beq _081A9710
@@ -28775,7 +28775,7 @@ _081A96F4:
ldrh r0, [r0]
bl PlaySE
_081A96FC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
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, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
ldrh r1, [r0]
subs r1, 0x1
lsls r0, r1, 1
asm/battle_setup.s
+12 -12
View File
@@ -1344,7 +1344,7 @@ sub_80B1158: @ 80B1158
sub sp, 0x8
ldr r0, =0x00004023
bl GetVarPointer
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldrh r1, [r2]
strh r1, [r0]
ldrh r0, [r2]
@@ -1669,7 +1669,7 @@ battle_80801F0: @ 80B13F8
ldrh r1, [r0]
cmp r1, 0
beq _080B141A
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
strh r1, [r0]
lsls r0, r1, 24
lsrs r0, 24
@@ -1793,7 +1793,7 @@ _080B153C:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
ldrb r0, [r0]
bl sub_81A9AA8
ldr r1, =gTrainerBattleOpponent_A
@@ -1803,7 +1803,7 @@ _080B156C:
ldr r0, =gUnknown_08550014
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
ldrb r0, [r0]
bl sub_81A9AA8
_080B157C:
@@ -1833,7 +1833,7 @@ _080B15A8:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
ldrb r0, [r0]
bl battle_init
ldr r1, =gTrainerBattleOpponent_A
@@ -1843,7 +1843,7 @@ _080B15D8:
ldr r0, =gUnknown_08550014
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
ldrb r0, [r0]
bl battle_init
b _080B157C
@@ -1882,7 +1882,7 @@ SingleTrainerWantsBattle: @ 80B162C
lsrs r0, 24
ldr r2, =gSelectedMapObject
strb r0, [r2]
ldr r4, =gScriptLastTalked
ldr r4, =gSpecialVar_ScriptLastTalked
ldr r3, =gMapObjects
lsls r2, r0, 3
adds r2, r0
@@ -1910,7 +1910,7 @@ TwoTrainersWantBattle: @ 80B1670
lsrs r0, 24
ldr r2, =gSelectedMapObject
strb r0, [r2]
ldr r4, =gScriptLastTalked
ldr r4, =gSpecialVar_ScriptLastTalked
ldr r3, =gMapObjects
lsls r2, r0, 3
adds r2, r0
@@ -2332,7 +2332,7 @@ sub_80B1A14: @ 80B1A14
ldrb r0, [r0]
cmp r0, 0x1
bhi _080B1A44
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
ldrb r0, [r0]
bl sub_81A9AA8
lsls r0, 16
@@ -2370,7 +2370,7 @@ _080B1A7C:
ldrb r0, [r0]
cmp r0, 0x1
bhi _080B1AAC
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
ldrb r0, [r0]
bl battle_init
adds r1, r0, 0
@@ -3484,7 +3484,7 @@ CheckIfMultipleTrainersWantBattle: @ 80B22D8
ldr r1, =gUnknown_02038BF8
movs r0, 0x1
strb r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _080B230A
.pool
@@ -3492,7 +3492,7 @@ _080B2300:
ldr r1, =gUnknown_02038BF8
movs r0, 0
strb r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
_080B230A:
strh r0, [r1]
asm/battle_tent.s
+9 -9
View File
@@ -57,7 +57,7 @@ sub_81B99D4: @ 81B99D4
thumb_func_start sub_81B9A28
sub_81B9A28: @ 81B9A28
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6a
@@ -196,12 +196,12 @@ sub_81B9B28: @ 81B9B28
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
b _081B9B76
.pool
_081B9B70:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
_081B9B76:
@@ -263,7 +263,7 @@ sub_81B9BA0: @ 81B9BA0
thumb_func_start sub_81B9BF4
sub_81B9BF4: @ 81B9BF4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6c
@@ -357,12 +357,12 @@ sub_81B9C98: @ 81B9C98
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
b _081B9CE6
.pool
_081B9CE0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
_081B9CE6:
@@ -436,7 +436,7 @@ sub_81B9D28: @ 81B9D28
thumb_func_start sub_81B9D7C
sub_81B9D7C: @ 81B9D7C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6e
@@ -530,12 +530,12 @@ sub_81B9E20: @ 81B9E20
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
b _081B9E6E
.pool
_081B9E68:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
_081B9E6E:
asm/battle_tower.s
+15 -15
View File
@@ -132,12 +132,12 @@ _08162094:
lsls r1, 24
lsrs r1, 24
bl sub_8164FCC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
strh r0, [r1]
b _081620E8
.pool
_081620A8:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
ldr r2, [r5]
ldr r0, =0x00000cdc
adds r2, r0
@@ -294,7 +294,7 @@ _081621EE:
adds r0, 0x1
strh r0, [r1]
bl sub_8163E90
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, [r5]
adds r0, r4
ldrh r0, [r0]
@@ -4714,7 +4714,7 @@ sub_8164828: @ 8164828
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
ldrh r0, [r0]
subs r5, r0, 0x2
ldr r0, =gSaveBlock2Ptr
@@ -5076,7 +5076,7 @@ sub_8164B74: @ 8164B74
adds r0, r2
ldrh r6, [r0]
bl GetMultiplayerId
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x6
bls _08164BAC
@@ -5126,7 +5126,7 @@ _08164C18:
mov r1, sp
movs r2, 0x4
bl SendBlock
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _08164DB4
.pool
@@ -5204,7 +5204,7 @@ _08164CB0:
mov r4, r8
cmp r4, 0xD
ble _08164C68
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
b _08164DB4
.pool
@@ -5222,7 +5222,7 @@ _08164CE0:
adds r1, r3
movs r2, 0x28
bl SendBlock
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x3
b _08164DB4
.pool
@@ -5268,13 +5268,13 @@ _08164D14:
ldrb r0, [r0]
cmp r0, 0
bne _08164DB0
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x4
b _08164DB4
.pool
_08164D98:
bl sub_800AC34
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x5
b _08164DB4
.pool
@@ -5284,7 +5284,7 @@ _08164DA8:
cmp r0, 0
bne _08164DB6
_08164DB0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x6
_08164DB4:
strh r0, [r1]
@@ -5625,7 +5625,7 @@ sub_816502C: @ 816502C
movs r0, 0x45
mov r10, r0
_0816506A:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
mov r9, r1
movs r0, 0
strh r0, [r1]
@@ -5681,7 +5681,7 @@ _081650D4:
cmp r6, r8
blt _0816508C
_081650DC:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0
beq _08165132
@@ -5901,7 +5901,7 @@ _08165294:
thumb_func_start sub_81652B4
sub_81652B4: @ 81652B4
push {r4-r6,lr}
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r2]
ldr r1, =gSaveBlock2Ptr
@@ -5943,7 +5943,7 @@ _081652F2:
ldr r3, =0x00000bec
adds r0, r1, r3
bl sub_816534C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
_08165316:
asm/cable_club.s
+9 -9
View File
@@ -663,7 +663,7 @@ sub_80B28A8: @ 80B28A8
b _080B2908
.pool
_080B28F4:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
adds r0, r7, 0
adds r1, r6, 0
bl sub_80B2478
@@ -703,7 +703,7 @@ sub_80B2918: @ 80B2918
bl sub_80B24F8
cmp r0, 0x1
beq _080B29E6
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
adds r0, r6, 0
adds r1, r5, 0
bl sub_80B2478
@@ -791,7 +791,7 @@ sub_80B2A08: @ 80B2A08
bl sub_80B24F8
cmp r0, 0x1
beq _080B2ACE
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x4
bne _080B2A38
@@ -1067,7 +1067,7 @@ _080B2C7E:
movs r0, 0
bl sub_800B330
bl ResetBlockReceivedFlags
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
adds r1, r5, 0
bl task_map_chg_seq_0807EC34
_080B2C9C:
@@ -1111,7 +1111,7 @@ sub_80B2CEC: @ 80B2CEC
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x5
strh r0, [r1]
ldr r0, =gTasks
@@ -1139,7 +1139,7 @@ sub_80B2D2C: @ 80B2D2C
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x6
strh r0, [r1]
ldr r0, =gTasks
@@ -1284,7 +1284,7 @@ sub_80B2E4C: @ 80B2E4C
thumb_func_start sub_80B2E74
sub_80B2E74: @ 80B2E74
push {lr}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_020229C6
@@ -1353,7 +1353,7 @@ sub_80B2EE4: @ 80B2EE4
b _080B2FC6
.pool
_080B2F0C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x1
bne _080B2FA8
@@ -1415,7 +1415,7 @@ _080B2F74:
_080B2F82:
cmp r7, 0
beq _080B2FA8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0xC
strh r0, [r1]
bl sub_800AD10
asm/contest_link_80F57C4.s
+2 -2
View File
@@ -548,7 +548,7 @@ _080F5D2A:
movs r0, 0x8
strh r0, [r1]
bl InterviewBefore
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x1
beq _080F5D58
@@ -4648,7 +4648,7 @@ sub_80F7F30: @ 80F7F30
ldrb r0, [r4]
bl sub_80DB09C
_080F7F5E:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
pop {r4,r5}
pop {r0}
asm/daycare.s
+3 -3
View File
@@ -3075,12 +3075,12 @@ c3_080469FC: @ 8071204
b _0807124E
.pool
_0807123C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
b _0807124E
.pool
_08071248:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
strh r0, [r1]
_0807124E:
@@ -3109,7 +3109,7 @@ _08071284:
ands r0, r2
cmp r0, 0
beq _080712B4
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
ldrb r0, [r4, 0x8]
movs r1, 0
asm/dewford_trend.s
+2 -2
View File
@@ -667,7 +667,7 @@ sub_81229C8: @ 81229C8
negs r0, r0
lsrs r4, r0, 31
_08122A0C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r4, [r0]
pop {r4}
pop {r0}
@@ -677,7 +677,7 @@ _08122A0C:
thumb_func_start sub_8122A30
sub_8122A30: @ 8122A30
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, =0x00002e6c
asm/easy_chat.s
+3 -3
View File
@@ -1659,7 +1659,7 @@ _0811AFAC:
b _0811AFE6
.pool
_0811AFC0:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
ldr r0, =gUnknown_0203A118
ldr r0, [r0]
@@ -1709,7 +1709,7 @@ _0811B00C:
.pool
_0811B020:
bl sub_811BE9C
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl sub_811B4EC
strh r0, [r4]
bl sub_811B3E4
@@ -1860,7 +1860,7 @@ _0811B118:
b _0811B14A
.pool
_0811B134:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl sub_811B4EC
strh r0, [r4]
bl sub_811B3E4
asm/field_control_avatar.s
+6 -6
View File
@@ -184,7 +184,7 @@ sub_809C014: @ 809C014
push {r4-r6,lr}
sub sp, 0x8
adds r5, r0, 0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
movs r1, 0
strh r1, [r0]
ldr r0, =gSelectedMapObject
@@ -582,13 +582,13 @@ _0809C34C:
ble _0809C340
ldr r0, =gSelectedMapObject
strb r3, [r0]
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_ScriptLastTalked
adds r0, r2, r3
lsls r0, 2
adds r0, r5
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, =gScriptFacing
ldr r0, =gSpecialVar_ScriptFacing
strh r6, [r0]
adds r0, r3, 0
bl GetFieldObjectScriptPointerByFieldObjectId
@@ -668,13 +668,13 @@ _0809C400:
_0809C40C:
ldr r0, =gSelectedMapObject
strb r4, [r0]
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_ScriptLastTalked
adds r0, r2, r4
lsls r0, 2
adds r0, r3
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, =gScriptFacing
ldr r0, =gSpecialVar_ScriptFacing
strh r7, [r0]
bl InTrainerHill
cmp r0, 0x1
@@ -687,7 +687,7 @@ _0809C43C:
bl GetFieldObjectScriptPointerByFieldObjectId
_0809C442:
adds r1, r0, 0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
ldrb r0, [r0]
bl GetRamScript
adds r1, r0, 0
asm/field_poison.s
+3 -3
View File
@@ -203,12 +203,12 @@ _080F96C0:
cmp r0, 0
beq _080F96F0
_080F96E6:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
b _080F9718
.pool
_080F96F0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
b _080F9718
@@ -224,7 +224,7 @@ _080F96FC:
b _080F9722
.pool
_080F9714:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
_080F9718:
bl EnableBothScriptContexts
asm/field_screen.s
+1 -1
View File
@@ -10424,7 +10424,7 @@ sub_80B0534: @ 80B0534
lsls r1, 3
ldr r0, =gTasks + 0x8
adds r1, r0
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0
bne _080B0568
asm/fldeff_80F9BCC.s
+6 -6
View File
@@ -563,7 +563,7 @@ _080F9FFE:
sub_80FA004: @ 80FA004
push {r4,lr}
bl sub_80E8BC8
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x1
beq _080FA0AE
@@ -2063,7 +2063,7 @@ _080FACC2:
ldr r0, =gStringVar2
ldr r1, =gText_Gold
bl StringCopy
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
ldr r0, =0x00004054
@@ -2087,7 +2087,7 @@ _080FAD14:
ldr r0, =gStringVar2
ldr r1, =gText_Silver
bl StringCopy
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
ldr r0, =0x00004054
@@ -2103,12 +2103,12 @@ _080FAD14:
b _080FAD8A
.pool
_080FAD60:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _080FAD70
.pool
_080FAD6C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
_080FAD70:
strh r0, [r1]
@@ -2131,7 +2131,7 @@ _080FAD8A:
b _080FADCE
.pool
_080FADA4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x3
strh r0, [r1]
ldr r0, =0x00004054
asm/fldeff_strength.s
+1 -1
View File
@@ -17,7 +17,7 @@ hm_prepare_rocksmash: @ 8145DC4
movs r0, 0
b _08145DF2
_08145DD8:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
asm/item_menu.s
+6 -6
View File
@@ -121,7 +121,7 @@ sub_81AAC28: @ 81AAC28
ldr r0, =gSpecialVar_0x8005
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
pop {r0}
bx r0
@@ -135,7 +135,7 @@ sub_81AAC50: @ 81AAC50
movs r0, 0x7
movs r1, 0x5
bl GoToBagMenu
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
pop {r0}
@@ -150,7 +150,7 @@ sub_81AAC70: @ 81AAC70
movs r0, 0x8
movs r1, 0x5
bl GoToBagMenu
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
pop {r0}
@@ -5729,7 +5729,7 @@ unknown_ItemMenu_Show: @ 81ADE38
ldr r0, =gScriptItemId
ldrh r0, [r0]
strh r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
bl bag_menu_remove_some_window
@@ -5764,7 +5764,7 @@ unknown_ItemMenu_Give2: @ 81ADE8C
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
bl bag_menu_remove_some_window
@@ -5795,7 +5795,7 @@ unknown_ItemMenu_Confirm2: @ 81ADEDC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
bl bag_menu_remove_some_window
asm/link.s
+27 -27
View File
@@ -18044,7 +18044,7 @@ BerryBlenderLinkBecomeLeader: @ 801273C
movs r0, 0
strb r0, [r1, 0xC]
strb r0, [r1, 0xD]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
strh r0, [r1]
pop {r0}
bx r0
@@ -18891,7 +18891,7 @@ _08012EE6:
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x5
strh r0, [r1]
b _08012F50
@@ -18900,7 +18900,7 @@ _08012EFC:
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x8
strh r0, [r1]
b _08012F50
@@ -19569,7 +19569,7 @@ BerryBlenderLinkJoinGroup: @ 80134A4
movs r0, 0
strb r0, [r1, 0x8]
strb r0, [r1, 0x9]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
strh r0, [r1]
pop {r0}
bx r0
@@ -20194,13 +20194,13 @@ _08013AE4:
lsls r0, 24
cmp r0, 0
beq _08013B82
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
movs r1, 0x6
b _08013B58
.pool
_08013B14:
bl sub_800E084
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
movs r1, 0x5
b _08013B58
.pool
@@ -20226,7 +20226,7 @@ _08013B4A:
lsls r0, 24
cmp r0, 0
beq _08013B82
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
movs r1, 0x8
_08013B58:
strh r1, [r0]
@@ -21544,7 +21544,7 @@ _0801474C:
_08014764:
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
ldr r0, =gUnknown_02022C2C
@@ -21600,7 +21600,7 @@ _080147CC:
.4byte _08014992
.4byte _0801499C
_080147F0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
ldr r0, =gUnknown_02022C2C
@@ -21744,7 +21744,7 @@ _0801494A:
bl sub_80B2AF4
cmp r0, 0
beq _08014980
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
movs r1, 0xB
strh r1, [r0]
movs r0, 0x7
@@ -21835,7 +21835,7 @@ sub_8014A00: @ 8014A00
strb r2, [r1, 0xC]
strb r2, [r1, 0xD]
strb r4, [r1, 0x18]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r2, [r0]
pop {r4}
pop {r0}
@@ -22295,7 +22295,7 @@ _08014E4E:
beq _08014EF2
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x5
strh r0, [r1]
b _08014EF2
@@ -22384,7 +22384,7 @@ sub_8014EFC: @ 8014EFC
strb r2, [r1, 0x9]
subs r4, 0x15
strb r4, [r1, 0x12]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r2, [r0]
pop {r4}
pop {r0}
@@ -22725,7 +22725,7 @@ _0801526A:
adds r0, r6, 0
bl DestroyTask
bl sub_800EDD4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x5
strh r0, [r1]
b _080152A0
@@ -22773,7 +22773,7 @@ sub_80152A8: @ 80152A8
strb r2, [r1, 0x9]
subs r4, 0x15
strb r4, [r1, 0x12]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r2, [r0]
pop {r4}
pop {r0}
@@ -23097,7 +23097,7 @@ _080155C2:
adds r0, r4, 0
bl DestroyTask
bl sub_800EDD4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x5
strh r0, [r1]
b _08015604
@@ -23141,7 +23141,7 @@ UnionRoomSpecial: @ 801560C
strb r1, [r0, 0x16]
strh r1, [r0, 0x10]
strh r1, [r0, 0x12]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
movs r0, 0xD0
movs r1, 0x1
@@ -23384,7 +23384,7 @@ _08015878:
ldr r0, [r6, 0xC]
movs r1, 0x4
bl sub_80175EC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
movs r0, 0x3
@@ -23486,7 +23486,7 @@ _080159A0:
movs r0, 0x4
bl _08016876
_080159A6:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
ldrh r0, [r4]
cmp r0, 0
beq _08015A0A
@@ -25069,7 +25069,7 @@ var_800D_set_xB: @ 8016884
bl InUnionRoom
cmp r0, 0x1
bne _08016894
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0xB
strh r0, [r1]
_08016894:
@@ -30491,7 +30491,7 @@ _0801940C:
b _08019922
.pool
_0801942C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x5
beq _08019436
@@ -30992,7 +30992,7 @@ _080197F8:
b _08019922
.pool
_08019810:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x5
beq _0801981A
@@ -39452,7 +39452,7 @@ _0801DC10:
thumb_func_start sub_801DC20
sub_801DC20: @ 801DC20
push {r4-r6,lr}
ldr r6, =gScriptResult
ldr r6, =gSpecialVar_ScriptResult
bl sub_801B044
adds r4, r0, 0
bl IsMysteryEventEnabled
@@ -59190,7 +59190,7 @@ sub_8027A48: @ 8027A48
sub_8027A5C: @ 8027A5C
push {r4-r6,lr}
movs r5, 0
ldr r6, =gScriptResult
ldr r6, =gSpecialVar_ScriptResult
_08027A62:
movs r0, 0x64
adds r1, r5, 0
@@ -59215,7 +59215,7 @@ _08027A94:
adds r5, 0x1
cmp r5, 0x5
ble _08027A62
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
_08027AA0:
@@ -68862,7 +68862,7 @@ _0802C924:
bl sub_802C908
cmp r0, 0
beq _0802C95C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _0802C966
.pool
@@ -68870,7 +68870,7 @@ _0802C95C:
adds r5, 0x1
cmp r5, 0x5
ble _0802C924
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
_0802C966:
strh r0, [r1]
asm/map_obj_lock.s
+1 -1
View File
@@ -256,7 +256,7 @@ sub_8098574: @ 8098574
lsls r0, 2
ldr r1, =gMapObjects
adds r0, r1
ldr r1, =gScriptFacing
ldr r1, =gSpecialVar_ScriptFacing
ldrb r1, [r1]
bl FieldObjectFaceOppositeDirection
pop {r0}
asm/mauville_old_man.s
+10 -10
View File
@@ -157,7 +157,7 @@ sub_81201C8: @ 81201C8
thumb_func_start sub_81201DC
sub_81201DC: @ 81201DC
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl sub_81201C8
lsls r0, 24
lsrs r0, 24
@@ -170,7 +170,7 @@ sub_81201DC: @ 81201DC
thumb_func_start sub_81201F4
sub_81201F4: @ 81201F4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x00002e51
@@ -347,7 +347,7 @@ sub_8120340: @ 8120340
thumb_func_start sub_8120358
sub_8120358: @ 8120358
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x00002e28
@@ -379,14 +379,14 @@ sub_812038C: @ 812038C
ldr r0, =0x0000ffff
cmp r1, r0
bne _081203AC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
b _081203B6
.pool
_081203AC:
ldr r0, =gStringVar1
bl CopyEasyChatWord
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
_081203B6:
strh r0, [r1]
@@ -405,14 +405,14 @@ sub_81203C4: @ 81203C4
ldrb r0, [r2, 0x1]
cmp r0, 0xA
bne _081203EC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
strb r0, [r2, 0x1]
b _081203F2
.pool
_081203EC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
_081203F2:
@@ -503,7 +503,7 @@ _081204C4:
adds r0, 0x1
_081204C8:
strb r0, [r5, 0x1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
pop {r4-r6}
@@ -2382,13 +2382,13 @@ _0812132C:
cmp r4, r0
bne _0812135C
_0812134E:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
b _08121364
.pool
_0812135C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
ldr r0, =gUnknown_03001178
strb r4, [r0]
asm/party_menu.s
+11 -11
View File
@@ -1219,7 +1219,7 @@ sub_81B0BFC: @ 81B0BFC
ldrb r0, [r0, 0xB]
cmp r0, 0xC
bne _081B0C40
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
ldr r0, =gSpecialVar_0x8005
@@ -8135,7 +8135,7 @@ sub_81B4578: @ 81B4578
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r7, [r0]
cmp r7, 0
bne _081B45F8
@@ -12928,7 +12928,7 @@ _081B6FC0:
_081B6FDC:
cmp r0, 0x2
bne _081B6FE4
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r2, [r0]
_081B6FE4:
adds r0, r5, 0
@@ -13324,7 +13324,7 @@ _081B7306:
_081B7368:
cmp r0, 0x2
bne _081B7370
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
_081B7370:
ldr r0, =gTasks
@@ -14933,7 +14933,7 @@ sub_81B81A8: @ 81B81A8
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0
bne _081B8208
@@ -17381,7 +17381,7 @@ _081B95BA:
thumb_func_start sub_81B95E0
sub_81B95E0: @ 81B95E0
push {r4,r5,lr}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
movs r4, 0
@@ -17490,7 +17490,7 @@ sub_81B968C: @ 81B968C
thumb_func_start sub_81B96D0
sub_81B96D0: @ 81B96D0
push {r4,r5,lr}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
movs r4, 0
@@ -17741,13 +17741,13 @@ sub_81B98DC: @ 81B98DC
adds r1, r0, 0
cmp r1, 0
beq _081B990C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
b _081B9910
.pool
_081B990C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
_081B9910:
pop {r0}
@@ -17760,7 +17760,7 @@ sub_81B9918: @ 81B9918
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
ldr r0, =gSpecialVar_0x8004
@@ -17813,7 +17813,7 @@ _081B9980:
bl sub_80D23A8
cmp r0, 0x1
beq _081B999C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
_081B999C:
asm/pokemon_summary_screen.s
+2 -2
View File
@@ -5238,7 +5238,7 @@ _081C6AF8:
bl Free
adds r0, r5, 0
bl Free
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
b _081C6BC6
@@ -5266,7 +5266,7 @@ _081C6B9C:
lsrs r6, r0, 24
cmp r6, 0x2
bls _081C6B9C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
adds r0, r7, 0
asm/pokenav.s
+21 -21
View File
@@ -27683,7 +27683,7 @@ _081D4AF8:
movs r2, 0x80
orrs r1, r2
strb r1, [r0]
ldr r0, =gScriptFacing
ldr r0, =gSpecialVar_ScriptFacing
ldrh r0, [r0]
cmp r0, 0x2
beq _081D4B3A
@@ -29323,7 +29323,7 @@ _081D5854:
sub_81D58D8: @ 81D58D8
push {lr}
bl sub_80008E8
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r3]
ldr r0, =gSaveBlock1Ptr
@@ -29381,7 +29381,7 @@ sub_81D5924: @ 81D5924
cmp r4, 0
beq _081D596C
_081D5952:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
strh r0, [r1]
b _081D59C0
@@ -29413,12 +29413,12 @@ _081D596C:
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r4, [r0]
b _081D59C0
.pool
_081D59BC:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r6, [r0]
_081D59C0:
pop {r3}
@@ -29444,7 +29444,7 @@ sub_81D59D0: @ 81D59D0
lsrs r5, r0, 24
cmp r5, 0
beq _081D59FC
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r3, [r0]
b _081D5A4E
.pool
@@ -29473,12 +29473,12 @@ _081D59FC:
adds r2, r0
ldr r0, [r2]
str r0, [r1]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r5, [r0]
b _081D5A4E
.pool
_081D5A48:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
_081D5A4E:
@@ -29556,7 +29556,7 @@ sub_81D5AD0: @ 81D5AD0
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
b _081D5B20
.pool
@@ -29569,12 +29569,12 @@ _081D5B00:
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _081D5B20
.pool
_081D5B1C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
_081D5B20:
strh r0, [r1]
@@ -29653,12 +29653,12 @@ sub_81D5BBC: @ 81D5BBC
movs r2, 0
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
b _081D5BF0
.pool
_081D5BEC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
_081D5BF0:
strh r0, [r1]
@@ -29672,7 +29672,7 @@ _081D5BF0:
sub_81D5C00: @ 81D5C00
push {lr}
bl sub_81D56B0
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
bl sub_81D5710
@@ -29721,12 +29721,12 @@ sub_81D5C5C: @ 81D5C5C
lsrs r1, r0, 24
cmp r1, 0
bne _081D5C74
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
b _081D5C7A
.pool
_081D5C74:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
_081D5C7A:
@@ -30495,7 +30495,7 @@ sub_81D62AC: @ 81D62AC
thumb_func_start sub_81D62B4
sub_81D62B4: @ 81D62B4
push {lr}
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_ScriptLastTalked
ldrh r1, [r0]
movs r0, 0x5
bl sub_81D572C
@@ -30772,7 +30772,7 @@ _081D64D4:
thumb_func_start sub_81D64DC
sub_81D64DC: @ 81D64DC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ef9
@@ -30825,7 +30825,7 @@ sub_81D6534: @ 81D6534
cmp r0, 0x6
beq _081D6560
bl sub_81D5C00
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0
beq _081D6560
@@ -30851,12 +30851,12 @@ sub_81D6568: @ 81D6568
ands r0, r1
cmp r0, 0
beq _081D6590
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
b _081D6594
.pool
_081D6590:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
_081D6594:
strh r0, [r1]
asm/recorded_battle.s
+1 -1
View File
@@ -334,7 +334,7 @@ sub_8185054: @ 8185054
cmp r0, 0xFF
bne _081850BC
_0818507A:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r1, =gBattleOutcome
movs r0, 0x5
strb r0, [r1]
asm/rom6.s
+27 -27
View File
@@ -31,7 +31,7 @@ npc_before_player_of_type: @ 8135424
ldrb r0, [r2, 0x5]
cmp r0, r5
bne _08135470
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_ScriptLastTalked
ldrb r0, [r2, 0x8]
strh r0, [r1]
movs r0, 0x1
@@ -262,7 +262,7 @@ sub_8135654: @ 8135654
lsls r0, 24
cmp r0, 0
beq _0813568C
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
@@ -2136,7 +2136,7 @@ _081366B6:
_081366D0:
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldr r2, =0x0000ffff
adds r1, r2, 0
strh r1, [r0]
@@ -2853,7 +2853,7 @@ sub_8136D2C: @ 8136D2C
adds r1, r3
ldr r1, [r1]
bl StringCopy
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldrh r0, [r5]
strh r0, [r1]
lsls r0, 24
@@ -2888,7 +2888,7 @@ sub_8136D90: @ 8136D90
lsls r0, 24
lsrs r0, 24
strh r0, [r6]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldrh r0, [r5]
strh r0, [r1]
lsls r0, 24
@@ -3333,7 +3333,7 @@ sub_81370FC: @ 81370FC
lsls r0, 24
cmp r0, 0
beq _08137134
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
@@ -4899,7 +4899,7 @@ _08137E58:
lsls r0, 24
lsrs r4, r0, 24
_08137E5C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r4, [r0]
pop {r4-r7}
pop {r0}
@@ -7214,7 +7214,7 @@ _081390E6:
cmp r0, 0xC
bne _0813913C
_08139128:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _0813914A
.pool
@@ -7224,7 +7224,7 @@ _0813913C:
lsrs r5, r0, 24
cmp r5, 0x5
bls _081390E6
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
_0813914A:
strh r0, [r1]
@@ -8044,7 +8044,7 @@ _081397BE:
thumb_func_start sub_81397C4
sub_81397C4: @ 81397C4
push {r4,r5,lr}
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldrh r1, [r2]
ldr r0, =0x0000270f
cmp r1, r0
@@ -8123,7 +8123,7 @@ _08139862:
thumb_func_start sub_813986C
sub_813986C: @ 813986C
push {lr}
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x4
bhi _081398B8
@@ -9381,7 +9381,7 @@ _0813A2BE:
strh r4, [r3, 0x26]
b _0813A2D2
_0813A2C6:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x7F
strh r0, [r1]
adds r0, r4, 0
@@ -9649,7 +9649,7 @@ sub_813A4EC: @ 813A4EC
b _0813A566
.pool
_0813A51C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x7F
strh r0, [r1]
movs r0, 0x5
@@ -9657,7 +9657,7 @@ _0813A51C:
b _0813A54C
.pool
_0813A530:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r4, [r0]
movs r0, 0x5
bl PlaySE
@@ -10930,7 +10930,7 @@ task_deoxys_sound: @ 813AFDC
lsrs r0, 24
cmp r0, 0x1
bne _0813B004
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x3
b _0813B06A
.pool
@@ -10961,7 +10961,7 @@ _0813B004:
mov r0, r8
movs r1, 0
bl VarSet
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
b _0813B070
@@ -10971,7 +10971,7 @@ _0813B05C:
bne _0813B080
ldr r0, =0x000008d4
bl FlagSet
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
_0813B06A:
strh r0, [r1]
@@ -10991,7 +10991,7 @@ _0813B080:
ldr r0, =0x00004035
adds r1, r5, 0
bl VarSet
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
adds r0, r7, 0
@@ -11684,7 +11684,7 @@ _0813B62E:
ldrh r1, [r5]
cmp r1, 0x1
bne _0813B668
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
b _0813B790
.pool
@@ -11698,7 +11698,7 @@ _0813B668:
ldrh r0, [r0]
cmp r0, 0x1
bne _0813B68C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
b _0813B6AC
.pool
@@ -11710,12 +11710,12 @@ _0813B68C:
ldrh r0, [r0]
cmp r0, 0
bne _0813B6A8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x3
b _0813B6AC
.pool
_0813B6A8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
_0813B6AC:
strh r0, [r1]
@@ -11736,7 +11736,7 @@ _0813B6C2:
bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r2, 0x2
bl SendBlock
b _0813B708
@@ -11751,7 +11751,7 @@ _0813B6E4:
lsls r0, 24
cmp r0, 0
beq _0813B790
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r0, =gBlockRecvBuffer
ldrh r0, [r0]
strh r0, [r1]
@@ -11773,7 +11773,7 @@ _0813B728:
lsls r0, 24
cmp r0, 0
bne _0813B74C
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x2
bne _0813B790
@@ -11782,7 +11782,7 @@ _0813B728:
b _0813B790
.pool
_0813B74C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x3
bne _0813B790
@@ -12041,7 +12041,7 @@ _0813B94E:
thumb_func_start sub_813B968
sub_813B968: @ 813B968
push {r4,r5,lr}
ldr r5, =gScriptResult
ldr r5, =gSpecialVar_ScriptResult
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
movs r1, 0x7
asm/script_menu.s
+15 -15
View File
@@ -24,7 +24,7 @@ ScriptMenu_Multichoice: @ 80E1E08
lsrs r0, 24
cmp r0, 0x1
beq _080E1E4C
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
movs r1, 0xFF
strh r1, [r0]
movs r0, 0
@@ -70,7 +70,7 @@ ScriptMenu_MultichoiceWithDefault: @ 80E1E58
lsrs r0, 24
cmp r0, 0x1
beq _080E1EA8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0xFF
strh r0, [r1]
str r4, [sp]
@@ -358,13 +358,13 @@ _080E20B8:
bne _080E20FC
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x7F
strh r0, [r1]
b _080E20EC
.pool
_080E20E8:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
_080E20EC:
ldrb r0, [r5, 0xC]
@@ -389,7 +389,7 @@ ScriptMenu_YesNo: @ 80E2108
lsrs r0, 24
cmp r0, 0x1
beq _080E2138
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0xFF
strh r0, [r1]
bl sub_8197930
@@ -410,7 +410,7 @@ _080E213A:
thumb_func_start sub_80E2140
sub_80E2140: @ 80E2140
push {lr}
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0xFF
beq _080E2154
@@ -465,12 +465,12 @@ _080E219C:
_080E21A4:
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
b _080E21B8
.pool
_080E21B4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
_080E21B8:
strh r0, [r1]
@@ -517,7 +517,7 @@ ScriptMenu_MultichoiceGrid: @ 80E21D0
b _080E22E8
.pool
_080E2210:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
movs r1, 0xFF
strh r1, [r0]
movs r2, 0
@@ -655,13 +655,13 @@ sub_80E2308: @ 80E2308
bne _080E2360
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x7F
strh r0, [r1]
b _080E2350
.pool
_080E234C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
_080E2350:
ldrb r0, [r5, 0xC]
@@ -686,7 +686,7 @@ sp109_CreatePCMenu: @ 80E236C
lsrs r0, 24
cmp r0, 0x1
beq _080E2394
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0xFF
strh r0, [r1]
bl CreatePCMenu
@@ -893,7 +893,7 @@ sub_80E2548: @ 80E2548
lsrs r0, 24
cmp r0, 0x1
beq _080E2570
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0xFF
strh r0, [r1]
bl sub_80E2578
@@ -1266,7 +1266,7 @@ _080E2860:
thumb_func_start sub_80E2878
sub_80E2878: @ 80E2878
push {lr}
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldrh r0, [r2]
cmp r0, 0x7F
beq _080E288C
@@ -1648,7 +1648,7 @@ sp106_CreateStartMenu: @ 80E2B7C
lsrs r0, 24
cmp r0, 0x1
beq _080E2BA4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0xFF
strh r0, [r1]
bl CreateStartMenu
asm/script_pokemon_util_80F87D8.s
+9 -9
View File
@@ -952,7 +952,7 @@ sub_80F8FA0: @ 80F8FA0
ands r0, r1
cmp r0, 0
bne _080F8FD8
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
@@ -960,7 +960,7 @@ sub_80F8FA0: @ 80F8FA0
b _080F8FDE
.pool
_080F8FD8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x4
strh r0, [r1]
_080F8FDE:
@@ -987,11 +987,11 @@ sub_80F8FE8: @ 80F8FE8
adds r0, r1
str r0, [r2]
lsrs r0, 16
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
b _080F902A
.pool
_080F9020:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_ScriptResult
bl Random
lsls r0, 16
lsrs r0, 16
@@ -1376,7 +1376,7 @@ _080F9310:
cmp r1, 0x2
bne _080F9318
_080F9314:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
_080F9318:
pop {r0}
@@ -1550,12 +1550,12 @@ sub_80F9460: @ 80F9460
ldrb r1, [r0]
cmp r1, 0
bne _080F9478
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
b _080F947E
.pool
_080F9478:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
_080F947E:
@@ -1590,12 +1590,12 @@ sub_80F94B8: @ 80F94B8
ldrb r1, [r0]
cmp r1, 0
bne _080F94D0
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
b _080F94D6
.pool
_080F94D0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
_080F94D6:
asm/secret_base.s
+12 -12
View File
@@ -74,7 +74,7 @@ sub_80E8B58: @ 80E8B58
thumb_func_start sub_80E8B6C
sub_80E8B6C: @ 80E8B6C
push {r4,lr}
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
movs r1, 0
strh r1, [r0]
movs r3, 0
@@ -123,13 +123,13 @@ sub_80E8BC8: @ 80E8BC8
ldrb r1, [r0]
cmp r1, 0
beq _080E8BEC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
b _080E8BF0
.pool
_080E8BEC:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
_080E8BF0:
pop {r0}
@@ -1175,7 +1175,7 @@ _080E941E:
cmp r0, 0x1
bne _080E9554
_080E9462:
ldr r6, =gScriptResult
ldr r6, =gSpecialVar_ScriptResult
mov r1, r9
ldr r0, [r1, 0x4]
ldr r1, [r0, 0x4]
@@ -1428,7 +1428,7 @@ sub_80E9680: @ 80E9680
push {lr}
bl sub_80E8B58
bl sub_80E8B6C
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrh r0, [r0]
cmp r0, 0x1
beq _080E969C
@@ -1527,12 +1527,12 @@ sub_80E9744: @ 80E9744
ldrb r1, [r1]
cmp r0, r1
beq _080E9770
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
b _080E9774
.pool
_080E9770:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
_080E9774:
strh r0, [r1]
@@ -2079,7 +2079,7 @@ sub_80E9BDC: @ 80E9BDC
lsrs r1, r0, 24
cmp r1, 0x1
bne _080E9C04
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
b _080E9C22
.pool
@@ -2089,12 +2089,12 @@ _080E9C04:
lsrs r0, 24
cmp r0, 0x9
bls _080E9C1C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x2
b _080E9C20
.pool
_080E9C1C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
_080E9C20:
strh r0, [r1]
@@ -2920,7 +2920,7 @@ sub_80EA30C: @ 80EA30C
adds r1, r0
lsls r1, 5
adds r3, r1
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
ldrb r0, [r0]
ldr r1, =0x00001a9d
adds r3, r1
@@ -2981,7 +2981,7 @@ _080EA39A:
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
lsls r0, r5, 2
asm/start_menu.s
+2 -2
View File
@@ -974,13 +974,13 @@ task50_save_game: @ 809FFD0
_0809FFEC:
cmp r1, 0x3
bgt _080A0000
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
b _080A0000
.pool
_0809FFFC:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r1, [r0]
_080A0000:
adds r0, r4, 0
asm/starter_choose.s
+1 -1
View File
@@ -555,7 +555,7 @@ _08134420:
beq _08134450
b _0813449A
_08134426:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_ScriptResult
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
asm/trader.s
+4 -4
View File
@@ -335,7 +335,7 @@ _08133CCA:
sub_8133CD8: @ 8133CD8
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
ldr r2, =0x00002e59
adds r0, r2
ldrb r0, [r0]
@@ -348,7 +348,7 @@ sub_8133CD8: @ 8133CD8
sub_8133CF4: @ 8133CF4
push {r4,r5,lr}
movs r4, 0
ldr r5, =gScriptResult
ldr r5, =gSpecialVar_ScriptResult
_08133CFA:
adds r0, r4, 0
bl CountDecorationCategoryN
@@ -365,7 +365,7 @@ _08133D10:
lsrs r4, r0, 24
cmp r4, 0x7
bls _08133CFA
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
_08133D20:
@@ -378,7 +378,7 @@ _08133D20:
thumb_func_start sub_8133D2C
sub_8133D2C: @ 8133D2C
push {r4-r6,lr}
ldr r6, =gScriptResult
ldr r6, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r6]
ldr r4, =gDecorations
asm/trainer_see.s
+2 -2
View File
@@ -1300,7 +1300,7 @@ sub_80B45D0: @ 80B45D0
bne _080B460C
adds r0, 0x1
strb r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0x1
strh r0, [r1]
bl UnfreezeMapObjects
@@ -1313,7 +1313,7 @@ _080B460C:
movs r0, 0
strb r0, [r1]
_080B4610:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
_080B4616:
asm/wild_encounter.s
+2 -2
View File
@@ -1628,12 +1628,12 @@ rock_smash_wild_pokemon_encounter: @ 80B550C
bne _080B5568
bl sub_80B0698
_080B5554:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_ScriptResult
strh r4, [r0]
b _080B556E
.pool
_080B5568:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_ScriptResult
movs r0, 0
strh r0, [r1]
_080B556E: