pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

comment arena trap move effect asm

Browse Source
This commit is contained in:
yenatch 2013-09-08 22:44:20 -04:00
parent 05db4b4cb6
commit bd7563e0b6
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
battle/effect_commands.asm
View File

@ -9413,17 +9413,27 @@ BattleCommand50: ; 37492
BattleCommand51: ; 37517 BattleCommand51: ; 37517
; arenatrap ; arenatrap
; Doesn't work on an absent opponent.
call CheckHiddenOpponent call CheckHiddenOpponent
jr nz, .asm_37530 ; 3751a $14 jr nz, .failed
; Don't trap if the opponent is already trapped.
ld a, BATTLE_VARS_SUBSTATUS5 ld a, BATTLE_VARS_SUBSTATUS5
call GetBattleVarPair call GetBattleVarPair
bit 7, [hl] bit SUBSTATUS_CANT_RUN, [hl]
jr nz, .asm_37530 ; 37523 $b jr nz, .failed
set 7, [hl]
; Otherwise trap the opponent.
set SUBSTATUS_CANT_RUN, [hl]
call Function0x37e01 call Function0x37e01
ld hl, CantEscapeNowText ld hl, CantEscapeNowText
jp StdBattleTextBox jp StdBattleTextBox
.asm_37530
.failed
call Function0x37e77 call Function0x37e77
jp PrintButItFailed jp PrintButItFailed
; 37536 ; 37536