diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-09 18:25:44 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-09 18:25:44 -0500 |
| commit | a5a8364c35eceadf51956dac4212b440290b652c (patch) | |
| tree | d8a15952763765979ca031cefde05ecc5c862b2b /event | |
| parent | 0c4bf512d08d3779d1185dd08b3f21041f2b6044 (diff) | |
opentext and breeding
Diffstat (limited to 'event')
| -rwxr-xr-x | event/daycare.asm | 2 | ||||
| -rwxr-xr-x | event/itemball.asm | 4 | ||||
| -rwxr-xr-x | event/poisonstep.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/event/daycare.asm b/event/daycare.asm index b56e0083d..2d7c9dea3 100755 --- a/event/daycare.asm +++ b/event/daycare.asm @@ -571,7 +571,7 @@ Function16a3b: ; 16a3b ld a, [wDaycareMan] bit 0, a ret z - callab Function16e1d + callab CheckBreedmonCompatibility ld a, [wd265] and a ret z diff --git a/event/itemball.asm b/event/itemball.asm index 6c6f503e1..9c9e03ee7 100755 --- a/event/itemball.asm +++ b/event/itemball.asm @@ -2,7 +2,7 @@ FindItemInBallScript:: ; 0x122ce callasm .TryReceiveItem iffalse .no_room disappear LAST_TALKED - loadfont + opentext writetext .text_found playsound SFX_ITEM pause 60 @@ -12,7 +12,7 @@ FindItemInBallScript:: ; 0x122ce ; 0x122e3 .no_room: ; 0x122e3 - loadfont + opentext writetext .text_found waitbutton writetext .text_bag_full diff --git a/event/poisonstep.asm b/event/poisonstep.asm index 6b2030e9f..c0f2e1b9c 100755 --- a/event/poisonstep.asm +++ b/event/poisonstep.asm @@ -111,7 +111,7 @@ DoPoisonStep:: ; 505da .Script_MonFaintedToPoison: ; 50669 callasm .PlayPoisonSFX - loadfont + opentext callasm .CheckWhitedOut iffalse .whiteout closetext |