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

clean up some labels in battle asm

Browse Source
This commit is contained in:
yenatch 2013-12-31 04:09:00 -05:00
parent d1d186d1ee
commit 1ab4b59d86
2 changed files with 69 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
battle/core.asm
View File

@ -1049,12 +1049,12 @@ Function3c706: ; 3c706
jr z, Function3c710 jr z, Function3c710
Function3c70b: ; 3c70b Function3c70b: ; 3c70b
ld hl, EnemyMonHPHi ld hl, EnemyMonHPHi
jr asm_3c713 jr Function3c713
Function3c710: ; 3c710 Function3c710: ; 3c710
ld hl, BattleMonHP ld hl, BattleMonHP
asm_3c713 Function3c713: ; 3c713
ld a, [hli] ld a, [hli]
or [hl] or [hl]
ret ret
@ -2122,7 +2122,7 @@ Function3cd55: ; 3cd55
ld [$d0ec], a ld [$d0ec], a
call Function3cf4a call Function3cf4a
jp z, Function3c0e5 jp z, Function3c0e5
jr asm_3cdca jr Function3cdca
.asm_3cdba .asm_3cdba
ld a, $1 ld a, $1
@ -2132,8 +2132,9 @@ Function3cd55: ; 3cd55
xor a xor a
ld [$d0ec], a ld [$d0ec], a
ret ret
; 3cdca
asm_3cdca Function3cdca: ; 3cdca
ld a, [$ffcb] ld a, [$ffcb]
cp $1 cp $1
jr z, .asm_3cde6 jr z, .asm_3cde6
@ -2143,14 +2144,14 @@ asm_3cdca
call ClearBox call ClearBox
call Function3d2b3 call Function3d2b3
ld a, $1 ld a, $1
call asm_3cf78 call Function3cf78
jr .asm_3cdfc jr .asm_3cdfc
.asm_3cde6 .asm_3cde6
ld a, [CurPartyMon] ld a, [CurPartyMon]
push af push af
ld a, $1 ld a, $1
call asm_3cf78 call Function3cf78
call ClearSprites call ClearSprites
call Function309d call Function309d
pop af pop af
@ -2381,11 +2382,12 @@ Function3cf4a: ; 3cf4a
ld a, [hli] ld a, [hli]
or [hl] or [hl]
ld a, $0 ld a, $0
jr nz, asm_3cf78 jr nz, Function3cf78
inc a inc a
ret ret
; 3cf78
asm_3cf78 Function3cf78: ; 3cf78
push af push af
xor a xor a
ld [$c718], a ld [$c718], a
@ -2399,7 +2401,7 @@ asm_3cf78
jr .asm_3cf92 jr .asm_3cf92
.asm_3cf8f .asm_3cf8f
call asm_3d517 call Function3d517
.asm_3cf92 .asm_3cf92
call Function3d57a call Function3d57a
@ -2760,7 +2762,7 @@ Function3d14e: ; 3d14e
ld [$d0ec], a ld [$d0ec], a
call Function3cf4a call Function3cf4a
jp z, Function3c0e5 jp z, Function3c0e5
jp asm_3cdca jp Function3cdca
; 3d1aa ; 3d1aa
Function3d1aa: ; 3d1aa Function3d1aa: ; 3d1aa
@ -3253,7 +3255,7 @@ Function3d4c3: ; 3d4c3
Function3d4e1: ; 3d4e1 Function3d4e1: ; 3d4e1
call Function3d714 call Function3d714
jr nc, asm_3d517 jr nc, Function3d517
call Function3d557 call Function3d557
call Function3d533 call Function3d533
jr c, .asm_3d4f1 jr c, .asm_3d4f1
@ -3276,8 +3278,9 @@ Function3d4e1: ; 3d4e1
ld [$c711], a ld [$c711], a
call Function309d call Function309d
jp Function3e3ad jp Function3e3ad
; 3d517
asm_3d517 Function3d517: ; 3d517
call Function3d557 call Function3d557
call Function3d533 call Function3d533
jr c, .asm_3d522 jr c, .asm_3d522
@ -4037,12 +4040,12 @@ Function3da0d: ; 3da0d
Function3da74: ; 3da74 Function3da74: ; 3da74
call Function3da85 call Function3da85
jr asm_3da7c jr Function3da7c
Function3da79: ; 3da79 Function3da79: ; 3da79
call Function3da97 call Function3da97
asm_3da7c Function3da7c: ; 3da7c
ld b, h ld b, h
ld c, l ld c, l
callab CheckShininess callab CheckShininess
@ -8252,12 +8255,12 @@ Function3f43d: ; 3f43d
ld a, [PlayerSubStatus4] ld a, [PlayerSubStatus4]
bit 4, a bit 4, a
ld hl, BattleAnimCmd_DD ld hl, BattleAnimCmd_DD
jr nz, asm_3f46f jr nz, Function3f46f
Function3f447: ; 3f447 Function3f447: ; 3f447
ld a, [$c6fe] ld a, [$c6fe]
and a and a
ld hl, BattleAnimCmd_E2 ld hl, BattleAnimCmd_E2
jr nz, asm_3f46f jr nz, Function3f46f
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
push af push af
ld a, [BattleMonSpecies] ld a, [BattleMonSpecies]
@ -8271,8 +8274,9 @@ Function3f447: ; 3f447
pop af pop af
ld [CurPartySpecies], a ld [CurPartySpecies], a
ret ret
; 3f46f
asm_3f46f Function3f46f: ; 3f46f
ld a, [hBattleTurn] ld a, [hBattleTurn]
push af push af
xor a xor a
@ -8288,12 +8292,12 @@ Function3f47c: ; 3f47c
ld a, [EnemySubStatus4] ld a, [EnemySubStatus4]
bit 4, a bit 4, a
ld hl, BattleAnimCmd_DD ld hl, BattleAnimCmd_DD
jr nz, asm_3f4b4 jr nz, Function3f4b4
Function3f486: ; 3f486 Function3f486: ; 3f486
ld a, [$c6fa] ld a, [$c6fa]
and a and a
ld hl, BattleAnimCmd_E2 ld hl, BattleAnimCmd_E2
jr nz, asm_3f4b4 jr nz, Function3f4b4
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
push af push af
ld a, [EnemyMonSpecies] ld a, [EnemyMonSpecies]
@ -8309,8 +8313,9 @@ Function3f486: ; 3f486
pop af pop af
ld [CurPartySpecies], a ld [CurPartySpecies], a
ret ret
; 3f4b4
asm_3f4b4 Function3f4b4: ; 3f4b4
ld a, [hBattleTurn] ld a, [hBattleTurn]
push af push af
call SetEnemyTurn call SetEnemyTurn

