Permalink
Browse files

Clean up

  • Loading branch information...
dannye committed May 26, 2014
1 parent 5594a28 commit fb83a256491c4c263c021c4bf6524d1c6d14b034
View
@@ -625,10 +625,6 @@ INCLUDE "audio/music/defeatedtrainer.asm"
INCLUDE "audio/music/defeatedwildmon.asm"
INCLUDE "audio/music/defeatedgymleader.asm"
PCBoxOWPal:
call Delay3
ld b, $09
jp GoPAL_SET
SECTION "Music 3", ROMX, BANK[AUDIO_3]

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
View
@@ -16,8 +16,11 @@ Func_525af: ; 525af (14:65af)
ld [wPlayerMonNumber], a ; $cc2f
ld [$d078], a
ld [$d35d], a
call HealthBarPal
ld a, $00
ld a, $02
ld hl, $CF1D
ld [hli], a
ld [hl], a
xor a
ld hl, $ccd3
ld b, $3c
.asm_525e1
View
@@ -147,6 +147,7 @@ Func_5525f: ; 5525f (15:525f)
call PrintText
xor a
ld [$cc49], a
call LoadMonData
call AnimateEXPBar
pop hl
ld bc, $13
@@ -236,6 +237,7 @@ Func_5525f: ; 5525f (15:525f)
call PrintText
xor a
ld [$cc49], a
call LoadMonData
call AnimateEXPBarAgain
ld d, $1
callab PrintStatsBox
@@ -364,3 +366,71 @@ GrewLevelText: ; 554dd (15:54dd)
TX_FAR _GrewLevelText
db $0b
db "@"
AnimateEXPBarAgain:
call IsCurrentMonBattleMon
ret nz
xor a
ld [wEXPBarPixelLength], a
FuncCoord 17,11
ld hl, Coord
ld a, $c0
ld c, $08
.loop
ld [hld], a
dec c
jr nz, .loop
AnimateEXPBar:
call IsCurrentMonBattleMon
ret nz
ld a, (SFX_08_3d - $4000) / 3
call PlaySoundWaitForCurrent
callab CalcEXPBarPixelLength
ld a, [wEXPBarPixelLength]
ld b, a
ld a, [H_QUOTIENT + 3]
sub b
jr z, .done
ld b, a
ld c, $08
FuncCoord 17,11
ld hl, Coord
.loop1
ld a, [hl]
cp $c8
jr nz, .loop2
dec hl
dec c
jr z, .done
jr .loop1
.loop2
inc a
ld [hl], a
call DelayFrame
dec b
jr z, .done
jr .loop1
.done
ld bc, $08
FuncCoord 10,11
ld hl, Coord
ld de, $c5ee
call CopyData
ld c, $20
jp DelayFrames
KeepEXPBarFull:
call IsCurrentMonBattleMon
ret nz
ld a, [wEXPBarKeepFullFlag]
set 0, a
ld [wEXPBarKeepFullFlag], a
ld a, [W_CURENEMYLVL] ; $d127
ret
IsCurrentMonBattleMon:
ld a, [wPlayerMonNumber]
ld b, a
ld a, [wWhichPokemon]
cp b
ret
Oops, something went wrong.

0 comments on commit fb83a25

Please sign in to comment.