diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-17 12:29:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-17 12:29:37 -0500 |
| commit | 4bfe086ef6412e5fdba99e6143db6de75c7c9458 (patch) | |
| tree | b4d9a8740825ac37cfc2c0fc33169834118cc727 /event | |
| parent | 0b8fe4bac31c83a8164567da6d7889a18ab3eb4b (diff) | |
Phone scripts and specials
Diffstat (limited to 'event')
| -rw-r--r-- | event/buena.asm | 2 | ||||
| -rwxr-xr-x | event/celebi.asm | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/event/buena.asm b/event/buena.asm index 7079c0259..0443d962d 100644 --- a/event/buena.asm +++ b/event/buena.asm @@ -12,7 +12,7 @@ SpecialBuenasPassword: ; 8af6b ld [wMenuBorderRightCoord], a call BackUpTiles call DoNthMenu ; menu - callba Function4ae5e + callba Buena_ExitMenu ld b, $0 ld a, [MenuSelection] ld c, a diff --git a/event/celebi.asm b/event/celebi.asm index a5c3c0735..cf930c2f8 100755 --- a/event/celebi.asm +++ b/event/celebi.asm @@ -337,18 +337,18 @@ Function49bf3: ; 49bf3 ret ; 49bf9 -Function49bf9: ; 49bf9 +CheckCaughtCelebi: ; 49bf9 ld a, [wBattleResult] bit 6, a - jr z, .asm_49c07 + jr z, .false ld a, $1 ld [ScriptVar], a - jr .asm_49c0b + jr .done -.asm_49c07 +.false xor a ld [ScriptVar], a -.asm_49c0b +.done ret ; 49c0c |