Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-08-08 02:24:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

trainer music constants

Browse Source
This commit is contained in:
YamaArashi 2016-11-04 21:50:44 -07:00
parent 02d3a61287
commit 356e04a104
3 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/specials.inc
View File

@ -56,7 +56,7 @@ gSpecials::
.4byte sub_8082718
.4byte sub_8082564
.4byte sub_80847C8
.4byte sub_8082728
.4byte PlayTrainerEncounterMusic
.4byte sub_8082C68
.4byte sub_8082C9C
.4byte sub_80826B0

19
include/trainer.h Normal file
View File

@ -0,0 +1,19 @@
#ifndef GUARD_TRAINER_H
#define GUARD_TRAINER_H
#define TRAINER_ENCOUNTER_MUSIC_MALE 0 // standard male encounter music
#define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music
#define TRAINER_ENCOUNTER_MUSIC_GIRL 2 // used for male Tubers and Young Couples too
#define TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS 3
#define TRAINER_ENCOUNTER_MUSIC_INTENSE 4
#define TRAINER_ENCOUNTER_MUSIC_COOL 5
#define TRAINER_ENCOUNTER_MUSIC_AQUA 6
#define TRAINER_ENCOUNTER_MUSIC_MAGMA 7
#define TRAINER_ENCOUNTER_MUSIC_SWIMMER 8
#define TRAINER_ENCOUNTER_MUSIC_TWINS 9 // used for other trainer classes too
#define TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR 10
#define TRAINER_ENCOUNTER_MUSIC_HIKER 11 // used for other trainer classes too
#define TRAINER_ENCOUNTER_MUSIC_INTERVIEWER 12
#define TRAINER_ENCOUNTER_MUSIC_RICH 13 // Rich Boys and Gentlemen
#endif // GUARD_TRAINER_H

58
src/battle_setup.c
View File

@ -11,6 +11,7 @@
#include "var.h"
#include "script.h"
#include "field_message_box.h"
#include "trainer.h"
extern void prev_quest_postbuffer_cursor_backup_reset(void);
extern void overworld_poison_timer_set(void);
@ -896,7 +897,7 @@ void sub_8082718()
ShowFieldMessage(sub_8082880());
}
void sub_8082728(void) // sets the music to be played after a battle
void PlayTrainerEncounterMusic(void)
{
u16 music;
@ -904,48 +905,47 @@ void sub_8082728(void) // sets the music to be played after a battle
{
switch (sub_803FC58(gTrainerBattleOpponent))
{
// TODO: Replace with music constants.
case 0:
music = 380;
case TRAINER_ENCOUNTER_MUSIC_MALE:
music = BGM_BOYEYE;
break;
case 1:
music = 407;
case TRAINER_ENCOUNTER_MUSIC_FEMALE:
music = BGM_GIRLEYE;
break;
case 2:
music = 379;
case TRAINER_ENCOUNTER_MUSIC_GIRL:
music = BGM_SYOUJOEYE;
break;
case 4:
music = 416;
case TRAINER_ENCOUNTER_MUSIC_INTENSE:
music = BGM_HAGESHII;
break;
case 5:
music = 417;
case TRAINER_ENCOUNTER_MUSIC_COOL:
music = BGM_KAKKOII;
break;
case 6:
music = 419;
case TRAINER_ENCOUNTER_MUSIC_AQUA:
music = BGM_AQA_0;
break;
case 7:
music = 441;
case TRAINER_ENCOUNTER_MUSIC_MAGMA:
music = BGM_MGM0;
break;
case 8:
music = 385;
case TRAINER_ENCOUNTER_MUSIC_SWIMMER:
music = BGM_SWIMEYE;
break;
case 9:
music = 449;
case TRAINER_ENCOUNTER_MUSIC_TWINS:
music = BGM_HUTAGO;
break;
case 10:
music = 450;
case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR:
music = BGM_SITENNOU;
break;
case 11:
music = 451;
case TRAINER_ENCOUNTER_MUSIC_HIKER:
music = BGM_YAMA_EYE;
break;
case 12:
music = 453;
case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER:
music = BGM_INTER_V;
break;
case 13:
music = 397;
case TRAINER_ENCOUNTER_MUSIC_RICH:
music = BGM_TEST;
break;
default:
music = 423;
music = BGM_AYASII;
}
PlayNewMapMusic(music);