WE BUILD AGAIN

This commit is contained in:
Zeta_Null 2024-12-29 18:58:45 -05:00
parent 288ca6e58f
commit 161bc9374c
3 changed files with 16 additions and 6 deletions

View file

@ -6121,7 +6121,13 @@ BattleCommand_DoubleUndergroundDamage:
call GetBattleVar
bit SUBSTATUS_UNDERGROUND, a
ret z
jr DoubleDamage
BattleCommand_DoubleUnderwaterDamage:
; doubleunderwaterdamage
ld a, BATTLE_VARS_SUBSTATUS4_OPP
call GetBattleVar
bit SUBSTATUS_UNDERWATER, a
; fallthrough
DoubleDamage:
@ -6136,6 +6142,10 @@ DoubleDamage:
ld [hl], a
.quit
ret
BattleCommand_Unused3C:
BattleCommand_Unused5D: ; Just stuffing these here for now because I'm unsure of if I can just axe them from the effect command pointers?? Probably can but :V
ret
INCLUDE "engine/battle/move_effects/mimic.asm"

View file

@ -2115,7 +2115,7 @@ WaterSportFunction:
.FailWaterSport:
ld hl, CantWaterSportText
call MenuTextBoxBackup
call MenuTextboxBackup
ld a, $80
ret
@ -2176,7 +2176,7 @@ CanWaterSportText:
AskWaterSportScript:
opentext
copybytetovar wPlayerStandingTile
copybytetovar wPlayerTile
ifequal COLL_DIVE_UP, .up
writetext AskWaterSportDownText
jump .continue