pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
This commit is contained in:
Rangi
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
engine/battle/move_effects/attract.asm
View File

@@ -1,6 +1,6 @@
BattleCommand_Attract: ; 377ce
; attract
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jr nz, .failed
call CheckOppositeGender
@@ -28,12 +28,12 @@ CheckOppositeGender: ; 377f5
ld a, MON_SPECIES
call BattlePartyAttr
ld a, [hl]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld a, [CurBattleMon]
ld [CurPartyMon], a
ld a, [wCurBattleMon]
ld [wCurPartyMon], a
xor a
ld [MonType], a
ld [wMonType], a
farcall GetGender
jr c, .genderless_samegender
@@ -44,20 +44,20 @@ CheckOppositeGender: ; 377f5
.got_gender
push bc
ld a, [TempEnemyMonSpecies]
ld [CurPartySpecies], a
ld hl, EnemyMonDVs
ld a, [EnemySubStatus5]
ld a, [wTempEnemyMonSpecies]
ld [wCurPartySpecies], a
ld hl, wEnemyMonDVs
ld a, [wEnemySubStatus5]
bit SUBSTATUS_TRANSFORMED, a
jr z, .not_transformed
ld hl, wEnemyBackupDVs
.not_transformed
ld a, [hli]
ld [TempMonDVs], a
ld [wTempMonDVs], a
ld a, [hl]
ld [TempMonDVs + 1], a
ld [wTempMonDVs + 1], a
ld a, 3
ld [MonType], a
ld [wMonType], a
farcall GetGender
pop bc
jr c, .genderless_samegender

26
engine/battle/move_effects/baton_pass.asm
View File

@@ -90,7 +90,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
ret z
ld a, 1
ld [wPlayerAction], a
ld [wBattlePlayerAction], a
call LoadStandardMenuHeader
ld hl, LinkBattleSendReceiveAction
@@ -98,7 +98,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
call CloseWindow
xor a
ld [wPlayerAction], a
ld [wBattlePlayerAction], a
ret
; 37a82
@@ -113,7 +113,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
ld hl, LinkBattleSendReceiveAction
call CallBattleCore
ld a, [OTPartyCount]
ld a, [wOTPartyCount]
add BATTLEACTION_SWITCH1
ld b, a
ld a, [wBattleAction]
@@ -123,7 +123,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
jr c, .switch
.baton_pass
ld a, [CurOTMon]
ld a, [wCurOTMon]
add BATTLEACTION_SWITCH1
ld [wBattleAction], a
.switch
@@ -157,11 +157,11 @@ ResetBatonPassStatus: ; 37ab1
call ResetActorDisable
; Attraction isn't passed.
ld hl, PlayerSubStatus1
ld hl, wPlayerSubStatus1
res SUBSTATUS_IN_LOVE, [hl]
ld hl, EnemySubStatus1
ld hl, wEnemySubStatus1
res SUBSTATUS_IN_LOVE, [hl]
ld hl, PlayerSubStatus5
ld hl, wPlayerSubStatus5
ld a, BATTLE_VARS_SUBSTATUS5
call GetBattleVarAddr
@@ -182,10 +182,10 @@ ResetBatonPassStatus: ; 37ab1
CheckAnyOtherAlivePartyMons: ; 37ae9
ld hl, PartyMon1HP
ld a, [PartyCount]
ld hl, wPartyMon1HP
ld a, [wPartyCount]
ld d, a
ld a, [CurBattleMon]
ld a, [wCurBattleMon]
ld e, a
jr CheckAnyOtherAliveMons
@@ -193,10 +193,10 @@ CheckAnyOtherAlivePartyMons: ; 37ae9
CheckAnyOtherAliveEnemyMons: ; 37af6
ld hl, OTPartyMon1HP
ld a, [OTPartyCount]
ld hl, wOTPartyMon1HP
ld a, [wOTPartyCount]
ld d, a
ld a, [CurOTMon]
ld a, [wCurOTMon]
ld e, a
; fallthrough

