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 /event | |
| parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
Fix merge conflicts
Diffstat (limited to 'event')
| -rw-r--r-- | event/kurt.asm | 4 | ||||
| -rw-r--r-- | event/mom.asm | 6 | ||||
| -rw-r--r-- | event/move_deleter.asm | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/event/kurt.asm b/event/kurt.asm index 6ed629d23..78dbd5aef 100644 --- a/event/kurt.asm +++ b/event/kurt.asm @@ -23,7 +23,7 @@ UnknownText_0x88013: ; 0x88013 ; 0x88018 Special_SelectApricornForKurt: ; 88018 - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld c, $1 xor a ld [wd0e4], a @@ -52,7 +52,7 @@ Special_SelectApricornForKurt: ; 88018 call Kurt_GiveUpSelectedQuantityOfSelectedApricorn .done - call Function1d7d + call Call_ExitMenu ret ; 88055 diff --git a/event/mom.asm b/event/mom.asm index 161b338ac..c6bf0da52 100644 --- a/event/mom.asm +++ b/event/mom.asm @@ -103,7 +103,7 @@ endr .AccessBankOfMom: ; 162a8 ld hl, UnknownText_0x1665d call PrintText - call Function1d6e + call LoadMenuDataHeader_0x1d75 ld hl, MenuDataHeader_0x166b5 call CopyMenuDataHeader call InterpretMenu2 @@ -148,7 +148,7 @@ endr ld [hl], a ld a, $5 ld [wcf64], a - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function16517 call Function1656b call Function16571 @@ -216,7 +216,7 @@ endr ld [hl], a ld a, $5 ld [wcf64], a - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function16512 call Function1656b call Function16571 diff --git a/event/move_deleter.asm b/event/move_deleter.asm index 40456f31a..88dd234af 100644 --- a/event/move_deleter.asm +++ b/event/move_deleter.asm @@ -19,7 +19,7 @@ MoveDeletion: jr z, .asm_2c5ca ld hl, UnknownText_0x2c5ea call PrintText - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function12f5b push af call Function2b74 |