From 991d207d86c936757e70d2e6a1f6ee6b0e0f5891 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 11 Feb 2020 13:46:56 +0100 Subject: [PATCH] OWFlash -> FlashFunction Match the other overworld move functions --- engine/battle/used_move_text.asm | 2 +- engine/events/overworld.asm | 2 +- engine/pokemon/mon_menu.asm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 9fb05ae06..94cec8398 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -41,7 +41,7 @@ UsedMoveText: .grammar call GetMoveGrammar ; convert move id to grammar index -; everything except 'instead' made redundant in localization +; everything except 'CheckObedience' made redundant in localization ; check obedience ld a, [wAlreadyDisobeyed] diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index cf393ca92..35d7d26c7 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -273,7 +273,7 @@ CheckOverworldTileArrays: INCLUDE "data/events/field_move_blocks.asm" -OWFlash: +FlashFunction: call .CheckUseFlash and $7f ld [wFieldMoveSucceeded], a diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index f6fee4b9c..a9bb993da 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -631,7 +631,7 @@ MonMenu_Fly: ret MonMenu_Flash: - farcall OWFlash + farcall FlashFunction ld a, [wFieldMoveSucceeded] cp $1 jr nz, .Fail