60
engine/battle/move_effects/beat_up.asm
View File

@@ -5,27 +5,27 @@ BattleCommand_BeatUp: ; 35461
ld a, [hBattleTurn]
and a
jp nz, .enemy_beats_up
ld a, [PlayerSubStatus3]
ld a, [wPlayerSubStatus3]
bit SUBSTATUS_IN_LOOP, a
jr nz, .next_mon
ld c, 20
call DelayFrames
xor a
ld [PlayerRolloutCount], a
ld [wPlayerRolloutCount], a
ld [wd002], a
ld [wBeatUpHitAtLeastOnce], a
jr .got_mon
.next_mon
ld a, [PlayerRolloutCount]
ld a, [wPlayerRolloutCount]
ld b, a
ld a, [PartyCount]
ld a, [wPartyCount]
sub b
ld [wd002], a
.got_mon
ld a, [wd002]
ld hl, PartyMonNicknames
ld hl, wPartyMonNicknames
call GetNick
ld a, MON_HP
call GetBeatupMonLocation
@@ -34,11 +34,11 @@ BattleCommand_BeatUp: ; 35461
jp z, .beatup_fail ; fainted
ld a, [wd002]
ld c, a
ld a, [CurBattleMon]
ld a, [wCurBattleMon]
; BUG: this can desynchronize link battles
; Change "cp [hl]" to "cp c" to fix
cp [hl]
ld hl, BattleMonStatus
ld hl, wBattleMonStatus
jr z, .active_mon
ld a, MON_STATUS
call GetBeatupMonLocation
@@ -51,18 +51,18 @@ BattleCommand_BeatUp: ; 35461
ld [wBeatUpHitAtLeastOnce], a
ld hl, BeatUpAttackText
call StdBattleTextBox
ld a, [EnemyMonSpecies]
ld [CurSpecies], a
ld a, [wEnemyMonSpecies]
ld [wCurSpecies], a
call GetBaseData
ld a, [BaseDefense]
ld a, [wBaseDefense]
ld c, a
push bc
ld a, MON_SPECIES
call GetBeatupMonLocation
ld a, [hl]
ld [CurSpecies], a
ld [wCurSpecies], a
call GetBaseData
ld a, [BaseAttack]
ld a, [wBaseAttack]
pop bc
ld b, a
push bc
@@ -76,20 +76,20 @@ BattleCommand_BeatUp: ; 35461
ret
.enemy_beats_up
ld a, [EnemySubStatus3]
ld a, [wEnemySubStatus3]
bit SUBSTATUS_IN_LOOP, a
jr nz, .not_first_enemy_beatup
xor a
ld [EnemyRolloutCount], a
ld [wEnemyRolloutCount], a
ld [wd002], a
ld [wBeatUpHitAtLeastOnce], a
jr .enemy_continue
.not_first_enemy_beatup
ld a, [EnemyRolloutCount]
ld a, [wEnemyRolloutCount]
ld b, a
ld a, [OTPartyCount]
ld a, [wOTPartyCount]
sub b
ld [wd002], a
.enemy_continue
@@ -101,14 +101,14 @@ BattleCommand_BeatUp: ; 35461
and a
jr nz, .link_or_tower
ld a, [InBattleTowerBattle]
ld a, [wInBattleTowerBattle]
and a
jr nz, .link_or_tower
ld a, [wd002]
ld c, a
ld b, 0
ld hl, OTPartySpecies
ld hl, wOTPartySpecies
add hl, bc
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
@@ -117,10 +117,10 @@ BattleCommand_BeatUp: ; 35461
.link_or_tower
ld a, [wd002]
ld hl, OTPartyMonNicknames
ld hl, wOTPartyMonNicknames
ld bc, NAME_LENGTH
call AddNTimes
ld de, StringBuffer1
ld de, wStringBuffer1
call CopyBytes
.got_enemy_nick
ld a, MON_HP
@@ -130,9 +130,9 @@ BattleCommand_BeatUp: ; 35461
jp z, .beatup_fail
ld a, [wd002]
ld b, a
ld a, [CurOTMon]
ld a, [wCurOTMon]
cp b
ld hl, EnemyMonStatus
ld hl, wEnemyMonStatus
jr z, .active_enemy
ld a, MON_STATUS
@@ -147,7 +147,7 @@ BattleCommand_BeatUp: ; 35461
jr .finish_beatup
.wild
ld a, [EnemyMonSpecies]
ld a, [wEnemyMonSpecies]
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, BeatUpAttackText
@@ -157,18 +157,18 @@ BattleCommand_BeatUp: ; 35461
.finish_beatup
ld hl, BeatUpAttackText
call StdBattleTextBox
ld a, [BattleMonSpecies]
ld [CurSpecies], a
ld a, [wBattleMonSpecies]
ld [wCurSpecies], a
call GetBaseData
ld a, [BaseDefense]
ld a, [wBaseDefense]
ld c, a
push bc
ld a, MON_SPECIES
call GetBeatupMonLocation
ld a, [hl]
ld [CurSpecies], a
ld [wCurSpecies], a
call GetBaseData
ld a, [BaseAttack]
ld a, [wBaseAttack]
pop bc
ld b, a
push bc
@@ -207,9 +207,9 @@ GetBeatupMonLocation: ; 355bd
ld b, 0
ld a, [hBattleTurn]
and a
ld hl, PartyMon1Species
ld hl, wPartyMon1Species
jr z, .got_species
ld hl, OTPartyMon1Species
ld hl, wOTPartyMon1Species
.got_species
ld a, [wd002]

