diff options
Diffstat (limited to 'event')
| -rwxr-xr-x | event/basement_key.asm | 2 | ||||
| -rwxr-xr-x | event/card_key.asm | 2 | ||||
| -rwxr-xr-x | event/itemball.asm | 6 | ||||
| -rwxr-xr-x | event/itemfinder.asm | 4 | ||||
| -rw-r--r-- | event/kurt.asm | 2 | ||||
| -rwxr-xr-x | event/poisonstep.asm | 2 | ||||
| -rwxr-xr-x | event/sacred_ash.asm | 4 | ||||
| -rwxr-xr-x | event/sweet_scent.asm | 6 | ||||
| -rw-r--r-- | event/unown.asm | 2 | ||||
| -rwxr-xr-x | event/whiteout.asm | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/event/basement_key.asm b/event/basement_key.asm index 605b2af88..2800bac8d 100755 --- a/event/basement_key.asm +++ b/event/basement_key.asm @@ -29,6 +29,6 @@ _BasementKey: ; 507b4 ; 507e1 .BasementKeyScript: ; 0x507e1 - loadmovesprites + closetext farjump BasementDoorScript ; 0x507e6 diff --git a/event/card_key.asm b/event/card_key.asm index b442ba184..dc7393911 100755 --- a/event/card_key.asm +++ b/event/card_key.asm @@ -34,6 +34,6 @@ _CardKey: ; 50779 ; 507af .CardKeyScript: ; 0x507af - loadmovesprites + closetext farjump MapRadioTower3FSignpost2Script ; 0x507b4 diff --git a/event/itemball.asm b/event/itemball.asm index 0e74cbd27..6c6f503e1 100755 --- a/event/itemball.asm +++ b/event/itemball.asm @@ -7,17 +7,17 @@ FindItemInBallScript:: ; 0x122ce playsound SFX_ITEM pause 60 itemnotify - loadmovesprites + closetext end ; 0x122e3 .no_room: ; 0x122e3 loadfont writetext .text_found - closetext + waitbutton writetext .text_bag_full + waitbutton closetext - loadmovesprites end ; 0x122ee diff --git a/event/itemfinder.asm b/event/itemfinder.asm index 23de57058..1bbec2a4f 100755 --- a/event/itemfinder.asm +++ b/event/itemfinder.asm @@ -33,7 +33,7 @@ ItemFinder: ; 12580 special UpdateTimePals callasm .ItemfinderSound writetext .Text_FoundSomething - loadmovesprites + closetext end ; 0x125ba @@ -41,7 +41,7 @@ ItemFinder: ; 12580 reloadmappart special UpdateTimePals writetext .Text_FoundNothing - loadmovesprites + closetext end ; 0x125c3 diff --git a/event/kurt.asm b/event/kurt.asm index 272a96ca8..bb24f26ab 100644 --- a/event/kurt.asm +++ b/event/kurt.asm @@ -139,7 +139,7 @@ Kurt_SelectQuantity: ; 880c2 call UpdateSprites call .PlaceApricornName call PlaceApricornQuantity - call Function321c + call ApplyTilemap callba Function27a28 jr nc, .loop diff --git a/event/poisonstep.asm b/event/poisonstep.asm index 1fafd63a5..29181f6b3 100755 --- a/event/poisonstep.asm +++ b/event/poisonstep.asm @@ -114,7 +114,7 @@ DoPoisonStep:: ; 505da loadfont callasm .CheckWhitedOut iffalse .whiteout - loadmovesprites + closetext end ; 50677 diff --git a/event/sacred_ash.asm b/event/sacred_ash.asm index 1b0a4e244..889467bee 100755 --- a/event/sacred_ash.asm +++ b/event/sacred_ash.asm @@ -58,12 +58,12 @@ SacredAshScript: ; 0x50821 special RotatePalettesLeftPalettes special RotatePalettesRightPalettes special RotatePalettesLeftPalettes - waitbutton + waitsfx writetext UnknownText_0x50845 playsound SFX_CAUGHT_MON + waitsfx waitbutton closetext - loadmovesprites end ; 0x50845 diff --git a/event/sweet_scent.asm b/event/sweet_scent.asm index ebe0d4266..5493d8841 100755 --- a/event/sweet_scent.asm +++ b/event/sweet_scent.asm @@ -11,12 +11,12 @@ UnknownScript_0x506c8: ; 0x506c8 special UpdateTimePals callasm GetPartyNick writetext UnknownText_0x50726 - closetext + waitbutton callasm SweetScentEncounter iffalse UnknownScript_0x506e9 checkflag ENGINE_BUG_CONTEST_TIMER iftrue UnknownScript_0x506e5 - battlecheck + setup_random_encounter startbattle returnafterbattle end @@ -28,8 +28,8 @@ UnknownScript_0x506e5: ; 0x506e5 UnknownScript_0x506e9: ; 0x506e9 writetext UnknownText_0x5072b + waitbutton closetext - loadmovesprites end ; 0x506ef diff --git a/event/unown.asm b/event/unown.asm index 2d48dc695..789629ae0 100644 --- a/event/unown.asm +++ b/event/unown.asm @@ -124,7 +124,7 @@ Special_DisplayUnownWords: ; 8ae68 ld [hBGMapMode], a call MenuBox call UpdateSprites - call Function321c + call ApplyTilemap call MenuBoxCoord2Tile inc hl ld d, $0 diff --git a/event/whiteout.asm b/event/whiteout.asm index cc42714d0..05a4e3f82 100755 --- a/event/whiteout.asm +++ b/event/whiteout.asm @@ -9,7 +9,7 @@ Script_OverworldWhiteout:: ; 0x124c8 Script_Whiteout: ; 0x124ce writetext .WhitedOutText - closetext + waitbutton special RotatePalettesRightPalettes pause 40 special HealParty |