dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split data_835B488.s to sound.s; correct FRLG music constants

Browse Source
This commit is contained in:
PikalaxALT
2019-04-12 10:23:45 -04:00
parent 02974254af
commit bd5c36e0f3
10 changed files with 259 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charmap.txt
+77
View File
@@ -534,6 +534,83 @@ SE_TB_START = 72 00
SE_TB_KON = 73 00
SE_TB_KARA = 74 00
SE_BIDORO = 75 00
BGM_FRLG_FOLLOW_ME = 10 01
BGM_FRLG_GAMECORNER = 11 01
BGM_FRLG_ROCKET_HIDEOUT = 12 01
BGM_FRLG_GYM = 13 01
BGM_FRLG_JIGGLYPUFF = 14 01
BGM_FRLG_OPENING = 15 01
BGM_FRLG_TITLE = 16 01
BGM_FRLG_CINNABAR_ISLAND = 17 01
BGM_FRLG_LAVENDER_TOWN = 18 01
BGM_FRLG_HEALING_TEST = 19 01
BGM_FRLG_BICYCLE = 1A 01
BGM_FRLG_SUSPICIOUS_EYE = 1B 01
BGM_FRLG_GIRL_EYE = 1C 01
BGM_FRLG_BOY_EYE = 1D 01
BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME = 1E 01
BGM_FRLG_VIRIDIAN_FOREST = 1F 01
BGM_FRLG_MT_MOON = 20 01
BGM_FRLG_POKEMON_MANSION = 21 01
BGM_FRLG_CREDITS = 22 01
BGM_FRLG_ROUTE_1 = 23 01
BGM_FRLG_ROUTE_24 = 24 01
BGM_FRLG_ROUTE_3 = 25 01
BGM_FRLG_ROUTE_11 = 26 01
BGM_FRLG_INDIGO_PLATEAU = 27 01
BGM_FRLG_BATTLE_LEADER = 28 01
BGM_FRLG_BATTLE_TRAINER = 29 01
BGM_FRLG_BATTLE_WILD_POKEMON = 2A 01
BGM_FRLG_BATTLE_CHAMPION = 2B 01
BGM_FRLG_PALLET_TOWN = 2C 01
BGM_FRLG_OAK_LAB = 2D 01
BGM_FRLG_PROF_OAK = 2E 01
BGM_FRLG_POKEMON_CENTER = 2F 01
BGM_FRLG_SS_ANNE = 30 01
BGM_FRLG_SURF = 31 01
BGM_FRLG_POKEMON_TOWER = 32 01
BGM_FRLG_SILPH = 33 01
BGM_FRLG_CERULEAN_CITY = 34 01
BGM_FRLG_CELADON_CITY = 35 01
BGM_FRLG_KACHI_TRAINER = 36 01
BGM_FRLG_KACHI_WILD_POKEMON = 37 01
BGM_FRLG_KACHI_LEADER = 38 01
BGM_FRLG_VERMILION_CITY = 39 01
BGM_FRLG_VIRIDIAN_CITY = 3A 01
BGM_FRLG_RIVAL = 3B 01
BGM_FRLG_RIVAL_POSTBATTLE = 3C 01
BGM_FRLG_ME_POKEDEX_EVAL = 3D 01
BGM_FRLG_ME_KEYITEM = 3E 01
BGM_FRLG_FANFA_POKEMON_CAUGHT = 3F 01
BGM_FRLG_FANFA_TRAINERCARD_PHOTO = 40 01
BGM_FRLG_GAMEFREAK_LOGO = 41 01
BGM_FRLG_CAUGHT_POKEMON = 42 01
BGM_FRLG_GAME_EXPLANATION_START = 43 01
BGM_FRLG_GAME_EXPLANATION_MIDDLE = 44 01
BGM_FRLG_GAME_EXPLANATION_END = 45 01
BGM_FRLG_POKEMON_JUMP = 46 01
BGM_FRLG_UNION_ROOM = 47 01
BGM_FRLG_POKEMON_NETWORK_CENTER = 48 01
BGM_FRLG_MYSTERY_GIFT = 49 01
BGM_FRLG_DODRIO_BERRY_PICK = 4A 01
BGM_FRLG_MT_EMBER = 4B 01
BGM_FRLG_TEACHY_TV_EPISODE = 4C 01
BGM_FRLG_SEVII_ISLANDS = 4D 01
BGM_FRLG_TANOBY_RUINS = 4E 01
BGM_FRLG_ISLAND_ONE = 4F 01
BGM_FRLG_ISLAND_FOUR = 50 01
BGM_FRLG_ISLAND_SIX = 51 01
BGM_FRLG_FLUTE = 52 01
BGM_FRLG_BATTLE_DEOXYS = 53 01
BGM_FRLG_BATTLE_MEWTWO = 54 01
BGM_FRLG_BATTLE_LEGENDARY = 55 01
BGM_FRLG_LEADER_EYE = 56 01
BGM_FRLG_DEOXYS_EYE = 57 01
BGM_FRLG_TRAINER_TOWER = 58 01
BGM_FRLG_HALL_OF_FAME_PALLET_TOWN = 59 01
BGM_FRLG_TEACHY_TV = 5A 01
BGM_STOP = 5D 01
BGM_TETSUJI = 5E 01
BGM_FIELD13 = 5F 01
data/data_835B488.s
+2 -65
View File
@@ -1,70 +1,7 @@
.section .rodata
.align 2
gUnknown_83A7310:: @ 83A7310
.incbin "baserom.gba", 0x3A7310, 0x20
gUnknown_83A7330:: @ 83A7330
.incbin "baserom.gba", 0x3A7330, 0x14
gUnknown_83A7344:: @ 83A7344
.incbin "baserom.gba", 0x3A7344, 0x48
gUnknown_83A738C:: @ 83A738C
.incbin "baserom.gba", 0x3A738C, 0x8
gUnknown_83A7394:: @ 83A7394
.incbin "baserom.gba", 0x3A7394, 0x24
gUnknown_83A73B8:: @ 83A73B8
.incbin "baserom.gba", 0x3A73B8, 0x4
gUnknown_83A73BC:: @ 83A73BC
.incbin "baserom.gba", 0x3A73BC, 0x10
gUnknown_83A73CC:: @ 83A73CC
.incbin "baserom.gba", 0x3A73CC, 0x8
gUnknown_83A73D4:: @ 83A73D4
.incbin "baserom.gba", 0x3A73D4, 0x4
gUnknown_83A73D8:: @ 83A73D8
.incbin "baserom.gba", 0x3A73D8, 0x4
gUnknown_83A73DC:: @ 83A73DC
.incbin "baserom.gba", 0x3A73DC, 0x284
gUnknown_83A7660:: @ 83A7660
.incbin "baserom.gba", 0x3A7660, 0x2FF4
gUnknown_83AA654:: @ 83AA654
.incbin "baserom.gba", 0x3AA654, 0x1220
gUnknown_83AB874:: @ 83AB874
.incbin "baserom.gba", 0x3AB874, 0x540
gUnknown_83ABDB4:: @ 83ABDB4
.incbin "baserom.gba", 0x3ABDB4, 0x434
gUnknown_83AC1E8:: @ 83AC1E8
.incbin "baserom.gba", 0x3AC1E8, 0x410
gUnknown_83AC5F8:: @ 83AC5F8
.incbin "baserom.gba", 0x3AC5F8, 0x1D0
gUnknown_83AC7C8:: @ 83AC7C8
.incbin "baserom.gba", 0x3AC7C8, 0x188
gUnknown_83AC950:: @ 83AC950
.incbin "baserom.gba", 0x3AC950, 0x10
gUnknown_83AC960:: @ 83AC960
.incbin "baserom.gba", 0x3AC960, 0x10
gUnknown_83AC970:: @ 83AC970
.incbin "baserom.gba", 0x3AC970, 0x20
sFanfares:: @ 83AC990
.incbin "baserom.gba", 0x3AC990, 0x40
gOamData_83AC9C0::
.4byte 0x00000000, 0x00000800
gUnknown_83AC9D0:: @ 83AC9D0
.incbin "baserom.gba", 0x3AC9D0, 0x8
data/field_tasks.s
+7
View File
@@ -0,0 +1,7 @@
.section .rodata
.align 2
gUnknown_83A7310:: @ 83A7310
.incbin "baserom.gba", 0x3A7310, 0x20
gUnknown_83A7330:: @ 83A7330
.incbin "baserom.gba", 0x3A7330, 0x14
data/palette.s
+7
View File
@@ -0,0 +1,7 @@
.section .rodata
.align 2
gUnknown_83AC960:: @ 83AC960
.incbin "baserom.gba", 0x3AC960, 0x10
gUnknown_83AC970:: @ 83AC970
.incbin "baserom.gba", 0x3AC970, 0x20
data/start_menu.s
+28
View File
@@ -0,0 +1,28 @@
.section .rodata
.align 2
gUnknown_83A7344:: @ 83A7344
.incbin "baserom.gba", 0x3A7344, 0x48
gUnknown_83A738C:: @ 83A738C
.incbin "baserom.gba", 0x3A738C, 0x8
gUnknown_83A7394:: @ 83A7394
.incbin "baserom.gba", 0x3A7394, 0x24
gUnknown_83A73B8:: @ 83A73B8
.incbin "baserom.gba", 0x3A73B8, 0x4
gUnknown_83A73BC:: @ 83A73BC
.incbin "baserom.gba", 0x3A73BC, 0x10
gUnknown_83A73CC:: @ 83A73CC
.incbin "baserom.gba", 0x3A73CC, 0x8
gUnknown_83A73D4:: @ 83A73D4
.incbin "baserom.gba", 0x3A73D4, 0x4
gUnknown_83A73D8:: @ 83A73D8
.incbin "baserom.gba", 0x3A73D8, 0x4
gUnknown_83A73DC:: @ 83A73DC
.incbin "baserom.gba", 0x3A73DC, 0x284
data/tileset_anims.s
+25
View File
@@ -0,0 +1,25 @@
.section .rodata
.align 2
gUnknown_83A7660:: @ 83A7660
.incbin "baserom.gba", 0x3A7660, 0x2FF4
gUnknown_83AA654:: @ 83AA654
.incbin "baserom.gba", 0x3AA654, 0x1220
gUnknown_83AB874:: @ 83AB874
.incbin "baserom.gba", 0x3AB874, 0x540
gUnknown_83ABDB4:: @ 83ABDB4
.incbin "baserom.gba", 0x3ABDB4, 0x434
gUnknown_83AC1E8:: @ 83AC1E8
.incbin "baserom.gba", 0x3AC1E8, 0x410
gUnknown_83AC5F8:: @ 83AC5F8
.incbin "baserom.gba", 0x3AC5F8, 0x1D0
gUnknown_83AC7C8:: @ 83AC7C8
.incbin "baserom.gba", 0x3AC7C8, 0x188
gUnknown_83AC950:: @ 83AC950
.incbin "baserom.gba", 0x3AC950, 0x10
include/constants/songs.h
+87 -76
View File
@@ -250,6 +250,93 @@
#define SE_W287B 245
#define SE_W114 246
#define SE_W063B 247
#define MUS_ME_ASA 256
#define MUS_FANFA1 257
#define MUS_FANFA4 258
#define MUS_FANFA5 259
#define MUS_ME_BACHI 260
#define MUS_ME_WAZA 261
#define MUS_ME_KINOMI 262
#define MUS_ME_B_BIG 268
#define MUS_ME_B_SMALL 269
#define MUS_ME_WASURE 270
#define MUS_ME_ZANNEN 271
#define BGM_FRLG_FOLLOW_ME 272
#define BGM_FRLG_GAMECORNER 273
#define BGM_FRLG_ROCKET_HIDEOUT 274
#define BGM_FRLG_GYM 275
#define BGM_FRLG_JIGGLYPUFF 276
#define BGM_FRLG_OPENING 277
#define BGM_FRLG_TITLE 278
#define BGM_FRLG_CINNABAR_ISLAND 279
#define BGM_FRLG_LAVENDER_TOWN 280
#define BGM_FRLG_HEALING_TEST 281
#define BGM_FRLG_BICYCLE 282
#define BGM_FRLG_SUSPICIOUS_EYE 283
#define BGM_FRLG_GIRL_EYE 284
#define BGM_FRLG_BOY_EYE 285
#define BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME 286
#define BGM_FRLG_VIRIDIAN_FOREST 287
#define BGM_FRLG_MT_MOON 288
#define BGM_FRLG_POKEMON_MANSION 289
#define BGM_FRLG_CREDITS 290
#define BGM_FRLG_ROUTE_1 291
#define BGM_FRLG_ROUTE_24 292
#define BGM_FRLG_ROUTE_3 293
#define BGM_FRLG_ROUTE_11 294
#define BGM_FRLG_INDIGO_PLATEAU 295
#define BGM_FRLG_BATTLE_LEADER 296
#define BGM_FRLG_BATTLE_TRAINER 297
#define BGM_FRLG_BATTLE_WILD_POKEMON 298
#define BGM_FRLG_BATTLE_CHAMPION 299
#define BGM_FRLG_PALLET_TOWN 300
#define BGM_FRLG_OAK_LAB 301
#define BGM_FRLG_PROF_OAK 302
#define BGM_FRLG_POKEMON_CENTER 303
#define BGM_FRLG_SS_ANNE 304
#define BGM_FRLG_SURF 305
#define BGM_FRLG_POKEMON_TOWER 306
#define BGM_FRLG_SILPH 307
#define BGM_FRLG_CERULEAN_CITY 308
#define BGM_FRLG_CELADON_CITY 309
#define BGM_FRLG_KACHI_TRAINER 310
#define BGM_FRLG_KACHI_WILD_POKEMON 311
#define BGM_FRLG_KACHI_LEADER 312
#define BGM_FRLG_VERMILION_CITY 313
#define BGM_FRLG_VIRIDIAN_CITY 314
#define BGM_FRLG_RIVAL 315
#define BGM_FRLG_RIVAL_POSTBATTLE 316
#define BGM_FRLG_ME_POKEDEX_EVAL 317
#define BGM_FRLG_ME_KEYITEM 318
#define BGM_FRLG_FANFA_POKEMON_CAUGHT 319
#define BGM_FRLG_FANFA_TRAINERCARD_PHOTO 320
#define BGM_FRLG_GAMEFREAK_LOGO 321
#define BGM_FRLG_CAUGHT_POKEMON 322
#define BGM_FRLG_GAME_EXPLANATION_START 323
#define BGM_FRLG_GAME_EXPLANATION_MIDDLE 324
#define BGM_FRLG_GAME_EXPLANATION_END 325
#define BGM_FRLG_POKEMON_JUMP 326
#define BGM_FRLG_UNION_ROOM 327
#define BGM_FRLG_POKEMON_NETWORK_CENTER 328
#define BGM_FRLG_MYSTERY_GIFT 329
#define BGM_FRLG_DODRIO_BERRY_PICK 330
#define BGM_FRLG_MT_EMBER 331
#define BGM_FRLG_TEACHY_TV_EPISODE 332
#define BGM_FRLG_SEVII_ISLANDS 333
#define BGM_FRLG_TANOBY_RUINS 334
#define BGM_FRLG_ISLAND_ONE 335
#define BGM_FRLG_ISLAND_FOUR 336
#define BGM_FRLG_ISLAND_SIX 337
#define BGM_FRLG_FLUTE 338
#define BGM_FRLG_BATTLE_DEOXYS 339
#define BGM_FRLG_BATTLE_MEWTWO 340
#define BGM_FRLG_BATTLE_LEGENDARY 341
#define BGM_FRLG_LEADER_EYE 342
#define BGM_FRLG_DEOXYS_EYE 343
#define BGM_FRLG_TRAINER_TOWER 344
#define BGM_FRLG_HALL_OF_FAME_PALLET_TOWN 345
#define BGM_FRLG_TEACHY_TV 346
#define BGM_STOP 349
#define BGM_TETSUJI 350
#define BGM_FIELD13 351
@@ -385,82 +472,6 @@
#define BGM_BATTLE35 481
#define BGM_BATTLE38 482
#define BGM_BATTLE30 483
#define BGM_FRLG_FOLLOW_ME 484
#define BGM_FRLG_GAMECORNER 485
#define BGM_FRLG_ROCKET_HIDEOUT 486
#define BGM_FRLG_GYM 487
#define BGM_FRLG_JIGGLYPUFF 488
#define BGM_FRLG_OPENING 489
#define BGM_FRLG_TITLE 490
#define BGM_FRLG_CINNABAR_ISLAND 491
#define BGM_FRLG_LAVENDER_TOWN 492
#define BGM_FRLG_HEALING_TEST 493
#define BGM_FRLG_BICYCLE 494
#define BGM_FRLG_SUSPICIOUS_EYE 495
#define BGM_FRLG_GIRL_EYE 496
#define BGM_FRLG_BOY_EYE 497
#define BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME 498
#define BGM_FRLG_VIRIDIAN_FOREST 499
#define BGM_FRLG_MT_MOON 500
#define BGM_FRLG_POKEMON_MANSION 501
#define BGM_FRLG_CREDITS 502
#define BGM_FRLG_ROUTE_1 503
#define BGM_FRLG_ROUTE_24 504
#define BGM_FRLG_ROUTE_3 505
#define BGM_FRLG_ROUTE_11 506
#define BGM_FRLG_INDIGO_PLATEAU 507
#define BGM_FRLG_BATTLE_LEADER 508
#define BGM_FRLG_BATTLE_TRAINER 509
#define BGM_FRLG_BATTLE_WILD_POKEMON 510
#define BGM_FRLG_BATTLE_CHAMPION 511
#define BGM_FRLG_PALLET_TOWN 512
#define BGM_FRLG_OAK_LAB 513
#define BGM_FRLG_PROF_OAK 514
#define BGM_FRLG_POKEMON_CENTER 515
#define BGM_FRLG_SS_ANNE 516
#define BGM_FRLG_SURF 517
#define BGM_FRLG_POKEMON_TOWER 518
#define BGM_FRLG_SILPH 519
#define BGM_FRLG_CERULEAN_CITY 520
#define BGM_FRLG_CELADON_CITY 521
#define BGM_FRLG_KACHI_TRAINER 522
#define BGM_FRLG_KACHI_WILD_POKEMON 523
#define BGM_FRLG_KACHI_LEADER 524
#define BGM_FRLG_VERMILION_CITY 525
#define BGM_FRLG_VIRIDIAN_CITY 526
#define BGM_FRLG_RIVAL 527
#define BGM_FRLG_RIVAL_POSTBATTLE 528
#define BGM_FRLG_ME_POKEDEX_EVAL 529
#define BGM_FRLG_ME_KEYITEM 530
#define BGM_FRLG_FANFA_POKEMON_CAUGHT 531
#define BGM_FRLG_FANFA_TRAINERCARD_PHOTO 532
#define BGM_FRLG_GAMEFREAK_LOGO 533
#define BGM_FRLG_CAUGHT_POKEMON 534
#define BGM_FRLG_GAME_EXPLANATION_START 535
#define BGM_FRLG_GAME_EXPLANATION_MIDDLE 536
#define BGM_FRLG_GAME_EXPLANATION_END 537
#define BGM_FRLG_POKEMON_JUMP 538
#define BGM_FRLG_UNION_ROOM 539
#define BGM_FRLG_POKEMON_NETWORK_CENTER 540
#define BGM_FRLG_MYSTERY_GIFT 541
#define BGM_FRLG_DODRIO_BERRY_PICK 542
#define BGM_FRLG_MT_EMBER 543
#define BGM_FRLG_TEACHY_TV_EPISODE 544
#define BGM_FRLG_SEVII_ISLANDS 545
#define BGM_FRLG_TANOBY_RUINS 546
#define BGM_FRLG_ISLAND_ONE 547
#define BGM_FRLG_ISLAND_FOUR 548
#define BGM_FRLG_ISLAND_SIX 549
#define BGM_FRLG_FLUTE 550
#define BGM_FRLG_BATTLE_DEOXYS 551
#define BGM_FRLG_BATTLE_MEWTWO 552
#define BGM_FRLG_BATTLE_LEGENDARY 553
#define BGM_FRLG_LEADER_EYE 554
#define BGM_FRLG_DEOXYS_EYE 555
#define BGM_FRLG_TRAINER_TOWER 556
#define BGM_FRLG_HALL_OF_FAME_PALLET_TOWN 557
#define BGM_FRLG_TEACHY_TV 558
#define BGM_ROUTE_118 0x7FFF // What is this for?
#endif // GUARD_CONSTANTS_SONGS_H
ld_script.txt
+5
View File
@@ -377,6 +377,11 @@ SECTIONS {
data/map_obj_80688E4.o(.rodata);
src/scrcmd.o(.rodata);
src/coord_event_weather.o(.rodata);
data/field_tasks.o(.rodata);
data/start_menu.o(.rodata);
data/tileset_anims.o(.rodata);
data/palette.o(.rodata);
src/sound.o(.rodata);
data/data_835B488.o(.rodata);
src/battle_ai_script_commands.o(.rodata);
data/data_83F5738.o(.rodata);
src/oak_speech.c
+4 -4
View File
@@ -561,7 +561,7 @@ static void Task_OaksSpeech1(u8 taskId)
ShowBg(0);
ShowBg(1);
SetVBlankCallback(VBlankCB_NewGameOaksSpeech);
PlayBGM(323);
PlayBGM(BGM_FRLG_GAME_EXPLANATION_START);
gTasks[taskId].func = Task_OaksSpeech2;
gMain.state = 0;
return;
@@ -715,7 +715,7 @@ static void Task_OakSpeech6(u8 taskId)
data[3]--;
else
{
PlayBGM(324);
PlayBGM(BGM_FRLG_GAME_EXPLANATION_MIDDLE);
sub_810F71C();
PrintTextOnRightSnappedWindow(gText_ABUTTONNext, 0, 1);
sOakSpeechResources->unk_0008 = malloc_and_decompress(sNewGameAdventureIntroTilemap, &sp14);
@@ -817,7 +817,7 @@ static void Task_OakSpeech7(u8 taskId)
break;
case 4:
sub_8006398(gTasks[taskId].data[5]);
PlayBGM(325);
PlayBGM(BGM_FRLG_GAME_EXPLANATION_END);
data[15] = 24;
gMain.state++;
break;
@@ -876,7 +876,7 @@ static void Task_OakSpeech9(u8 taskId)
CreateNidoranFSprite(taskId);
LoadOaksSpeechTrainerPic(3, 0);
CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 1);
PlayBGM(292);
PlayBGM(BGM_FRLG_ROUTE_24);
BeginNormalPaletteFade(0xFFFFFFFF, 5, 16, 0, RGB_BLACK);
data[3] = 80;
ShowBg(2);
src/sound.c
+17 -1
View File
@@ -40,7 +40,23 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern struct MusicPlayerInfo gMPlayInfo_SE3;
extern struct ToneData gCryTable[];
extern struct ToneData gCryTable2[];
extern const struct Fanfare sFanfares[];
static const struct Fanfare sFanfares[] = {
{ MUS_FANFA1, 80 },
{ MUS_FANFA4, 160 },
{ MUS_FANFA5, 220 },
{ MUS_ME_WAZA, 220 },
{ MUS_ME_ASA, 160 },
{ MUS_ME_BACHI, 340 },
{ MUS_ME_WASURE, 180 },
{ MUS_ME_KINOMI, 120 },
{ MUS_ME_B_BIG, 250 },
{ MUS_ME_B_SMALL, 150 },
{ MUS_ME_ZANNEN, 160 },
{ BGM_FRLG_FLUTE, 450 },
{ BGM_FRLG_ME_KEYITEM, 170 },
{ BGM_FRLG_ME_POKEDEX_EVAL, 196 }
};
extern u16 SpeciesToCryId(u16);