pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

OWFlash -> FlashFunction

Browse Source 
Match the other overworld move functions
This commit is contained in:
mid-kid 2020-02-11 13:46:56 +01:00
parent a094c58f1e
commit 991d207d86
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/battle/used_move_text.asm
View File

@ -41,7 +41,7 @@ UsedMoveText:
.grammar .grammar
call GetMoveGrammar ; convert move id to grammar index call GetMoveGrammar ; convert move id to grammar index
; everything except 'instead' made redundant in localization ; everything except 'CheckObedience' made redundant in localization
; check obedience ; check obedience
ld a, [wAlreadyDisobeyed] ld a, [wAlreadyDisobeyed]

2
engine/events/overworld.asm
View File

@ -273,7 +273,7 @@ CheckOverworldTileArrays:
INCLUDE "data/events/field_move_blocks.asm" INCLUDE "data/events/field_move_blocks.asm"
OWFlash: FlashFunction:
call .CheckUseFlash call .CheckUseFlash
and $7f and $7f
ld [wFieldMoveSucceeded], a ld [wFieldMoveSucceeded], a

2
engine/pokemon/mon_menu.asm
View File

@ -631,7 +631,7 @@ MonMenu_Fly:
ret ret
MonMenu_Flash: MonMenu_Flash:
farcall OWFlash farcall FlashFunction
ld a, [wFieldMoveSucceeded] ld a, [wFieldMoveSucceeded]
cp $1 cp $1
jr nz, .Fail jr nz, .Fail