2
engine/battle/move_effects/belly_drum.asm
View File

@@ -4,7 +4,7 @@ BattleCommand_BellyDrum: ; 37c1a
; before checking that it has enough HP to use the move.
; Swap the order of these two blocks to fix.
call BattleCommand_AttackUp2
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jr nz, .failed

26
engine/battle/move_effects/bide.asm
View File

@@ -6,11 +6,11 @@ BattleCommand_StoreEnergy: ; 36671
bit SUBSTATUS_BIDE, a
ret z
ld hl, PlayerRolloutCount
ld hl, wPlayerRolloutCount
ld a, [hBattleTurn]
and a
jr z, .check_still_storing_energy
ld hl, EnemyRolloutCount
ld hl, wEnemyRolloutCount
.check_still_storing_energy
dec [hl]
jr nz, .still_storing
@@ -26,30 +26,30 @@ BattleCommand_StoreEnergy: ; 36671
call GetBattleVarAddr
ld a, 1
ld [hl], a
ld hl, PlayerDamageTaken + 1
ld hl, wPlayerDamageTaken + 1
ld de, wPlayerCharging ; player
ld a, [hBattleTurn]
and a
jr z, .player
ld hl, EnemyDamageTaken + 1
ld hl, wEnemyDamageTaken + 1
ld de, wEnemyCharging ; enemy
.player
ld a, [hld]
add a
ld b, a
ld [CurDamage + 1], a
ld [wCurDamage + 1], a
ld a, [hl]
rl a
ld [CurDamage], a
ld [wCurDamage], a
jr nc, .not_maxed
ld a, $ff
ld [CurDamage], a
ld [CurDamage + 1], a
ld [wCurDamage], a
ld [wCurDamage + 1], a
.not_maxed
or b
jr nz, .built_up_something
ld a, 1
ld [AttackMissed], a
ld [wAttackMissed], a
.built_up_something
xor a
ld [hli], a
@@ -75,13 +75,13 @@ BattleCommand_StoreEnergy: ; 36671
BattleCommand_UnleashEnergy: ; 366e5
; unleashenergy
ld de, PlayerDamageTaken
ld bc, PlayerRolloutCount
ld de, wPlayerDamageTaken
ld bc, wPlayerRolloutCount
ld a, [hBattleTurn]
and a
jr z, .got_damage
ld de, EnemyDamageTaken
ld bc, EnemyRolloutCount
ld de, wEnemyDamageTaken
ld bc, wEnemyRolloutCount
.got_damage
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr

