summaryrefslogtreecommitdiff
path: root/asm/load_save.s
diff options
context:
space:
mode:
authorpaul <nintendo6496@googlemail.com>2018-10-06 17:51:44 +0200
committerpaul <nintendo6496@googlemail.com>2018-10-06 17:51:44 +0200
commit0aa555d13499fb5f446b5c42d3d7c5166225edc4 (patch)
tree7a73f77a735323c7967cc80d056b070b2fd687c7 /asm/load_save.s
parentefebe909c604beff57c7e2481a0de83dfe084d21 (diff)
parent2cb551cf0df29e2602d6a80c16f8bac0a136b134 (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 bb98ca619..f18414c41 100644
--- a/asm/load_save.s
+++ b/asm/load_save.s
@@ -284,7 +284,7 @@ _0804C200:
movs r1, 0x64
muls r1, r4
adds r0, r1
- ldr r2, _0804C22C @ =gUnknown_2024284
+ ldr r2, _0804C22C @ =gPlayerParty
adds r1, r2
adds r0, 0x38
movs r2, 0x64
@@ -298,7 +298,7 @@ _0804C200:
.align 2, 0
_0804C224: .4byte gSaveBlock1Ptr
_0804C228: .4byte gUnknown_2024029
-_0804C22C: .4byte gUnknown_2024284
+_0804C22C: .4byte gPlayerParty
thumb_func_end copy_player_party_to_sav1
thumb_func_start sub_804C230
@@ -311,7 +311,7 @@ sub_804C230: @ 804C230
ldrb r0, [r0]
strb r0, [r1]
movs r4, 0
- ldr r5, _0804C26C @ =gUnknown_2024284
+ ldr r5, _0804C26C @ =gPlayerParty
_0804C242:
movs r0, 0x64
adds r2, r4, 0
@@ -332,7 +332,7 @@ _0804C242:
.align 2, 0
_0804C264: .4byte gUnknown_2024029
_0804C268: .4byte gSaveBlock1Ptr
-_0804C26C: .4byte gUnknown_2024284
+_0804C26C: .4byte gPlayerParty
thumb_func_end sub_804C230
thumb_func_start save_serialize_npcs