summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/event_data.s18
-rw-r--r--asm/field_control_avatar.s4
-rw-r--r--asm/pokemon_size_record.s8
-rw-r--r--asm/quest_log.s245
-rw-r--r--asm/scrcmd.s26
5 files changed, 34 insertions, 267 deletions
diff --git a/asm/event_data.s b/asm/event_data.s
index 1875449fa..b6a12e8b2 100644
--- a/asm/event_data.s
+++ b/asm/event_data.s
@@ -78,7 +78,7 @@ _0806E164: .4byte 0x00000842
sub_806E168: @ 806E168
push {lr}
ldr r0, _0806E184 @ =0x0000403c
- bl sub_806E454
+ bl GetVarPointer
ldr r1, _0806E188 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0
@@ -98,7 +98,7 @@ _0806E18C: .4byte 0x00000838
sub_806E190: @ 806E190
push {lr}
ldr r0, _0806E1B0 @ =0x0000403c
- bl sub_806E454
+ bl GetVarPointer
ldr r1, _0806E1B4 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0xDA
@@ -154,7 +154,7 @@ _0806E1FE:
sub_806E204: @ 806E204
push {lr}
ldr r0, _0806E224 @ =0x0000404e
- bl sub_806E454
+ bl GetVarPointer
ldr r1, _0806E228 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0
@@ -174,7 +174,7 @@ _0806E228: .4byte gSaveBlock2Ptr
sub_806E22C: @ 806E22C
push {lr}
ldr r0, _0806E250 @ =0x0000404e
- bl sub_806E454
+ bl GetVarPointer
ldr r1, _0806E254 @ =gSaveBlock2Ptr
ldr r2, [r1]
movs r1, 0xB9
@@ -419,8 +419,8 @@ _0806E44E:
bx r1
thumb_func_end CanResetRTC
- thumb_func_start sub_806E454
-sub_806E454: @ 806E454
+ thumb_func_start GetVarPointer
+GetVarPointer: @ 806E454
push {r4-r6,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -522,7 +522,7 @@ _0806E518:
.align 2, 0
_0806E520: .4byte gUnknown_815FD0C
_0806E524: .4byte 0xffff8000
- thumb_func_end sub_806E454
+ thumb_func_end GetVarPointer
thumb_func_start sub_806E528
sub_806E528: @ 806E528
@@ -569,7 +569,7 @@ VarGet: @ 806E568
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_806E454
+ bl GetVarPointer
cmp r0, 0
beq _0806E57C
ldrh r0, [r0]
@@ -589,7 +589,7 @@ VarSet: @ 806E584
lsrs r0, 16
lsls r1, 16
lsrs r4, r1, 16
- bl sub_806E454
+ bl GetVarPointer
cmp r0, 0
beq _0806E59C
strh r4, [r0]
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 41bcd05c1..237472c45 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -1872,7 +1872,7 @@ _0806D748: .4byte 0x00004021
AdjustFriendship_step: @ 806D74C
push {r4,r5,lr}
ldr r0, _0806D780 @ =0x00004021
- bl sub_806E454
+ bl GetVarPointer
ldrh r1, [r0]
adds r1, 0x1
strh r1, [r0]
@@ -1921,7 +1921,7 @@ overworld_poison_step: @ 806D79C
cmp r0, 0x9
beq _0806D7E0
ldr r0, _0806D7DC @ =0x00004022
- bl sub_806E454
+ bl GetVarPointer
adds r4, r0, 0
ldrh r0, [r4]
adds r0, 0x1
diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s
index 50ddd41a4..56a5d54f5 100644
--- a/asm/pokemon_size_record.s
+++ b/asm/pokemon_size_record.s
@@ -327,7 +327,7 @@ _080A0914: .4byte 0x0000403d
sub_80A0918: @ 80A0918
push {lr}
ldr r0, _080A092C @ =0x0000403d
- bl sub_806E454
+ bl GetVarPointer
adds r1, r0, 0
movs r0, 0xD6
bl sub_80A08CC
@@ -341,7 +341,7 @@ _080A092C: .4byte 0x0000403d
sub_80A0930: @ 80A0930
push {r4,lr}
ldr r0, _080A0950 @ =0x0000403d
- bl sub_806E454
+ bl GetVarPointer
adds r1, r0, 0
ldr r4, _080A0954 @ =gUnknown_20370D0
movs r0, 0xD6
@@ -373,7 +373,7 @@ _080A0968: .4byte 0x00004040
sub_80A096C: @ 80A096C
push {lr}
ldr r0, _080A0980 @ =0x00004040
- bl sub_806E454
+ bl GetVarPointer
adds r1, r0, 0
movs r0, 0x81
bl sub_80A08CC
@@ -387,7 +387,7 @@ _080A0980: .4byte 0x00004040
sub_80A0984: @ 80A0984
push {r4,lr}
ldr r0, _080A09A4 @ =0x00004040
- bl sub_806E454
+ bl GetVarPointer
adds r1, r0, 0
ldr r4, _080A09A8 @ =gUnknown_20370D0
movs r0, 0x81
diff --git a/asm/quest_log.s b/asm/quest_log.s
index 5e6e71eb4..fa9018ce5 100644
--- a/asm/quest_log.s
+++ b/asm/quest_log.s
@@ -5,239 +5,6 @@
.text
- thumb_func_start sub_8112FD0
-sub_8112FD0: @ 8112FD0
- push {lr}
- ldr r0, _08112FE0 @ =gUnknown_203B020
- ldrb r0, [r0]
- bl sub_8112F18
- pop {r0}
- bx r0
- .align 2, 0
-_08112FE0: .4byte gUnknown_203B020
- thumb_func_end sub_8112FD0
-
- thumb_func_start sub_8112FE4
-sub_8112FE4: @ 8112FE4
- push {lr}
- sub sp, 0x14
- adds r2, r0, 0
- ldr r0, _08113010 @ =gUnknown_203B020
- ldrb r0, [r0]
- movs r1, 0x1
- str r1, [sp]
- str r1, [sp, 0x4]
- ldr r1, _08113014 @ =gUnknown_8456930
- str r1, [sp, 0x8]
- movs r1, 0x1
- negs r1, r1
- str r1, [sp, 0xC]
- str r2, [sp, 0x10]
- movs r1, 0x2
- movs r2, 0x2
- movs r3, 0x5
- bl AddTextPrinterParametrized2
- add sp, 0x14
- pop {r0}
- bx r0
- .align 2, 0
-_08113010: .4byte gUnknown_203B020
-_08113014: .4byte gUnknown_8456930
- thumb_func_end sub_8112FE4
-
- thumb_func_start sub_8113018
-sub_8113018: @ 8113018
- push {r4,r5,lr}
- adds r4, r0, 0
- lsls r1, 24
- lsrs r5, r1, 24
- bl sub_8112FD0
- adds r0, r4, 0
- bl sub_8112FE4
- cmp r5, 0
- beq _08113038
- ldr r0, _08113040 @ =gUnknown_203B020
- ldrb r0, [r0]
- adds r1, r5, 0
- bl CopyWindowToVram
-_08113038:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08113040: .4byte gUnknown_203B020
- thumb_func_end sub_8113018
-
- thumb_func_start sub_8113044
-sub_8113044: @ 8113044
- push {lr}
- ldr r0, _0811305C @ =0x00004038
- movs r1, 0
- bl VarSet
- ldr r0, _08113060 @ =0x00004039
- movs r1, 0
- bl VarSet
- pop {r0}
- bx r0
- .align 2, 0
-_0811305C: .4byte 0x00004038
-_08113060: .4byte 0x00004039
- thumb_func_end sub_8113044
-
- thumb_func_start sub_8113064
-sub_8113064: @ 8113064
- push {lr}
- ldr r0, _08113074 @ =0x00004038
- bl sub_806E454
- bl sub_8113078
- pop {r0}
- bx r0
- .align 2, 0
-_08113074: .4byte 0x00004038
- thumb_func_end sub_8113064
-
- thumb_func_start sub_8113078
-sub_8113078: @ 8113078
- push {r4,lr}
- adds r4, r0, 0
- bl sub_8113508
- lsls r0, 24
- cmp r0, 0
- beq _08113098
- adds r0, r4, 0
- bl sub_81132E0
- ldr r0, _081130A0 @ =0x00004039
- ldr r1, _081130A4 @ =gSaveBlock2Ptr
- ldr r1, [r1]
- ldrh r1, [r1, 0xE]
- bl VarSet
-_08113098:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_081130A0: .4byte 0x00004039
-_081130A4: .4byte gSaveBlock2Ptr
- thumb_func_end sub_8113078
-
- thumb_func_start sub_81130A8
-sub_81130A8: @ 81130A8
- push {lr}
- ldr r0, _081130B8 @ =0x00004038
- bl sub_806E454
- bl sub_81130BC
- pop {r0}
- bx r0
- .align 2, 0
-_081130B8: .4byte 0x00004038
- thumb_func_end sub_81130A8
-
- thumb_func_start sub_81130BC
-sub_81130BC: @ 81130BC
- push {r4,lr}
- adds r4, r0, 0
- ldrb r1, [r4]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _08113102
- adds r0, r4, 0
- bl sub_8113524
- adds r0, r4, 0
- bl sub_8113390
- ldr r0, _08113108 @ =0x00004039
- ldr r1, _0811310C @ =gSaveBlock2Ptr
- ldr r1, [r1]
- ldrh r1, [r1, 0xE]
- bl VarSet
- movs r0, 0x6C
- bl FlagClear
- movs r0, 0x6D
- bl FlagClear
- movs r0, 0x6E
- bl FlagClear
- movs r0, 0x6F
- bl FlagClear
- ldr r0, _08113110 @ =0x00004073
- movs r1, 0x1
- bl VarSet
-_08113102:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08113108: .4byte 0x00004039
-_0811310C: .4byte gSaveBlock2Ptr
-_08113110: .4byte 0x00004073
- thumb_func_end sub_81130BC
-
- thumb_func_start sub_8113114
-sub_8113114: @ 8113114
- push {r4,r5,lr}
- adds r4, r0, 0
- lsls r1, 24
- lsrs r5, r1, 24
- ldr r0, _0811315C @ =0x00004073
- bl VarGet
- lsls r0, 16
- lsrs r0, 16
- cmp r0, 0x2
- bne _08113188
- ldr r0, [r4]
- lsls r2, r0, 25
- lsrs r1, r2, 25
- ldr r0, _08113160 @ =gUnknown_8456934
- adds r0, r5, r0
- ldrb r0, [r0]
- adds r1, r0
- cmp r1, 0x13
- ble _08113174
- adds r0, r4, 0
- bl sub_81132A0
- lsls r0, 16
- lsrs r0, 16
- cmp r0, 0x2
- bhi _08113164
- adds r0, r4, 0
- bl sub_8113194
- ldrb r1, [r4]
- movs r0, 0x80
- negs r0, r0
- ands r0, r1
- b _08113186
- .align 2, 0
-_0811315C: .4byte 0x00004073
-_08113160: .4byte gUnknown_8456934
-_08113164:
- ldrb r0, [r4]
- movs r1, 0x80
- negs r1, r1
- ands r1, r0
- movs r0, 0x14
- orrs r1, r0
- strb r1, [r4]
- b _08113188
-_08113174:
- lsrs r1, r2, 25
- adds r1, r0
- movs r0, 0x7F
- ands r1, r0
- ldrb r2, [r4]
- movs r0, 0x80
- negs r0, r0
- ands r0, r2
- orrs r0, r1
-_08113186:
- strb r0, [r4]
-_08113188:
- ldr r0, [r4]
- lsls r0, 25
- lsrs r0, 25
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_8113114
-
thumb_func_start sub_8113194
sub_8113194: @ 8113194
push {r4-r7,lr}
@@ -377,7 +144,7 @@ _08113284: .4byte gUnknown_8456940
sub_8113288: @ 8113288
push {lr}
ldr r0, _0811329C @ =0x00004038
- bl sub_806E454
+ bl GetVarPointer
bl sub_81132A0
lsls r0, 16
lsrs r0, 16
@@ -419,7 +186,7 @@ _081132BA:
sub_81132CC: @ 81132CC
push {lr}
ldr r0, _081132DC @ =0x00004038
- bl sub_806E454
+ bl GetVarPointer
bl sub_81132E0
pop {r0}
bx r0
@@ -495,7 +262,7 @@ _0811335C:
sub_8113364: @ 8113364
push {lr}
ldr r0, _08113378 @ =0x00004038
- bl sub_806E454
+ bl GetVarPointer
bl sub_811337C
lsls r0, 16
lsrs r0, 16
@@ -674,7 +441,7 @@ _081134B2:
sub_81134B8: @ 81134B8
push {lr}
ldr r0, _081134C8 @ =0x00004038
- bl sub_806E454
+ bl GetVarPointer
bl sub_81134CC
pop {r0}
bx r0
@@ -725,7 +492,7 @@ sub_8113508: @ 8113508
sub_8113510: @ 8113510
push {lr}
ldr r0, _08113520 @ =0x00004038
- bl sub_806E454
+ bl GetVarPointer
bl sub_8113524
pop {r0}
bx r0
@@ -746,7 +513,7 @@ sub_8113524: @ 8113524
sub_8113530: @ 8113530
push {lr}
ldr r0, _08113548 @ =0x00004038
- bl sub_806E454
+ bl GetVarPointer
ldr r1, _0811354C @ =gUnknown_20370C0
ldrb r1, [r1]
bl sub_8113114
diff --git a/asm/scrcmd.s b/asm/scrcmd.s
index 733860772..85fbd6162 100644
--- a/asm/scrcmd.s
+++ b/asm/scrcmd.s
@@ -79,7 +79,7 @@ sub_8069F3C: @ 8069F3C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
@@ -692,7 +692,7 @@ ScrCmd_setvar: @ 806A390
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
adds r4, r0, 0
adds r0, r5, 0
bl ScriptReadHalfword
@@ -710,13 +710,13 @@ ScrCmd_copyvar: @ 806A3B4
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
ldrh r0, [r0]
strh r0, [r5]
movs r0, 0
@@ -732,7 +732,7 @@ ScrCmd_setorcopyvar: @ 806A3E0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
@@ -909,7 +909,7 @@ ScrCmd_compare_var_to_value: @ 806A520
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
ldrh r5, [r0]
adds r0, r4, 0
bl ScriptReadHalfword
@@ -932,13 +932,13 @@ ScrCmd_compare_var_to_var: @ 806A550
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
ldrh r2, [r5]
ldrh r1, [r0]
adds r0, r2, 0
@@ -957,7 +957,7 @@ ScrCmd_addvar: @ 806A584
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
adds r4, r0, 0
adds r0, r5, 0
bl ScriptReadHalfword
@@ -977,7 +977,7 @@ ScrCmd_subvar: @ 806A5AC
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
@@ -2319,13 +2319,13 @@ ScrCmd_getplayerxy: @ 806B010
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
adds r5, r0, 0
adds r0, r4, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
ldr r2, _0806B048 @ =gSaveBlock1Ptr
ldr r1, [r2]
ldrh r1, [r1]
@@ -5428,7 +5428,7 @@ ScrCmd_checkcoins: @ 806C72C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E454
+ bl GetVarPointer
adds r4, r0, 0
bl sub_80D0554
strh r0, [r4]
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 04:01:55 +0000