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

comment and relabel more battle functions

Browse Source
This commit is contained in:
yenatch 2014-01-01 08:09:15 -05:00
parent a18cab495d
commit 4dbf0d44e0
12 changed files with 300 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
battle/core.asm
View File

File diff suppressed because it is too large Load Diff

271
battle/effect_commands.asm
View File

File diff suppressed because it is too large Load Diff

8
battle/effects/curse.asm
View File

@ -41,7 +41,7 @@ BattleCommand54: ; 37588
ld a, $1 ld a, $1
ld [$c689], a ld [$c689], a
call Function37e01 call AnimateCurrentMove
ld a, $2 ld a, $2
call Function36532 call Function36532
call SwitchTurn call SwitchTurn
@ -71,7 +71,7 @@ BattleCommand54: ; 37588
jr nz, .failed jr nz, .failed
set 1, [hl] set 1, [hl]
call Function37e01 call AnimateCurrentMove
ld hl, GetHalfMaxHP ld hl, GetHalfMaxHP
call CallBattleCore call CallBattleCore
ld hl, Function3cc3f ld hl, Function3cc3f
@ -81,7 +81,7 @@ BattleCommand54: ; 37588
jp StdBattleTextBox jp StdBattleTextBox
.failed .failed
call Function37e77 call AnimateFailedMove
jp PrintButItFailed jp PrintButItFailed
@ -91,7 +91,7 @@ BattleCommand54: ; 37588
ld b, $8 ; ABILITY ld b, $8 ; ABILITY
call GetStatName call GetStatName
call Function37e77 call AnimateFailedMove
ld hl, WontRiseAnymoreText ld hl, WontRiseAnymoreText
jp StdBattleTextBox jp StdBattleTextBox
; 37618 ; 37618

2
battle/effects/endure.asm
View File

@ -10,7 +10,7 @@ BattleCommand5a: ; 3766f
call _GetBattleVar call _GetBattleVar
set SUBSTATUS_ENDURE, [hl] set SUBSTATUS_ENDURE, [hl]
call Function37e01 call AnimateCurrentMove
ld hl, BracedItselfText ld hl, BracedItselfText
jp StdBattleTextBox jp StdBattleTextBox

2
battle/effects/foresight.asm
View File

@ -14,7 +14,7 @@ BattleCommand57: ; 376a0
jr nz, .failed jr nz, .failed
set SUBSTATUS_IDENTIFIED, [hl] set SUBSTATUS_IDENTIFIED, [hl]
call Function37e01 call AnimateCurrentMove
ld hl, IdentifiedText ld hl, IdentifiedText
jp StdBattleTextBox jp StdBattleTextBox

2
battle/effects/mirror_move.asm
View File

@ -15,7 +15,7 @@ BattleCommand1b: ; 373c9
jr nz, .use jr nz, .use
.failed .failed
call Function37e77 call AnimateFailedMove
ld hl, MirrorMoveFailedText ld hl, MirrorMoveFailedText
call StdBattleTextBox call StdBattleTextBox

4
battle/effects/nightmare.asm
View File

@ -28,12 +28,12 @@ BattleCommand52: ; 37536
; Otherwise give the opponent a nightmare. ; Otherwise give the opponent a nightmare.
set SUBSTATUS_NIGHTMARE, [hl] set SUBSTATUS_NIGHTMARE, [hl]
call Function37e01 call AnimateCurrentMove
ld hl, StartedNightmareText ld hl, StartedNightmareText
jp StdBattleTextBox jp StdBattleTextBox
.failed .failed
call Function37e77 call AnimateFailedMove
jp PrintButItFailed jp PrintButItFailed
; 37563 ; 37563

4
battle/effects/perish_song.asm
View File

@ -30,12 +30,12 @@ BattleCommand58: ; 376c2
ld [EnemyPerishCount], a ld [EnemyPerishCount], a
.done .done
call Function37e01 call AnimateCurrentMove
ld hl, StartPerishText ld hl, StartPerishText
jp StdBattleTextBox jp StdBattleTextBox
.failed .failed
call Function37e77 call AnimateFailedMove
jp PrintButItFailed jp PrintButItFailed
; 376f8 ; 376f8

4
battle/effects/protect.asm
View File

@ -7,7 +7,7 @@ BattleCommand55: ; 37618
call _GetBattleVar call _GetBattleVar
set SUBSTATUS_PROTECT, [hl] set SUBSTATUS_PROTECT, [hl]
call Function37e01 call AnimateCurrentMove
ld hl, ProtectedItselfText ld hl, ProtectedItselfText
jp StdBattleTextBox jp StdBattleTextBox
@ -73,7 +73,7 @@ ProtectChance: ; 3762c
.failed .failed
xor a xor a
ld [de], a ld [de], a
call Function37e77 call AnimateFailedMove
call PrintButItFailed call PrintButItFailed
scf scf
ret ret

4
battle/effects/sandstorm.asm
View File

@ -9,12 +9,12 @@ BattleCommand59: ; 376f8
ld [Weather], a ld [Weather], a
ld a, 5 ld a, 5
ld [WeatherCount], a ld [WeatherCount], a
call Function37e01 call AnimateCurrentMove
ld hl, SandstormBrewedText ld hl, SandstormBrewedText
jp StdBattleTextBox jp StdBattleTextBox
.failed .failed
call Function37e77 call AnimateFailedMove
jp PrintButItFailed jp PrintButItFailed
; 37718 ; 37718

2
battle/effects/spikes.asm
View File

@ -17,7 +17,7 @@ BattleCommand56: ; 37683
set SCREENS_SPIKES, [hl] set SCREENS_SPIKES, [hl]
call Function37e01 call AnimateCurrentMove
ld hl, SpikesText ld hl, SpikesText
jp StdBattleTextBox jp StdBattleTextBox

6
main.asm
View File

@ -36789,7 +36789,7 @@ ClearBattleRAM: ; 2ef18
xor a xor a
call ByteFill call ByteFill
callab Function3d867 callab ResetEnemyStatLevels
call Function1fbf call Function1fbf
@ -37438,8 +37438,8 @@ Function3846c: ; 3846c
.asm_384a3 .asm_384a3
ld a, $1 ld a, $1
ld [$d264], a ld [$d264], a
callab Function3d834 callab NewEnemyMonStatus
callab Function3d867 callab ResetEnemyStatLevels
ld hl, PlayerSubStatus1 ld hl, PlayerSubStatus1
res 7, [hl] res 7, [hl]
callba Function3d4e1 callba Function3d4e1