Fix merge conflicts

This commit is contained in:
PikalaxALT
2015-11-01 18:14:37 -05:00
33 changed files with 717 additions and 641 deletions

View File

@@ -9,7 +9,7 @@ AI_SwitchOrTryItem: ; 38000
and a
ret nz
callba Function3e8d1
callba CheckSubstatus_RechargeChargedRampageBideRollout
ret nz
ld a, [PlayerSubStatus5]
@@ -24,6 +24,7 @@ AI_SwitchOrTryItem: ; 38000
ld a, [InBattleTowerBattle] ; Load always the first TrainerClass for BattleTower-Trainers
and a
jr nz, .ok
ld a, [TrainerClass]
dec a
ld bc, 7

View File

@@ -176,7 +176,7 @@ AI_Types: ; 38635
push de
ld a, 1
ld [hBattleTurn], a
callab Function347c8
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
pop de
pop bc
pop hl
@@ -431,7 +431,7 @@ AI_Smart_LeechHit: ; 387f7
push hl
ld a, 1
ld [hBattleTurn], a
callab Function347c8
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
pop hl
; 60% chance to discourage this move if not very effective.
@@ -512,7 +512,7 @@ AI_Smart_LockOn: ; 3881d
push hl
push bc
callba Function347c8
callba HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
ld a, [wd265]
cp $a
pop bc
@@ -1384,7 +1384,7 @@ AI_Smart_Mimic: ; 38ba8
ld a, $1
ld [hBattleTurn], a
callab Function347c8
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
ld a, [wd265]
cp $a
@@ -1783,8 +1783,8 @@ AI_Smart_PriorityHit: ; 38d5a
ld [hBattleTurn], a
push hl
callab EnemyAttackDamage
callab BattleCommand62
callab BattleCommand07
callab BattleCommand_DamageCalcWithStats
callab BattleCommand_CalcDamageTypeMultiplier
pop hl
ld a, [CurDamage + 1]
ld c, a
@@ -1830,7 +1830,7 @@ AI_Smart_Conversion2: ; 38d98
xor a
ld [hBattleTurn], a
callab Function347c8
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
ld a, [wd265]
cp $a
@@ -2496,7 +2496,7 @@ AI_Smart_HiddenPower: ; 3909e
; Calculate Hidden Power's type and base power based on enemy's DVs.
callab HiddenPowerDamage
callab Function347c8
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
pop hl
; Discourage Hidden Power if not very effective.
@@ -3380,8 +3380,8 @@ AIDamageCalc: ; 393e7
.asm_39400
callab EnemyAttackDamage
callab BattleCommand62
callab BattleCommand07
callab BattleCommand_DamageCalcWithStats
callab BattleCommand_CalcDamageTypeMultiplier
ret
.ConstantDamageEffects
@@ -3498,7 +3498,7 @@ AI_Status: ; 39453
push de
ld a, 1
ld [hBattleTurn], a
callab Function347c8
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
pop de
pop bc
pop hl

File diff suppressed because it is too large Load Diff

View File

@@ -8,7 +8,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand04 ; 34555
dw BattleCommand05 ; 34631
dw BattleCommand06 ; 352dc
dw BattleCommand07 ; 346d2
dw BattleCommand_CalcDamageTypeMultiplier ; 346d2 - 07
dw BattleCommand08 ; 34cfd
dw BattleCommand09 ; 34d32
dw BattleCommand0a ; 34eee
@@ -99,7 +99,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand5f ; 377ce
dw BattleCommand60 ; 3784b
dw BattleCommand61 ; 37874
dw BattleCommand62 ; 35612
dw BattleCommand_DamageCalcWithStats ; 35612 - 62
dw BattleCommand63 ; 3790e
dw BattleCommand64 ; 37939
dw BattleCommand65 ; 37972
@@ -148,7 +148,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand90 ; 34ecc
dw BattleCommand91 ; 34fdb
dw BattleCommand92 ; 34fd1
dw BattleCommand93 ; 34ffd
dw BattleCommand_SwitchTurn ; 34ffd - 93
dw BattleCommand94 ; 36a82
dw BattleCommand95 ; 37c1a
dw BattleCommand96 ; 37c55
@@ -170,7 +170,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommanda6 ; 365af
dw BattleCommanda7 ; 365c3
dw BattleCommanda8 ; 355b5
dw BattleCommanda9 ; 355d5
dw BattleCommand_IfAttackMissedResetDamage ; 355d5 - a9
dw BattleCommandaa ; 37e80
dw BattleCommandab ; 34f57
dw BattleCommandac ; 3658f