14
engine/battle/move_effects/conversion.asm
View File

@@ -1,17 +1,17 @@
BattleCommand_Conversion: ; 3707f
; conversion
ld hl, BattleMonMoves
ld de, BattleMonType1
ld hl, wBattleMonMoves
ld de, wBattleMonType1
ld a, [hBattleTurn]
and a
jr z, .got_moves
ld hl, EnemyMonMoves
ld de, EnemyMonType1
ld hl, wEnemyMonMoves
ld de, wEnemyMonType1
.got_moves
push de
ld c, 0
ld de, StringBuffer1
ld de, wStringBuffer1
.loop
push hl
ld b, 0
@@ -41,7 +41,7 @@ BattleCommand_Conversion: ; 3707f
inc de
ld [de], a
pop de
ld hl, StringBuffer1
ld hl, wStringBuffer1
.loop2
ld a, [hl]
cp -1
@@ -70,7 +70,7 @@ BattleCommand_Conversion: ; 3707f
maskbits NUM_MOVES
ld c, a
ld b, 0
ld hl, StringBuffer1
ld hl, wStringBuffer1
add hl, bc
ld a, [hl]
cp -1

6
engine/battle/move_effects/conversion2.asm
View File

@@ -1,14 +1,14 @@
BattleCommand_Conversion2: ; 359e6
; conversion2
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jr nz, .failed
ld hl, BattleMonType1
ld hl, wBattleMonType1
ld a, [hBattleTurn]
and a
jr z, .got_type
ld hl, EnemyMonType1
ld hl, wEnemyMonType1
.got_type
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar

12
engine/battle/move_effects/counter.asm
View File

@@ -2,7 +2,7 @@ BattleCommand_Counter: ; 35813
; counter
ld a, 1
ld [AttackMissed], a
ld [wAttackMissed], a
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar
and a
@@ -25,18 +25,18 @@ BattleCommand_Counter: ; 35813
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar
dec a
ld de, StringBuffer1
ld de, wStringBuffer1
call GetMoveData
ld a, [StringBuffer1 + MOVE_POWER]
ld a, [wStringBuffer1 + MOVE_POWER]
and a
ret z
ld a, [StringBuffer1 + MOVE_TYPE]
ld a, [wStringBuffer1 + MOVE_TYPE]
cp SPECIAL
ret nc
ld hl, CurDamage
ld hl, wCurDamage
ld a, [hli]
or [hl]
ret z
@@ -54,7 +54,7 @@ BattleCommand_Counter: ; 35813
.capped
xor a
ld [AttackMissed], a
ld [wAttackMissed], a
ret
; 35864

8
engine/battle/move_effects/curse.asm
View File

@@ -1,13 +1,13 @@
BattleCommand_Curse: ; 37588
; curse
ld de, BattleMonType1
ld bc, PlayerStatLevels
ld de, wBattleMonType1
ld bc, wPlayerStatLevels
ld a, [hBattleTurn]
and a
jr z, .go
ld de, EnemyMonType1
ld bc, EnemyStatLevels
ld de, wEnemyMonType1
ld bc, wEnemyStatLevels
.go

16
engine/battle/move_effects/disable.asm
View File

@@ -1,17 +1,17 @@
BattleCommand_Disable: ; 36fed
; disable
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jr nz, .failed
ld de, EnemyDisableCount
ld hl, EnemyMonMoves
ld de, wEnemyDisableCount
ld hl, wEnemyMonMoves
ld a, [hBattleTurn]
and a
jr z, .got_moves
ld de, PlayerDisableCount
ld hl, BattleMonMoves
ld de, wPlayerDisableCount
ld hl, wBattleMonMoves
.got_moves
ld a, [de]
@@ -35,9 +35,9 @@ BattleCommand_Disable: ; 36fed
ld a, [hBattleTurn]
and a
ld hl, EnemyMonPP
ld hl, wEnemyMonPP
jr z, .got_pp
ld hl, BattleMonPP
ld hl, wBattleMonPP
.got_pp
ld b, 0
add hl, bc
@@ -54,7 +54,7 @@ BattleCommand_Disable: ; 36fed
add c
ld [de], a
call AnimateCurrentMove
ld hl, DisabledMove
ld hl, wDisabledMove
ld a, [hBattleTurn]
and a
jr nz, .got_disabled_move_pointer

