diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-17 12:58:26 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-17 13:00:34 -0400 |
| commit | da7849d800d37156360845fa17e361d2521dce29 (patch) | |
| tree | 2a603d9a3fddebe5770ca5728ab1d44d2620f654 /event | |
| parent | 4fa6c6daa46935c7580a60a22bd9216414246dc0 (diff) | |
Restructured functions in main.asm to resemble the home functions they clone
Diffstat (limited to 'event')
| -rw-r--r-- | event/buena.asm | 2 | ||||
| -rw-r--r-- | event/mom.asm | 2 | ||||
| -rw-r--r-- | event/poke_seer.asm | 2 | ||||
| -rw-r--r-- | event/unown.asm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/event/buena.asm b/event/buena.asm index 31ce0a895..d7aaa5305 100644 --- a/event/buena.asm +++ b/event/buena.asm @@ -141,7 +141,7 @@ SpecialBuenaPrize: ; 8afd4 call WriteBackup ld hl, UnknownText_0x8b08b call PrintText - call Functiona36 + call JoyWaitAorB call PlayClickSFX ret ; 8b072 diff --git a/event/mom.asm b/event/mom.asm index a659eddd4..e994d9e43 100644 --- a/event/mom.asm +++ b/event/mom.asm @@ -491,7 +491,7 @@ Function1656b: ; 1656b Function16571: ; 16571 .loop - call Functiona57 + call JoyTextDelay ld hl, hJoyPressed ld a, [hl] and B_BUTTON diff --git a/event/poke_seer.asm b/event/poke_seer.asm index cb1e23966..f785e378c 100644 --- a/event/poke_seer.asm +++ b/event/poke_seer.asm @@ -11,7 +11,7 @@ SEER_LEVEL_ONLY EQU 7 SpecialPokeSeer: ; 4f0bc ld a, SEER_INTRO call PrintSeerText - call Functiona36 + call JoyWaitAorB ld b, $6 callba SelectMonFromParty diff --git a/event/unown.asm b/event/unown.asm index 03ebbbaff..d0456f896 100644 --- a/event/unown.asm +++ b/event/unown.asm @@ -151,7 +151,7 @@ endr add hl, bc call Function8aee9 call Function3200 - call Functiona36 + call JoyWaitAorB call PlayClickSFX call WriteBackup ret |