95
battle/effect_commands.asm
View File

@ -183,7 +183,7 @@ CheckPlayerTurn:
call CantMove call CantMove
call UpdateBattleMonInParty call UpdateBattleMonInParty
ld hl, $5f48 ld hl, Function3df48
call CallBattleCore call CallBattleCore
ld a, $1 ld a, $1
ld [$ffd4], a ld [$ffd4], a
@ -443,7 +443,7 @@ CheckEnemyTurn: ; 3421f
call StdBattleTextBox call StdBattleTextBox
call CantMove call CantMove
call UpdateEnemyMonInParty call UpdateEnemyMonInParty
ld hl, $6036 ld hl, Function3e036
call CallBattleCore call CallBattleCore
ld a, $1 ld a, $1
ld [$ffd4], a ld [$ffd4], a
@ -697,7 +697,7 @@ HitConfusion: ; 343a5
and $60 and $60
call z, PlayFXAnimID call z, PlayFXAnimID
ld hl, $5f48 ld hl, Function3df48
call CallBattleCore call CallBattleCore
ld a, $1 ld a, $1
@ -3801,7 +3801,7 @@ BattleCommanda1: ; 35461
.asm_3548d .asm_3548d
ld a, [DefaultFlypoint] ld a, [DefaultFlypoint]
ld hl, PartyMon1Nickname ld hl, PartyMon1Nickname
call $38a2 call GetNick
ld a, $22 ld a, $22
call Function0x355bd call Function0x355bd
ld a, [hli] ld a, [hli]
@ -3825,7 +3825,7 @@ BattleCommanda1: ; 35461
call StdBattleTextBox call StdBattleTextBox
ld a, [EnemyMonSpecies] ld a, [EnemyMonSpecies]
ld [CurSpecies], a ld [CurSpecies], a
call $3856 call GetBaseData
ld a, [$d239] ld a, [$d239]
ld c, a ld c, a
push bc push bc
@ -3833,7 +3833,7 @@ BattleCommanda1: ; 35461
call Function0x355bd call Function0x355bd
ld a, [hl] ld a, [hl]
ld [CurSpecies], a ld [CurSpecies], a
call $3856 call GetBaseData
ld a, [$d238] ld a, [$d238]
pop bc pop bc
ld b, a ld b, a
@ -3884,7 +3884,7 @@ BattleCommanda1: ; 35461
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [$d265], a ld [$d265], a
call $343b call GetPokemonName
jr .asm_35544 jr .asm_35544
.asm_35532 .asm_35532
@ -3921,7 +3921,7 @@ BattleCommanda1: ; 35461
.asm_3556b .asm_3556b
ld a, [EnemyMonSpecies] ld a, [EnemyMonSpecies]
ld [$d265], a ld [$d265], a
call $343b call GetPokemonName
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
call StdBattleTextBox call StdBattleTextBox
jp EnemyAttackDamage jp EnemyAttackDamage
@ -5917,7 +5917,7 @@ BattleCommand17: ; 3608c
call _GetBattleVar call _GetBattleVar
set 4, [hl] set 4, [hl]
call UpdateOpponentInParty call UpdateOpponentInParty
ld hl, $6c76 ld hl, Function3ec76
call CallBattleCore call CallBattleCore
ld de, $0105 ld de, $0105
call Function0x37e54 call Function0x37e54
@ -6039,13 +6039,13 @@ BattleCommand19: ; 36165
call _GetBattleVar call _GetBattleVar
set 6, [hl] set 6, [hl]
call UpdateOpponentInParty call UpdateOpponentInParty
ld hl, $6c39 ld hl, Function3ec39
call CallBattleCore 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, Function3dde9
jp CallBattleCore jp CallBattleCore
; 361ac ; 361ac
@ -6837,10 +6837,10 @@ Function0x365d7: ; 365d7
call SwitchTurn call SwitchTurn
ld hl, $6c39 ld hl, Function3ec39
call CallBattleCore call CallBattleCore
ld hl, $6c76 ld hl, Function3ec76
call CallBattleCore call CallBattleCore
jp SwitchTurn jp SwitchTurn
@ -6857,10 +6857,10 @@ Function0x365fd: ; 365fd
call SwitchTurn call SwitchTurn
ld hl, $6c39 ld hl, Function3ec39
call CallBattleCore call CallBattleCore
ld hl, $6c76 ld hl, Function3ec76
call CallBattleCore call CallBattleCore
jp SwitchTurn jp SwitchTurn
@ -7291,7 +7291,7 @@ BattleCommand23: ; 3680f
ld hl, DraggedOutText ld hl, DraggedOutText
call StdBattleTextBox call StdBattleTextBox
ld hl, $5c23 ld hl, Function3dc23
jp CallBattleCore jp CallBattleCore
.asm_368ca .asm_368ca
@ -7354,7 +7354,7 @@ BattleCommand23: ; 3680f
call DelayFrames call DelayFrames
ld hl, $c535 ld hl, $c535
ld bc, $050b ld bc, $050b
call $0fb6 call ClearBox
ld c, $14 ld c, $14
call DelayFrames call DelayFrames
ld a, [PartyCount] ld a, [PartyCount]
@ -7382,13 +7382,13 @@ BattleCommand23: ; 3680f
ld a, d ld a, d
ld [CurPartyMon], a ld [CurPartyMon], a
ld hl, $5b32 ld hl, Function3db32
call CallBattleCore call CallBattleCore
ld hl, DraggedOutText ld hl, DraggedOutText
call StdBattleTextBox call StdBattleTextBox
ld hl, $5c23 ld hl, Function3dc23
jp CallBattleCore jp CallBattleCore
.asm_36969 .asm_36969
@ -8130,7 +8130,7 @@ Function0x36d70: ; 36d70
cp $10 cp $10
ret nz ret nz
.asm_36db0 .asm_36db0
ld hl, $5e51 ld hl, Function3de51
jp CallBattleCore jp CallBattleCore
; 36db6 ; 36db6
@ -8202,11 +8202,11 @@ BattleCommand30: ; 36dc7
call _GetBattleVar call _GetBattleVar
set 6, [hl] set 6, [hl]
call UpdateOpponentInParty call UpdateOpponentInParty
ld hl, $6c39 ld hl, Function3ec39
call CallBattleCore call CallBattleCore
call UpdateBattleHuds call UpdateBattleHuds
call PrintParalyze call PrintParalyze
ld hl, $5de9 ld hl, Function3dde9
jp CallBattleCore jp CallBattleCore
.asm_36e49 .asm_36e49
call Function0x37e77 call Function0x37e77
@ -8781,16 +8781,16 @@ BattleCommand2c: ; 3713e
pop hl pop hl
.asm_37199 .asm_37199
jr z, .asm_371a3 ; 37199 $8 jr z, .asm_371a3 ; 37199 $8
ld hl, $4c9f ld hl, GetHalfMaxHP
call CallBattleCore call CallBattleCore
jr .asm_371a9 ; 371a1 $6 jr .asm_371a9 ; 371a1 $6
.asm_371a3 .asm_371a3
ld hl, $4cac ld hl, GetMaxHP
call CallBattleCore call CallBattleCore
.asm_371a9 .asm_371a9
call Function0x37e01 call Function0x37e01
call SwitchTurn call SwitchTurn
ld hl, $4cef ld hl, Function3ccef
call CallBattleCore call CallBattleCore
call SwitchTurn call SwitchTurn
call UpdateUserInParty call UpdateUserInParty
@ -8851,7 +8851,7 @@ BattleCommand2d: ; 371cd
inc de inc de
inc de inc de
ld bc, $0004 ld bc, $0004
call $3026 call CopyBytes
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3723a ; 3722e $a jr z, .asm_3723a ; 3722e $a
@ -8878,7 +8878,7 @@ BattleCommand2d: ; 371cd
ld e, l ld e, l
pop hl pop hl
ld bc, $000c ld bc, $000c
call $3026 call CopyBytes
ld bc, $ffe2 ld bc, $ffe2
add hl, bc add hl, bc
push de push de
@ -8893,10 +8893,10 @@ BattleCommand2d: ; 371cd
inc de inc de
and a and a
jr z, .asm_3726c ; 37262 $8 jr z, .asm_3726c ; 37262 $8
cp $a6 cp SKETCH
ld a, $1 ld a, 1
jr z, .asm_3726c ; 37268 $2 jr z, .asm_3726c ; 37268 $2
ld a, $5 ld a, 5
.asm_3726c .asm_3726c
ld [hli], a ld [hli], a
dec b dec b
@ -8904,7 +8904,7 @@ BattleCommand2d: ; 371cd
pop hl pop hl
ld a, [hl] ld a, [hl]
ld [$d265], a ld [$d265], a
call $343b call GetPokemonName
ld hl, EnemyStats ld hl, EnemyStats
ld de, PlayerStats ld de, PlayerStats
ld bc, $000a ld bc, $000a
@ -9514,10 +9514,10 @@ BattleCommand61: ; 37874
ld a, BANK(AICheckPlayerMaxHP) ld a, BANK(AICheckPlayerMaxHP)
rst FarCall rst FarCall
jr c, .asm_378f3 ; 378d1 $20 jr c, .asm_378f3 ; 378d1 $20
ld hl, $4c8e ld hl, GetQuarterMaxHP
call CallBattleCore call CallBattleCore
call SwitchTurn call SwitchTurn
ld hl, $4cef ld hl, Function3ccef
call CallBattleCore call CallBattleCore
call SwitchTurn call SwitchTurn
ld hl, RegainedHealthText ld hl, RegainedHealthText
@ -9688,20 +9688,15 @@ BattleCommand67: ; 379c9
call DelayFrames call DelayFrames
call Function1d6e call Function1d6e
callba Function3d2f7 callba Function3d2f7
callba Function3d380 callba Function3d380
call ClearPalettes call ClearPalettes
callba Function3ed9f callba Function3ed9f
call Function1c17 call Function1c17
call ClearSprites call ClearSprites
ld hl, $c4a1 hlcoord 1, 0
ld bc, $040a lb bc, 4, 10
call ClearBox call ClearBox
ld b, 1 ld b, 1
@ -9710,13 +9705,11 @@ BattleCommand67: ; 379c9
call Function0x37a67 call Function0x37a67
callba Function3d2e0 callba Function3d2e0
jp c, EndMoveEffect jp c, EndMoveEffect
ld hl, Function3e459 ld hl, Function3e459
call CallBattleCore call CallBattleCore
call Function0x37ab1 call Function0x37ab1
ret ret
.Enemy .Enemy
@ -9737,19 +9730,19 @@ BattleCommand67: ; 379c9
xor a xor a
ld [$c718], a ld [$c718], a
ld hl, $5517 ld hl, Function3d517
call CallBattleCore call CallBattleCore
ld hl, $557a ld hl, Function3d57a
call CallBattleCore call CallBattleCore
ld a, 1 ld a, 1
ld [$d265], a ld [$d265], a
ld hl, $6cab ld hl, Function3ecab
call CallBattleCore call CallBattleCore
ld hl, $5c23 ld hl, Function3dc23
call CallBattleCore call CallBattleCore
jr Function0x37ab1 jr Function0x37ab1
@ -9764,12 +9757,12 @@ Function0x37a67: ; 37a67
ld a, 1 ld a, 1
ld [$d0ec], a ld [$d0ec], a
call $1d6e call Function1d6e
ld hl, $68e4 ld hl, Function3e8e4
call CallBattleCore call CallBattleCore
call $1c17 call Function1c17
xor a xor a
ld [$d0ec], a ld [$d0ec], a
@ -9783,8 +9776,8 @@ Function0x37a82; 37a82
and a and a
ret z ret z
call $1d6e call Function1d6e
ld hl, $68e4 ld hl, Function3e8e4
call CallBattleCore call CallBattleCore
ld a, [OTPartyCount] ld a, [OTPartyCount]
add $4 add $4