28
engine/battle/move_effects/encore.asm
View File

@@ -1,13 +1,13 @@
BattleCommand_Encore: ; 35864
; encore
ld hl, EnemyMonMoves
ld de, EnemyEncoreCount
ld hl, wEnemyMonMoves
ld de, wEnemyEncoreCount
ld a, [hBattleTurn]
and a
jr z, .ok
ld hl, BattleMonMoves
ld de, PlayerEncoreCount
ld hl, wBattleMonMoves
ld de, wPlayerEncoreCount
.ok
ld a, BATTLE_VARS_LAST_MOVE_OPP
call GetBattleVar
@@ -26,12 +26,12 @@ BattleCommand_Encore: ; 35864
cp b
jr nz, .got_move
ld bc, BattleMonPP - BattleMonMoves - 1
ld bc, wBattleMonPP - wBattleMonMoves - 1
add hl, bc
ld a, [hl]
and PP_MASK
jp z, .failed
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jp nz, .failed
ld a, BATTLE_VARS_SUBSTATUS5_OPP
@@ -52,10 +52,10 @@ BattleCommand_Encore: ; 35864
jr z, .force_last_enemy_move
push hl
ld a, [LastPlayerMove]
ld a, [wLastPlayerMove]
ld b, a
ld c, 0
ld hl, BattleMonMoves
ld hl, wBattleMonMoves
.find_player_move
ld a, [hli]
cp b
@@ -73,9 +73,9 @@ BattleCommand_Encore: ; 35864
.got_player_move
pop hl
ld a, c
ld [CurMoveNum], a
ld [wCurMoveNum], a
ld a, b
ld [CurPlayerMove], a
ld [wCurPlayerMove], a
dec a
ld de, wPlayerMoveStruct
call GetMoveData
@@ -83,10 +83,10 @@ BattleCommand_Encore: ; 35864
.force_last_enemy_move
push hl
ld a, [LastEnemyMove]
ld a, [wLastEnemyMove]
ld b, a
ld c, 0
ld hl, EnemyMonMoves
ld hl, wEnemyMonMoves
.find_enemy_move
ld a, [hli]
cp b
@@ -104,9 +104,9 @@ BattleCommand_Encore: ; 35864
.got_enemy_move
pop hl
ld a, c
ld [CurEnemyMoveNum], a
ld [wCurEnemyMoveNum], a
ld a, b
ld [CurEnemyMove], a
ld [wCurEnemyMove], a
dec a
ld de, wEnemyMoveStruct
call GetMoveData

10
engine/battle/move_effects/false_swipe.asm
View File

@@ -1,13 +1,13 @@
BattleCommand_FalseSwipe: ; 35c94
; falseswipe
ld hl, EnemyMonHP
ld hl, wEnemyMonHP
ld a, [hBattleTurn]
and a
jr z, .got_hp
ld hl, BattleMonHP
ld hl, wBattleMonHP
.got_hp
ld de, CurDamage
ld de, wCurDamage
ld c, 2
push hl
push de
@@ -28,11 +28,11 @@ BattleCommand_FalseSwipe: ; 35c94
dec a
ld [de], a
.okay
ld a, [CriticalHit]
ld a, [wCriticalHit]
cp 2
jr nz, .carry
xor a
ld [CriticalHit], a
ld [wCriticalHit], a
.carry
scf
ret

2
engine/battle/move_effects/foresight.asm
View File

