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

rename CallBankF -> CallBattleCore

Browse Source
This commit is contained in:
yenatch
2013-12-31 03:25:38 -05:00
parent a10ee4e9f1
commit d1d186d1ee
3 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
battle/core.asm
View File

@@ -1,3 +1,5 @@
BattleCore:
; Core components of the battle engine. ; Core components of the battle engine.

68
battle/effect_commands.asm
View File

@@ -184,7 +184,7 @@ CheckPlayerTurn:
call CantMove call CantMove
call UpdateBattleMonInParty call UpdateBattleMonInParty
ld hl, $5f48 ld hl, $5f48
call CallBankF call CallBattleCore
ld a, $1 ld a, $1
ld [$ffd4], a ld [$ffd4], a
ld hl, PlayerSubStatus1 ld hl, PlayerSubStatus1
@@ -444,7 +444,7 @@ CheckEnemyTurn: ; 3421f
call CantMove call CantMove
call UpdateEnemyMonInParty call UpdateEnemyMonInParty
ld hl, $6036 ld hl, $6036
call CallBankF call CallBattleCore
ld a, $1 ld a, $1
ld [$ffd4], a ld [$ffd4], a
ld hl, EnemySubStatus1 ld hl, EnemySubStatus1
@@ -698,7 +698,7 @@ HitConfusion: ; 343a5
call z, PlayFXAnimID call z, PlayFXAnimID
ld hl, $5f48 ld hl, $5f48
call CallBankF call CallBattleCore
ld a, $1 ld a, $1
ld [$ffd4], a ld [$ffd4], a
@@ -5918,7 +5918,7 @@ BattleCommand17: ; 3608c
set 4, [hl] set 4, [hl]
call UpdateOpponentInParty call UpdateOpponentInParty
ld hl, $6c76 ld hl, $6c76
call CallBankF call CallBattleCore
ld de, $0105 ld de, $0105
call Function0x37e54 call Function0x37e54
call RefreshBattleHuds call RefreshBattleHuds
@@ -6040,13 +6040,13 @@ BattleCommand19: ; 36165
set 6, [hl] set 6, [hl]
call UpdateOpponentInParty call UpdateOpponentInParty
ld hl, $6c39 ld hl, $6c39
call CallBankF call CallBattleCore
ld de, $0109 ld de, $0109
call Function0x37e54 call Function0x37e54
call RefreshBattleHuds call RefreshBattleHuds
call PrintParalyze call PrintParalyze
ld hl, $5de9 ld hl, $5de9
jp CallBankF jp CallBattleCore
; 361ac ; 361ac
@@ -6238,7 +6238,7 @@ Function0x36281: ; 36281
ret nc ret nc
xor a xor a
ld [$ffd4], a ld [$ffd4], a
call CallBankF call CallBattleCore
call WaitBGMap call WaitBGMap
jp BattleCommandaa jp BattleCommandaa
; 362ad ; 362ad
@@ -6805,7 +6805,7 @@ BattleCommanda6: ; 365af
.asm_365ba .asm_365ba
xor a xor a
ld [$ffd4], a ld [$ffd4], a
call CallBankF call CallBattleCore
jp WaitBGMap jp WaitBGMap
; 365c3 ; 365c3
@@ -6819,7 +6819,7 @@ BattleCommanda7: ; 365c3
.asm_365ce .asm_365ce
xor a xor a
ld [$ffd4], a ld [$ffd4], a
call CallBankF call CallBattleCore
jp WaitBGMap jp WaitBGMap
; 365d7 ; 365d7
@@ -6833,15 +6833,15 @@ Function0x365d7: ; 365d7
call Function0x3661d call Function0x3661d
ld hl, BadgeStatBoosts ld hl, BadgeStatBoosts
call CallBankF call CallBattleCore
call SwitchTurn call SwitchTurn
ld hl, $6c39 ld hl, $6c39
call CallBankF call CallBattleCore
ld hl, $6c76 ld hl, $6c76
call CallBankF call CallBattleCore
jp SwitchTurn jp SwitchTurn
; 365fd ; 365fd
@@ -6858,10 +6858,10 @@ Function0x365fd: ; 365fd
call SwitchTurn call SwitchTurn
ld hl, $6c39 ld hl, $6c39
call CallBankF call CallBattleCore
ld hl, $6c76 ld hl, $6c76
call CallBankF call CallBattleCore
jp SwitchTurn jp SwitchTurn
; 3661d ; 3661d
@@ -7292,7 +7292,7 @@ BattleCommand23: ; 3680f
call StdBattleTextBox call StdBattleTextBox
ld hl, $5c23 ld hl, $5c23
jp CallBankF jp CallBattleCore
.asm_368ca .asm_368ca
jp .asm_36969 jp .asm_36969
@@ -7383,13 +7383,13 @@ BattleCommand23: ; 3680f
ld a, d ld a, d
ld [CurPartyMon], a ld [CurPartyMon], a
ld hl, $5b32 ld hl, $5b32
call CallBankF call CallBattleCore
ld hl, DraggedOutText ld hl, DraggedOutText
call StdBattleTextBox call StdBattleTextBox
ld hl, $5c23 ld hl, $5c23
jp CallBankF jp CallBattleCore
.asm_36969 .asm_36969
call BattleCommand0a call BattleCommand0a
@@ -8131,7 +8131,7 @@ Function0x36d70: ; 36d70
ret nz ret nz
.asm_36db0 .asm_36db0
ld hl, $5e51 ld hl, $5e51
jp CallBankF jp CallBattleCore
; 36db6 ; 36db6
Function0x36db6: ; 36db6 Function0x36db6: ; 36db6
@@ -8203,11 +8203,11 @@ BattleCommand30: ; 36dc7
set 6, [hl] set 6, [hl]
call UpdateOpponentInParty call UpdateOpponentInParty
ld hl, $6c39 ld hl, $6c39
call CallBankF call CallBattleCore
call UpdateBattleHuds call UpdateBattleHuds
call PrintParalyze call PrintParalyze
ld hl, $5de9 ld hl, $5de9
jp CallBankF jp CallBattleCore
.asm_36e49 .asm_36e49
call Function0x37e77 call Function0x37e77
ld hl, AlreadyParalyzedText ld hl, AlreadyParalyzedText
@@ -8782,16 +8782,16 @@ BattleCommand2c: ; 3713e
.asm_37199 .asm_37199
jr z, .asm_371a3 ; 37199 $8 jr z, .asm_371a3 ; 37199 $8
ld hl, $4c9f ld hl, $4c9f
call CallBankF call CallBattleCore
jr .asm_371a9 ; 371a1 $6 jr .asm_371a9 ; 371a1 $6
.asm_371a3 .asm_371a3
ld hl, $4cac ld hl, $4cac
call CallBankF call CallBattleCore
.asm_371a9 .asm_371a9
call Function0x37e01 call Function0x37e01
call SwitchTurn call SwitchTurn
ld hl, $4cef ld hl, $4cef
call CallBankF call CallBattleCore
call SwitchTurn call SwitchTurn
call UpdateUserInParty call UpdateUserInParty
call RefreshBattleHuds call RefreshBattleHuds
@@ -9515,10 +9515,10 @@ BattleCommand61: ; 37874
rst FarCall rst FarCall
jr c, .asm_378f3 ; 378d1 $20 jr c, .asm_378f3 ; 378d1 $20
ld hl, $4c8e ld hl, $4c8e
call CallBankF call CallBattleCore
call SwitchTurn call SwitchTurn
ld hl, $4cef ld hl, $4cef
call CallBankF call CallBattleCore
call SwitchTurn call SwitchTurn
ld hl, RegainedHealthText ld hl, RegainedHealthText
call StdBattleTextBox call StdBattleTextBox
@@ -9714,7 +9714,7 @@ BattleCommand67: ; 379c9
jp c, EndMoveEffect jp c, EndMoveEffect
ld hl, Function3e459 ld hl, Function3e459
call CallBankF call CallBattleCore
call Function0x37ab1 call Function0x37ab1
ret ret
@@ -9738,19 +9738,19 @@ BattleCommand67: ; 379c9
ld [$c718], a ld [$c718], a
ld hl, $5517 ld hl, $5517
call CallBankF call CallBattleCore
ld hl, $557a ld hl, $557a
call CallBankF call CallBattleCore
ld a, 1 ld a, 1
ld [$d265], a ld [$d265], a
ld hl, $6cab ld hl, $6cab
call CallBankF call CallBattleCore
ld hl, $5c23 ld hl, $5c23
call CallBankF call CallBattleCore
jr Function0x37ab1 jr Function0x37ab1
; 37a67 ; 37a67
@@ -9767,7 +9767,7 @@ Function0x37a67: ; 37a67
call $1d6e call $1d6e
ld hl, $68e4 ld hl, $68e4
call CallBankF call CallBattleCore
call $1c17 call $1c17
@@ -9785,7 +9785,7 @@ Function0x37a82; 37a82
call $1d6e call $1d6e
ld hl, $68e4 ld hl, $68e4
call CallBankF call CallBattleCore
ld a, [OTPartyCount] ld a, [OTPartyCount]
add $4 add $4
ld b, a ld b, a
@@ -10533,8 +10533,8 @@ Function0x37e54: ; 37e54
; 37e73 ; 37e73
CallBankF: ; 37e73 CallBattleCore: ; 37e73
ld a, $f ld a, BANK(BattleCore)
rst FarCall rst FarCall
ret ret
; 37e77 ; 37e77

4
battle/effects/curse.asm
View File

@@ -73,9 +73,9 @@ BattleCommand54: ; 37588
set 1, [hl] set 1, [hl]
call Function0x37e01 call Function0x37e01
ld hl, GetHalfMaxHP ld hl, GetHalfMaxHP
call CallBankF call CallBattleCore
ld hl, Function3cc3f ld hl, Function3cc3f
call CallBankF call CallBattleCore
call UpdateUserInParty call UpdateUserInParty
ld hl, PutACurseText ld hl, PutACurseText
jp StdBattleTextBox jp StdBattleTextBox