diff options
| author | libjet <libj3t@gmail.com> | 2020-02-19 16:23:56 +0000 |
|---|---|---|
| committer | libjet <libj3t@gmail.com> | 2020-02-19 16:23:56 +0000 |
| commit | 4f1d434564bf3b6c1c469ebb3e33e1475d7e2136 (patch) | |
| tree | 9dd335ebacb66ca3254aff468f3a951bbebec8c9 /engine/events | |
| parent | b1a35aa1770c7972fdb6e7af50ad529118b972d2 (diff) | |
Add home/tilemap.asm and update home/menu.asm
Diffstat (limited to 'engine/events')
| -rwxr-xr-x | engine/events/overworld.asm | 18 | ||||
| -rwxr-xr-x | engine/events/whiteout.asm | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index a00f35aa..0787d094 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -48,7 +48,7 @@ FieldMoveBadgeCheck: ; c776 (3:4776) call FieldMoveEngineFlagCheck ret nc ld hl, .BadgeRequiredText - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -99,7 +99,7 @@ FieldMovePartyCheck: ; c787 (3:4787) FieldMoveFailed: ; c7be (3:47be) ld hl, .CantUseHereText - call MenuTextBoxBackup + call MenuTextboxBackup ret .CantUseHereText: @@ -146,7 +146,7 @@ CutTreeOrGrass: FailToCut: ld hl, Text_NothingToCut - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret @@ -397,13 +397,13 @@ StartSurfing: CantSurf: ld hl, CantSurfText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret AlreadySurfing: ld hl, AlreadySurfingText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret @@ -543,7 +543,7 @@ TryToFly: .asm_ca83 xor a ldh [hMapAnims], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearSprites ld a, $24 ld hl, $5a61 @@ -783,7 +783,7 @@ FailToEscapeFromDungeon: cp $2 jr nz, .asm_cc1c ld hl, Text_CantUseDigEscapeRopeHere ; $4c29 - call MenuTextBox + call MenuTextbox call WaitPressAorB_BlinkCursor call CloseWindow .asm_cc1c @@ -882,7 +882,7 @@ DoTeleport: FailTeleport: ld hl, Text_CantUseTeleportHere - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret @@ -932,7 +932,7 @@ Functionccf1: ; ccf1 (3:4cf1) jr asm_cd0c ld hl, Text_AlreadyUsingStrength - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 33098f13..075274a4 100755 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -32,7 +32,7 @@ Script_Whiteout: OverworldBGMap: call ClearPalettes call FillScreenWithTextboxPal - call Function3456 + call WaitBGMap2 call HideSprites call RotateThreePalettesLeft ret |