@@ -1,7 +1,7 @@
BattleCommand_Foresight: ; 376a0
; foresight
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jr nz, .failed

4
engine/battle/move_effects/frustration.asm
View File

@@ -2,11 +2,11 @@ BattleCommand_FrustrationPower: ; 3790e
; frustrationpower
push bc
ld hl, BattleMonHappiness
ld hl, wBattleMonHappiness
ld a, [hBattleTurn]
and a
jr z, .got_happiness
ld hl, EnemyMonHappiness
ld hl, wEnemyMonHappiness
.got_happiness
ld a, $ff
sub [hl]

12
engine/battle/move_effects/fury_cutter.asm
View File

@@ -1,14 +1,14 @@
BattleCommand_FuryCutter: ; 37792
; furycutter
ld hl, PlayerFuryCutterCount
ld hl, wPlayerFuryCutterCount
ld a, [hBattleTurn]
and a
jr z, .go
ld hl, EnemyFuryCutterCount
ld hl, wEnemyFuryCutterCount
.go
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jp nz, ResetFuryCutterCount
@@ -26,7 +26,7 @@ BattleCommand_FuryCutter: ; 37792
ret z
; Double the damage
ld hl, CurDamage + 1
ld hl, wCurDamage + 1
sla [hl]
dec hl
rl [hl]
@@ -45,11 +45,11 @@ ResetFuryCutterCount: ; 377be
push hl
ld hl, PlayerFuryCutterCount
ld hl, wPlayerFuryCutterCount
ld a, [hBattleTurn]
and a
jr z, .reset
ld hl, EnemyFuryCutterCount
ld hl, wEnemyFuryCutterCount
.reset
xor a

6
engine/battle/move_effects/future_sight.asm
View File

@@ -19,9 +19,9 @@ BattleCommand_CheckFutureSight: ; 37d0d
ld [hl], 0
ld a, [de]
inc de
ld [CurDamage], a
ld [wCurDamage], a
ld a, [de]
ld [CurDamage + 1], a
ld [wCurDamage + 1], a
ld b, futuresight_command
jp SkipToBattleCommand
@@ -64,7 +64,7 @@ BattleCommand_FutureSight: ; 37d34
jr z, .StoreDamage
ld de, wEnemyFutureSightDamage
.StoreDamage:
ld hl, CurDamage
ld hl, wCurDamage
ld a, [hl]
ld [de], a
ld [hl], 0

4
engine/battle/move_effects/heal_bell.asm
View File

@@ -4,11 +4,11 @@ BattleCommand_HealBell: ; 35cc9
ld a, BATTLE_VARS_SUBSTATUS1
call GetBattleVarAddr
res SUBSTATUS_NIGHTMARE, [hl]
ld de, PartyMon1Status
ld de, wPartyMon1Status
ld a, [hBattleTurn]
and a
jr z, .got_status
ld de, OTPartyMon1Status
ld de, wOTPartyMon1Status
.got_status
ld a, BATTLE_VARS_STATUS
call GetBattleVarAddr

2
engine/battle/move_effects/hidden_power.asm
View File

@@ -1,7 +1,7 @@
BattleCommand_HiddenPower: ; 37be8
; hiddenpower
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
ret nz
farcall HiddenPowerDamage

6
engine/battle/move_effects/leech_seed.asm
View File

@@ -1,16 +1,16 @@
BattleCommand_LeechSeed: ; 36f9d
; leechseed
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jr nz, .evaded
call CheckSubstituteOpp
jr nz, .evaded
ld de, EnemyMonType1
ld de, wEnemyMonType1
ld a, [hBattleTurn]
and a
jr z, .ok
ld de, BattleMonType1
ld de, wBattleMonType1
.ok
ld a, [de]

2
engine/battle/move_effects/lock_on.asm
View File

@@ -4,7 +4,7 @@ BattleCommand_LockOn: ; 35a53
call CheckSubstituteOpp
jr nz, .fail
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jr nz, .fail

Some files were not shown because too many files have changed in this diff Show More