pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Move data/audio/ back into audio/

Browse Source 
Keep trainer data together
This commit is contained in:
Remy Oukaour 2017-12-15 12:38:59 -05:00
parent 94722aa8f0
commit 253c09949b
7 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/engine.asm
View File

@ -2882,9 +2882,9 @@ LoadMusicByte:: ; e8d76
; e8d80 ; e8d80
INCLUDE "data/audio/notes.asm" INCLUDE "audio/notes.asm"
INCLUDE "data/audio/wave_samples.asm" INCLUDE "audio/wave_samples.asm"
INCLUDE "audio/drumkits.asm" INCLUDE "audio/drumkits.asm"

0
data/audio/notes.asm → audio/notes.asm
View File

0
data/audio/wave_samples.asm → audio/wave_samples.asm
View File

2
constants/audio_constants.asm
View File

@ -1,5 +1,5 @@
; pitch ; pitch
; FrequencyTable indexes (see data/audio/notes.asm) ; FrequencyTable indexes (see audio/notes.asm)
const_def const_def
const __ ; 0 const __ ; 0
const C_ ; 1 const C_ ; 1

1
constants/trainer_constants.asm
View File

@ -7,6 +7,7 @@ ENDM
; `trainerclass` indexes are for: ; `trainerclass` indexes are for:
; - TrainerClassAttributes (see data/trainers/trainer_attributes.asm) ; - TrainerClassAttributes (see data/trainers/trainer_attributes.asm)
; - TrainerClassDVs (see data/trainers/trainer_dvs.asm) ; - TrainerClassDVs (see data/trainers/trainer_dvs.asm)
; - TrainerClassNames (see data/trainers/trainer_class_names.asm)
; - TrainerEncounterMusic (see data/trainers/encounter_music.asm) ; - TrainerEncounterMusic (see data/trainers/encounter_music.asm)
; - TrainerGroups (see data/trainers/party_pointers.asm) ; - TrainerGroups (see data/trainers/party_pointers.asm)
; - BTTrainerClassGenders (see data/trainers/gendered_trainers.asm) ; - BTTrainerClassGenders (see data/trainers/gendered_trainers.asm)

2
text/trainer_class_names.asm → data/trainers/trainer_class_names.asm
View File

@ -1,3 +1,5 @@
TrainerClassNames:: ; 2c1ef
; entries correspond to trainer classes (see constants/trainer_constants.asm)
db "LEADER@" db "LEADER@"
db "LEADER@" db "LEADER@"
db "LEADER@" db "LEADER@"

3
main.asm
View File

@ -1172,8 +1172,7 @@ SECTION "bankB", ROMX
INCLUDE "battle/trainer_huds.asm" INCLUDE "battle/trainer_huds.asm"
TrainerClassNames:: ; 2c1ef INCLUDE "data/trainers/trainer_class_names.asm"
INCLUDE "text/trainer_class_names.asm"
INCLUDE "battle/ai/redundant.asm" INCLUDE "battle/ai/redundant.asm"