diff options
| -rw-r--r-- | data/record_mixing.s | 35 | ||||
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | src/record_mixing.c | 26 |
3 files changed, 8 insertions, 55 deletions
diff --git a/data/record_mixing.s b/data/record_mixing.s deleted file mode 100644 index 6c02078f5..000000000 --- a/data/record_mixing.s +++ /dev/null @@ -1,35 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -recordMixingSecretBases:: @ 83D026C - @ gSaveBlock1.secretBases - .4byte gSaveBlock1 + 0x1A08 - - .align 2 -recordMixingTvShows:: @ 83D0270 - @ gSaveBlock1.tvShows - .4byte gSaveBlock1 + 0x2738 - - .align 2 -gUnknown_083D0274:: @ 83D0274 - .4byte gSaveBlock1 + 0x2ABC - - .align 2 -gUnknown_083D0278:: @ 83D0278 - .4byte gSaveBlock1 + 0x2D94 - - .align 2 -recordMixingEasyChatPairs:: @ 83D027C - @ gSaveBlock1.easyChatPairs - .4byte gSaveBlock1 + 0x2DD4 - - .align 2 -gUnknown_083D0280:: @ 83D0280 - .4byte gUnknown_02038738 - - .align 2 -gUnknown_083D0284:: @ 83D0284 - .4byte gSaveBlock2+0xA8 diff --git a/ld_script.txt b/ld_script.txt index 0e6e27cb3..585dd87e1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -407,7 +407,7 @@ SECTIONS { data/naming_screen.o(.rodata); data/money.o(.rodata); data/contest_effect.o(.rodata); - data/record_mixing.o(.rodata); + src/record_mixing.o(.data); src/record_mixing.o(.rodata); src/sound_check_menu.o(.rodata); data/secret_base.o(.rodata); diff --git a/src/record_mixing.c b/src/record_mixing.c index a92743fdb..a8daa9220 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -30,31 +30,19 @@ extern u8 ewram[]; #define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000)) extern struct RecordMixing_UnknownStruct gUnknown_02038738; - -extern void *const recordMixingSecretBases; -extern void *const recordMixingTvShows; -extern void *const gUnknown_083D0274; -extern void *const gUnknown_083D0278; -extern void *const recordMixingEasyChatPairs; -extern struct RecordMixing_UnknownStruct *const gUnknown_083D0280; -extern void *const gUnknown_083D0284; - extern u16 gSpecialVar_0x8005; extern u32 gUnknown_03005D2C; extern u8 gUnknown_03000718; extern u8 gUnknown_0300071C[]; extern bool8 gReceivedRemoteLinkPlayers; -// I can't define these here or else RecordMixing_PrepareExchangePacket gets optimized. -/* -void *const recordMixingSecretBases = &gSaveBlock1.secretBases; -void *const recordMixingTvShows = &gSaveBlock1.tvShows; -void *const gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC; -void *const gUnknown_083D0278 = &gSaveBlock1.oldMan; -void *const recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs; -struct RecordMixing_UnknownStruct *const gUnknown_083D0280 = &gUnknown_02038738; -void *const gUnknown_083D0284 = &gSaveBlock2.filler_A8; -*/ +void *recordMixingSecretBases = &gSaveBlock1.secretBases; +void *recordMixingTvShows = &gSaveBlock1.tvShows; +void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC; +void *gUnknown_083D0278 = &gSaveBlock1.oldMan; +void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs; +struct RecordMixing_UnknownStruct *gUnknown_083D0280 = &gUnknown_02038738; +void *gUnknown_083D0284 = &gSaveBlock2.filler_A8; #define BUFFER_CHUNK_SIZE 200 |