diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:14:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:19:52 -0500 |
| commit | 6b2d0ae841f5a7ff851d462b12f09eac998d2d8f (patch) | |
| tree | 280e64b26f9b525606de02701f0c9a768301c4d2 /engine/save.asm | |
| parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
Fix merge conflicts
Diffstat (limited to 'engine/save.asm')
| -rw-r--r-- | engine/save.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/save.asm b/engine/save.asm index 549991207..fa9aeda12 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -1,5 +1,5 @@ Function14a1a: ; 14a1a - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function5e9a call SpeechTextBox call UpdateSprites |