diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
| commit | 13efa1ef62b3e23e2b0662e318ed155893e17e88 (patch) | |
| tree | 57ae51e1b35c38d24d69e090dbf39b27a687d17b /asm/field_screen.s | |
| parent | d31600e70e53fb252fe67e8c427ecb7498719b86 (diff) | |
| parent | 7defc27b994069715e5749245700d20dd740e4f0 (diff) | |
fixing conflicts
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 |