diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2018-05-04 17:45:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-04 17:45:50 -0400 |
commit | 58200616d55798002046e67a656f5295834455ec (patch) | |
tree | 7487b983c8205a97832831b6b6b06cf60534f65a /asm/field_screen.s | |
parent | 4acbcf5759cb2d5453631dd104e3a845931df66c (diff) | |
parent | cdb5e9e3143b2f1086d8bd4f02a76186c164d02a (diff) |
Merge branch 'master' into trader
Diffstat (limited to 'asm/field_screen.s')
-rw-r--r-- | asm/field_screen.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_screen.s b/asm/field_screen.s index 2a539d111..e3d48f882 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -8861,7 +8861,7 @@ sub_80AF87C: @ 80AF87C movs r0, 0x1 bl sub_8085540 bl ScriptContext2_Enable - bl save_serialize_npcs + bl SaveMapObjects bl music_something bl sub_80AF0B4 movs r0, 0x2D |