pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Replace more hex values with constants or decimal

Browse Source
This commit is contained in:
Rangi 2018-07-11 15:40:09 -04:00
parent 48e209763f
commit 187e30cac8
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/sfx.asm
View File

@ -3650,8 +3650,8 @@ Sfx_2Boops_Ch5:
soundinput $8
endchannel
Sfx_UnknownCB:
musicheader 1, 8, Sfx_UnknownCB_Ch8
Sfx_IntroWhoosh:
musicheader 1, 8, Sfx_IntroWhoosh_Ch8
Sfx_Menu_Ch8:
noise __, 2, $e2, $33
@ -4703,7 +4703,7 @@ Sfx_Unknown60_Ch8:
noise __, 16, $f2, $43
endchannel
Sfx_UnknownCB_Ch8:
Sfx_IntroWhoosh_Ch8:
noise __, 2, $10, $10
noise __, 3, $20, $10
noise __, 3, $30, $20

2
audio/sfx_pointers.asm
View File

@ -204,7 +204,7 @@ SFX:
dba Sfx_IntroSuicune4
dba Sfx_GameFreakPresents
dba Sfx_Tingle
dba Sfx_UnknownCB
dba Sfx_IntroWhoosh
dba Sfx_TwoPcBeeps
dba Sfx_4NoteDitty
dba Sfx_Twinkle

1
constants/battle_constants.asm
View File

@ -61,6 +61,7 @@ MOVE_LENGTH EQU const_value
const STAT_DEF
const STAT_SPD
const STAT_SATK
NUM_EXP_STATS EQU const_value + -1
const STAT_SDEF
NUM_STATS EQU const_value
STAT_SPC EQU STAT_SATK

2
constants/sfx_constants.asm
View File

@ -206,7 +206,7 @@
const SFX_INTRO_SUICUNE_4 ; c8
const SFX_GAME_FREAK_PRESENTS ; c9
const SFX_TINGLE ; ca
const SFX_UNKNOWN_CB ; cb
const SFX_INTRO_WHOOSH ; cb
const SFX_TWO_PC_BEEPS ; cc
const SFX_4_NOTE_DITTY ; cd
const SFX_TWINKLE ; ce

10
engine/battle/core.asm
View File

@ -6992,7 +6992,7 @@ GiveExperiencePoints:
ld a, [wCurPartyMon]
ld c, a
ld b, CHECK_FLAG
ld d, $0
ld d, FALSE
predef SmallFarFlagAction
ld a, c
and a
@ -7006,7 +7006,7 @@ GiveExperiencePoints:
ld e, l
ld hl, wEnemyMonBaseStats - 1
push bc
ld c, $5
ld c, NUM_EXP_STATS
.loop1
inc hl
ld a, [de]
@ -7286,13 +7286,13 @@ GiveExperiencePoints:
ld [wMonType], a
predef CopyMonToTempMon
hlcoord 9, 0
ld b, $a
ld c, $9
ld b, 10
ld c, 9
call TextBox
hlcoord 11, 1
ld bc, 4
predef PrintTempMonStats
ld c, $1e
ld c, 30
call DelayFrames
call WaitPressAorB_BlinkCursor
call Call_LoadTempTileMapToTileMap

2
engine/movie/crystal_intro.asm
View File

@ -1481,7 +1481,7 @@ IntroScene28:
cp $8
ret nz
ld de, SFX_UNKNOWN_CB
ld de, SFX_INTRO_WHOOSH
call PlaySFX
ret

8
engine/pokemon/move_mon.asm
View File

@ -1403,7 +1403,7 @@ CalcMonStats:
; hl is the path to the Stat EXP
; de points to where the final stats will be saved
ld c, $0
ld c, STAT_HP - 1 ; first stat
.loop
inc c
call CalcMonStatC
@ -1414,7 +1414,7 @@ CalcMonStats:
ld [de], a
inc de
ld a, c
cp STAT_SDEF
cp STAT_SDEF ; last stat
jr nz, .loop
ret
@ -1434,14 +1434,14 @@ CalcMonStatC:
push hl
ld hl, wBaseStats
dec hl ; has to be decreased, because 'c' begins with 1
ld b, $0
ld b, 0
add hl, bc
ld a, [hl]
ld e, a
pop hl
push hl
ld a, c
cp STAT_SDEF
cp STAT_SDEF ; last stat
jr nz, .not_spdef
dec hl
dec hl