View File

@@ -385,9 +385,9 @@ CantMove: ; 341f0
Function34216: ; 34216
call SwitchTurn
call BattleCommand_SwitchTurn
call CantMove
jp SwitchTurn
jp BattleCommand_SwitchTurn
; 3421f
@@ -539,7 +539,7 @@ CheckEnemyTurn: ; 3421f
ld hl, HurtItselfText
call StdBattleTextBox
call Function355dd
call BattleCommand62
call BattleCommand_DamageCalcWithStats
call BattleCommand0a
xor a
ld [wcfca], a
@@ -652,7 +652,7 @@ HitConfusion: ; 343a5
ld [CriticalHit], a
call Function355dd
call BattleCommand62
call BattleCommand_DamageCalcWithStats
call BattleCommand0a
xor a
@@ -1336,8 +1336,8 @@ BattleCommand4f: ; 346cd
; 346d2
BattleCommand07: ; 346d2
; stab
BattleCommand_CalcDamageTypeMultiplier: ; 346d2
; STAB = Same Type Attack Bonus
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
cp STRUGGLE
@@ -1354,7 +1354,7 @@ BattleCommand07: ; 346d2
ld a, [hBattleTurn]
and a
jr z, .go
jr z, .go ; Who Attacks and who Defends
ld hl, EnemyMonType1
ld a, [hli]
@@ -1512,7 +1512,7 @@ endr
jr .TypesLoop
.end
call Function347c8
call HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
ld a, [wd265]
ld b, a
ld a, [TypeModifier]
@@ -1523,7 +1523,7 @@ endr
; 347c8
Function347c8: ; 347c8
HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn: ; 347c8
ld hl, EnemyMonType1
ld a, [hBattleTurn]
and a
@@ -1601,7 +1601,7 @@ Function347d3: ; 347d3
BattleCommanda3: ; 34833
call Function347c8
call HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
ld a, [wd265]
and a
ld a, 10 ; 1.0
@@ -2874,8 +2874,7 @@ BattleCommand91_92: ; 34feb
; 34ffd
SwitchTurn: ; 34ffd
BattleCommand93: ; 34ffd
BattleCommand_SwitchTurn: ; 34ffd
; switchturn
ld a, [hBattleTurn]
@@ -3248,7 +3247,7 @@ BattleCommand11: ; 351c0
predef Functionc6e0
call RefreshBattleHuds
call SwitchTurn
call BattleCommand_SwitchTurn
xor a
ld [wcfca], a
ld [FXAnimIDHi], a
@@ -3256,7 +3255,7 @@ BattleCommand11: ; 351c0
ld [wc689], a
ld a, $c2
call Function37e44
call SwitchTurn
call BattleCommand_SwitchTurn
jr .asm_3524d ; 3522f $1c
@@ -3307,10 +3306,10 @@ BattleCommand12: ; 35250
ret z
ld [de], a
call SwitchTurn
call BattleCommand_SwitchTurn
ld hl, RageBuildingText
call StdBattleTextBox
jp SwitchTurn
jp BattleCommand_SwitchTurn
; 3527b
@@ -3934,6 +3933,7 @@ BattleCommanda8: ; 355b5
ld a, [wc72d]
and a
ret nz
jp PrintButItFailed
; 355bd
@@ -3954,14 +3954,14 @@ Function355bd: ; 355bd
call GetPartyLocation
pop bc
ret
; 355d5
BattleCommanda9: ; 355d5
BattleCommand_IfAttackMissedResetDamage: ; 355d5
; clearmissdamage
ld a, [AttackMissed]
and a
ret z
jp ResetDamage
; 355dd
@@ -4004,7 +4004,7 @@ endr
; 35612
BattleCommand62: ; 35612
BattleCommand_DamageCalcWithStats: ; 35612
; damagecalc
; Return a damage value for move power d, player level e, enemy defense c and player attack b.
@@ -4138,12 +4138,12 @@ endr
; Update CurDamage (capped at 997).
ld hl, CurDamage
ld b, [hl]
ld a, [$ffb6]
ld a, [hQuotient + 2]
add b
ld [$ffb6], a
jr nc, .asm_356a5
ld a, [$ffb5]
ld a, [hQuotient + 1]
inc a
ld [$ffb5], a
and a
@@ -4397,22 +4397,22 @@ BattleCommand3f: ; 35726
ld a, [hBattleTurn]
and a
ld a, [hl]
jr nz, .asm_357f8
jr nz, .notPlayersTurn
ld hl, wPlayerMoveStruct + MOVE_POWER
ld [hl], a
push hl
call PlayerAttackDamage
jr .asm_35800
jr .notEnemysTurn
.asm_357f8
.notPlayersTurn
ld hl, wEnemyMoveStruct + MOVE_POWER
ld [hl], a
push hl
call EnemyAttackDamage
.asm_35800
call BattleCommand62
.notEnemysTurn
call BattleCommand_DamageCalcWithStats
pop hl
ld [hl], 1
ret
@@ -4754,7 +4754,7 @@ BattleCommand44: ; 359e6
cp CURSE_T
jr z, .asm_35a50
call AnimateCurrentMove
call SwitchTurn
call BattleCommand_SwitchTurn
.asm_35a13
call BattleRandom
@@ -4775,7 +4775,7 @@ BattleCommand44: ; 359e6
push hl
ld a, d
ld [hl], a
call Function347c8
call HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
pop hl
pop af
ld [hl], a
@@ -4783,7 +4783,7 @@ BattleCommand44: ; 359e6
ld a, [wd265]
cp $a
jr nc, .asm_35a13
call SwitchTurn
call BattleCommand_SwitchTurn
ld a, [hl]
ld [wd265], a
@@ -5457,13 +5457,13 @@ Function35de0: ; 35de0
ld hl, SubFadedText
call StdBattleTextBox
call SwitchTurn
call BattleCommand_SwitchTurn
call BattleCommanda7
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
call z, Function37ec7
call SwitchTurn
call BattleCommand_SwitchTurn
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVarAddr
@@ -6539,15 +6539,15 @@ Function3641a: ; 3641a
and a
jr z, .Player
call SwitchTurn
call BattleCommand_SwitchTurn
call Function365d7
call SwitchTurn
call BattleCommand_SwitchTurn
jr .end
.Player
call SwitchTurn
call BattleCommand_SwitchTurn
call Function365fd
call SwitchTurn
call BattleCommand_SwitchTurn
.end
ld a, 1
and a
@@ -6828,7 +6828,7 @@ Function365d7: ; 365d7
ld hl, BadgeStatBoosts
call CallBattleCore
call SwitchTurn
call BattleCommand_SwitchTurn
ld hl, Function3ec39
call CallBattleCore
@@ -6836,7 +6836,7 @@ Function365d7: ; 365d7
ld hl, Function3ec76
call CallBattleCore
jp SwitchTurn
jp BattleCommand_SwitchTurn
; 365fd
@@ -6848,7 +6848,7 @@ Function365fd: ; 365fd
ld a, $5
call Function3661d
call SwitchTurn
call BattleCommand_SwitchTurn
ld hl, Function3ec39
call CallBattleCore
@@ -6856,7 +6856,7 @@ Function365fd: ; 365fd
ld hl, Function3ec76
call CallBattleCore
jp SwitchTurn
jp BattleCommand_SwitchTurn
; 3661d
@@ -7056,10 +7056,10 @@ BattleCommand3e: ; 3671a
ld [de], a
jr nz, .asm_3674c ; 36730 $1a
res 1, [hl]
call SwitchTurn
call BattleCommand_SwitchTurn
call Function37962
push af
call SwitchTurn
call BattleCommand_SwitchTurn
pop af
jr nz, .asm_3674c ; 3673f $b
set 7, [hl]
@@ -7202,7 +7202,7 @@ BattleCommand23: ; 3680f
ld a, [BattleType]
cp BATTLETYPE_SHINY
jp z, .asm_36969
cp $9
cp BATTLETYPE_TRAP
jp z, .asm_36969
cp BATTLETYPE_CELEBI
jp z, .asm_36969
@@ -8823,10 +8823,10 @@ BattleCommand2c: ; 3713e
call CallBattleCore
.asm_371a9
call AnimateCurrentMove
call SwitchTurn
call BattleCommand_SwitchTurn
ld hl, Function3ccef
call CallBattleCore
call SwitchTurn
call BattleCommand_SwitchTurn
call UpdateUserInParty
call RefreshBattleHuds
ld hl, RegainedHealthText
@@ -9500,7 +9500,7 @@ BattleCommand61: ; 37874
push de
.asm_3787d
call BattleCommand07
call BattleCommand_CalcDamageTypeMultiplier
ld a, [wLinkMode]
cp $3
@@ -9544,7 +9544,7 @@ BattleCommand61: ; 37874
ld a, $3
ld [wc689], a
call AnimateCurrentMove
call SwitchTurn
call BattleCommand_SwitchTurn
ld hl, AICheckPlayerMaxHP
ld a, [hBattleTurn]
and a
@@ -9557,18 +9557,18 @@ BattleCommand61: ; 37874
ld hl, GetQuarterMaxHP
call CallBattleCore
call SwitchTurn
call BattleCommand_SwitchTurn
ld hl, Function3ccef
call CallBattleCore
call SwitchTurn
call BattleCommand_SwitchTurn
ld hl, RegainedHealthText
call StdBattleTextBox
call SwitchTurn
call BattleCommand_SwitchTurn
call UpdateOpponentInParty
jr .asm_37904 ; 378f1 $11
.asm_378f3
call SwitchTurn
call BattleCommand_SwitchTurn
call Function37ed5
jr nc, .asm_37904 ; 378f9 $9
call AnimateFailedMove
@@ -9733,7 +9733,7 @@ BattleCommand67: ; 379c9
call DelayFrames
; Transition into switchmon menu
call Function1d6e
call LoadMenuDataHeader_0x1d75
callba Function3d2f7
callba ForcePickSwitchMonInBattle
@@ -9748,7 +9748,7 @@ BattleCommand67: ; 379c9
call ClearBox
ld b, 1
call GetSGBLayout
call Function32f9
call SetPalettes
call BatonPass_LinkPlayerSwitch
; Mobile link battles handle entrances differently
@@ -9789,7 +9789,7 @@ BattleCommand67: ; 379c9
call CallBattleCore
ld a, 1
ld [wd265], a
ld hl, Function3ecab
ld hl, ApplyStatLevelMultiplierOnAllStats
call CallBattleCore
ld hl, SpikesDamage
@@ -9807,7 +9807,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
ld a, 1
ld [wd0ec], a
call Function1d6e
call LoadMenuDataHeader_0x1d75
ld hl, Function3e8e4
call CallBattleCore
call WriteBackup
@@ -9823,7 +9823,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
and a
ret z
call Function1d6e
call LoadMenuDataHeader_0x1d75
ld hl, Function3e8e4
call CallBattleCore
@@ -10094,11 +10094,11 @@ endr
rst FarCall
call AnimateCurrentMove
call SwitchTurn
call BattleCommand_SwitchTurn
callab Function3ccef
call SwitchTurn
call BattleCommand_SwitchTurn
call UpdateUserInParty
; 'regained health!'
@@ -10596,11 +10596,11 @@ Function37e54: ; 37e54
push hl
push de
push bc
call SwitchTurn
call BattleCommand_SwitchTurn
callab PlayBattleAnim
call SwitchTurn
call BattleCommand_SwitchTurn
pop bc
pop de
pop hl

View File

@@ -44,10 +44,10 @@ BattleCommand54: ; 37588
call AnimateCurrentMove
ld a, $2
call Function36532
call SwitchTurn
call BattleCommand_SwitchTurn
call BattleCommand8d
call ResetMiss
call SwitchTurn
call BattleCommand_SwitchTurn
call BattleCommand70
call BattleCommand8c
call ResetMiss