Leahnaya/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-03-21 17:24:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

m4a COMMON syms

Browse Source
This commit is contained in:
Cameron Hall 2019-08-01 22:52:18 -05:00
parent 3878495887
commit c04e14d2fe
7 changed files with 26 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -110,6 +110,7 @@ $(C_BUILDDIR)/libc.o: CFLAGS := -O2
$(C_BUILDDIR)/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc
ifeq ($(NODEP),)
$(C_BUILDDIR)/%.o: c_dep = $(shell $(SCANINC) -I include $(C_SUBDIR)/$*.c)

11
common_syms/m4a_2.txt Normal file
View File

@ -0,0 +1,11 @@
gSoundInfo
gPokemonCrySongs
gPokemonCryMusicPlayers
gMPlayJumpTable
gCgbChans
gPokemonCryTracks
gPokemonCrySong
gMPlayInfo_02032EE0
gMPlayInfo_SE1
gMPlayInfo_SE2
gMPlayMemAccArea

6
ld_script.txt
View File

@ -6,7 +6,8 @@ SECTIONS
ALIGN(4)
{
<EWRAM>
. = 0x40000;
/* COMMON starts at ??? */
<COMMON>
}
/* start of iwram */
@ -16,9 +17,6 @@ SECTIONS
{
/* .bss starts at 0x3000000 */
<BSS>
/* COMMON starts at ??? */
<COMMON>
. = 0x8000;
}

29
src/m4a_2.c
View File

@ -15,26 +15,19 @@ asm(".set gCgbFreqTable, 0x0852DAA8"); // TODO:
asm(".set gNumMusicPlayers, 0x4"); // TODO:
extern char SoundMainRAM_Buffer[0x800];
extern struct SoundInfo gSoundInfo;
extern struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES];
extern void *gMPlayJumpTable[36];
extern struct CgbChannel gCgbChans[4];
extern struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2];
extern struct PokemonCrySong gPokemonCrySong;
extern u8 gMPlayMemAccArea[0x10];
struct SoundInfo gSoundInfo;
struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES];
struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES];
void *gMPlayJumpTable[36];
struct CgbChannel gCgbChans[4];
struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2];
struct PokemonCrySong gPokemonCrySong;
struct MusicPlayerInfo gMPlayInfo_02032EE0;
struct MusicPlayerInfo gMPlayInfo_SE1;
struct MusicPlayerInfo gMPlayInfo_SE2;
u8 gMPlayMemAccArea[0x10];
// BSS_CODE ALIGNED(4) char SoundMainRAM_Buffer[0x800] = {0};
// struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES];
// struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES];
// void *gMPlayJumpTable[36];
// struct CgbChannel gCgbChans[4];
// struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2];
// struct PokemonCrySong gPokemonCrySong;
// struct MusicPlayerInfo gMPlayInfo_BGM;
// struct MusicPlayerInfo gMPlayInfo_SE1;
// struct MusicPlayerInfo gMPlayInfo_SE2;
// struct MusicPlayerInfo gMPlayInfo_SE3;
// u8 gMPlayMemAccArea[0x10];
u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust)
{

1
src/m4a_4.c
View File

@ -1,7 +1,6 @@
#include "gba/m4a_internal.h"
asm(".set gXcmdTable, 0x0852DB74"); // TODO:
asm(".set gPokemonCrySongs, 0x02032AE0"); // TODO:
void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo)
{

2
sym_common.txt
View File

@ -1 +1 @@
.include "m4a_2.o"

30
sym_ewram.txt
View File

@ -159,33 +159,3 @@ gUnknown_020314E0: @ 0x20314E0
gUnknown_02031520: @ 0x2031520
.space 0x610
gSoundInfo: @ 0x2031B30
.space 0x1020
gPokemonCryMusicPlayers: @ 0x2032B50
.space 0x80
gMPlayJumpTable: @ 0x2032BD0
.space 0x90
gCgbChans: @ 0x2032C60
.space 0x100
gPokemonCryTracks: @ 0x2032D60
.space 0x140
gPokemonCrySong: @ 0x2032EA0
.space 0x40
gMPlayInfo_02032EE0: @ 0x2032EE0
.space 0xC0
gMPlayMemAccArea: @ 0x2032FA0