diff options
| author | petrie911 <pmontag@DESKTOP-LG8A167.localdomain> | 2021-09-29 10:27:10 -0500 |
|---|---|---|
| committer | petrie911 <pmontag@DESKTOP-LG8A167.localdomain> | 2021-09-29 10:27:10 -0500 |
| commit | 0b54149025c997bb8dac36c98522d6bd75b37cf9 (patch) | |
| tree | 5cd9fab71b58232a042201407d7e704663e405ca /src/code | |
| parent | 87da5d2b36b019fd4dd37c4f3e307704e09f9833 (diff) | |
| parent | 96cd49b6d5d642be515bdfeb97048577d8486925 (diff) | |
Merge remote-tracking branch 'upstream/master' into Majora
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/code_801A7B10.c | 2 | ||||
| -rw-r--r-- | src/code/z_sram_NES.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/code/code_801A7B10.c b/src/code/code_801A7B10.c index a8bd825b7..707996820 100644 --- a/src/code/code_801A7B10.c +++ b/src/code/code_801A7B10.c @@ -6,7 +6,7 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A7D84.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A89A8.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/Audio_QueueSeqCmd.s") #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A89D0.s") diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c index 689382ba9..5b5b2f5f0 100644 --- a/src/code/z_sram_NES.c +++ b/src/code/z_sram_NES.c @@ -18,7 +18,7 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_sram_NES/func_80144890.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_sram_NES/func_80144968.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_sram_NES/Sram_InitDebugSave.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_sram_NES/func_80144A94.s") |