summaryrefslogtreecommitdiff
path: root/asm/load_save.s
diff options
context:
space:
mode:
authorpaul <nintendo6496@googlemail.com>2018-10-11 18:56:58 +0200
committerpaul <nintendo6496@googlemail.com>2018-10-11 18:56:58 +0200
commit50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch)
treef100b156dfa1eb6fe773d90004d79bb246e9dcbf /asm/load_save.s
parentacdd8cab26671a975b4f155b84b24388df9d84bc (diff)
parentbd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/load_save.s')
-rw-r--r--asm/load_save.s8
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/load_save.s b/asm/load_save.s
index f18414c41..836abd78e 100644
--- a/asm/load_save.s
+++ b/asm/load_save.s
@@ -273,7 +273,7 @@ copy_player_party_to_sav1: @ 804C1F0
push {r4,lr}
ldr r0, _0804C224 @ =gSaveBlock1Ptr
ldr r0, [r0]
- ldr r1, _0804C228 @ =gUnknown_2024029
+ ldr r1, _0804C228 @ =gPlayerPartyCount
ldrb r1, [r1]
adds r0, 0x34
strb r1, [r0]
@@ -297,14 +297,14 @@ _0804C200:
bx r0
.align 2, 0
_0804C224: .4byte gSaveBlock1Ptr
-_0804C228: .4byte gUnknown_2024029
+_0804C228: .4byte gPlayerPartyCount
_0804C22C: .4byte gPlayerParty
thumb_func_end copy_player_party_to_sav1
thumb_func_start sub_804C230
sub_804C230: @ 804C230
push {r4,r5,lr}
- ldr r1, _0804C264 @ =gUnknown_2024029
+ ldr r1, _0804C264 @ =gPlayerPartyCount
ldr r0, _0804C268 @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x34
@@ -330,7 +330,7 @@ _0804C242:
pop {r0}
bx r0
.align 2, 0
-_0804C264: .4byte gUnknown_2024029
+_0804C264: .4byte gPlayerPartyCount
_0804C268: .4byte gSaveBlock1Ptr
_0804C26C: .4byte gPlayerParty
thumb_func_end sub_804C230