z_std_dma -> m_std_dma (#127)

14 files changed, 18 insertions, 18 deletions

diff --git a/include/audio.h b/include/audio.h
index d87b24c..7ded4bc 100644
--- a/include/audio.h
+++ b/include/audio.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "game.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 
 struct xyz_t;
  
diff --git a/include/audio_load.h b/include/audio_load.h
index c32afb5..c2c67aa 100644
--- a/include/audio_load.h
+++ b/include/audio_load.h
@@ -2,7 +2,7 @@
 #define AUDIO_LOAD_H
 
 #include "ultra64.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 
 // void func_800E9FF0_jp();
 // void func_800EA0DC_jp();
diff --git a/include/z_std_dma.h b/include/m_std_dma.h
index 31980a0..47b5219 100644
--- a/include/z_std_dma.h
+++ b/include/m_std_dma.h
@@ -1,5 +1,5 @@
-#ifndef Z_STD_DMA_H
-#define Z_STD_DMA_H
+#ifndef M_STD_DMA_H
+#define M_STD_DMA_H
 
 #include "ultra64.h"
 #include "libc/stdint.h"
diff --git a/src/boot/O2/loadfragment2.c b/src/boot/O2/loadfragment2.c
index 1f977c0..5d03081 100644
--- a/src/boot/O2/loadfragment2.c
+++ b/src/boot/O2/loadfragment2.c
@@ -9,7 +9,7 @@
 #include "loadfragment.h"
 #include "attributes.h"
 #include "libc/stddef.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 
 void DoRelocation(void* allocatedRamAddr, OverlayRelocationSection* ovlRelocs, void* vramStart);
 
diff --git a/src/boot/idle.c b/src/boot/idle.c
index 6a2d627..6ca947a 100644
--- a/src/boot/idle.c
+++ b/src/boot/idle.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "stack.h"
 #include "libu64/stackcheck.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 
 OSThread sMainThread;
 STACK(sMainStack, 0x900);
diff --git a/src/boot/z_std_dma.c b/src/boot/m_std_dma.c
index 08ab3ad..7ab771f 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/m_std_dma.c
@@ -14,7 +14,7 @@ UNK_TYPE sDmaMgrCurFileLine;
 size_t B_800406B0_jp;
 size_t B_800406B4_jp;
 
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 #include "carthandle.h"
 #include "fault.h"
 #include "irqmgr.h"
diff --git a/src/boot/ovlmgr.c b/src/boot/ovlmgr.c
index d0abf57..c0dddd2 100644
--- a/src/boot/ovlmgr.c
+++ b/src/boot/ovlmgr.c
@@ -6,7 +6,7 @@
 #include "libc64/malloc.h"
 #include "m_malloc.h"
 #include "libc64/sprintf.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 
 void* ovlmgr_Malloc(size_t size) {
     void* ptr;
diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c
index ad6c0f1..7badc69 100644
--- a/src/boot/yaz0.c
+++ b/src/boot/yaz0.c
@@ -1,7 +1,7 @@
 #include "yaz0.h"
 #include "libc64/sleep.h"
 #include "fault.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 
 u8 sYaz0DataBuffer[0x400];
 u8* sYaz0CurDataEnd;
diff --git a/src/code/m_npc.c b/src/code/m_npc.c
index 281e63b..d1308b5 100644
--- a/src/code/m_npc.c
+++ b/src/code/m_npc.c
@@ -8,7 +8,7 @@
 #include "6E30B0.h"
 #include "6E7AD0.h"
 #include "m_handbill.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 #include "6DA460.h"
 #include "m_house.h"
 #include "m_malloc.h"
diff --git a/src/code/m_scene.c b/src/code/m_scene.c
index 2616ef9..9e294c9 100644
--- a/src/code/m_scene.c
+++ b/src/code/m_scene.c
@@ -10,7 +10,7 @@
 #include "code_variables.h"
 #include "m_object.h"
 #include "m_player_lib.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 
 s32 func_800C59B0_jp(ObjectExchangeBank* objectExchangeBank) {
     ObjectStatus* objectStatus = &objectExchangeBank->status[objectExchangeBank->unk17FC];
diff --git a/src/dmadata/dmadata.c b/src/dmadata/dmadata.c
index a535a7c..3ba98f9 100644
--- a/src/dmadata/dmadata.c
+++ b/src/dmadata/dmadata.c
@@ -1,5 +1,5 @@
 #include "segment_symbols.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 
 // Linker symbol declarations (used in the table below)
 #define DEFINE_DMA_ENTRY(name, _nameString) DECLARE_ROM_SEGMENT(name);
diff --git a/src/overlays/gamestates/ovl_play/m_play.c b/src/overlays/gamestates/ovl_play/m_play.c
index c47438b..fe351c3 100644
--- a/src/overlays/gamestates/ovl_play/m_play.c
+++ b/src/overlays/gamestates/ovl_play/m_play.c
@@ -33,7 +33,7 @@
 #include "version.h"
 #include "libu64/gfxprint.h"
 #include "libc/alloca.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 #include "67E840.h"
 #include "overlays/gamestates/ovl_famicom_emu/famicom_emu.h"
 #include "overlays/gamestates/ovl_trademark/m_trademark.h"
diff --git a/src/overlays/submenu/submenu_ovl/m_submenu_ovl.c b/src/overlays/submenu/submenu_ovl/m_submenu_ovl.c
index 5e839b2..6bed36b 100644
--- a/src/overlays/submenu/submenu_ovl/m_submenu_ovl.c
+++ b/src/overlays/submenu/submenu_ovl/m_submenu_ovl.c
@@ -6,7 +6,7 @@
 #include "ovlmgr.h"
 #include "PreRender.h"
 #include "sys_matrix.h"
-#include "z_std_dma.h"
+#include "m_std_dma.h"
 #include "m_rcp.h"
 #include "macros.h"
 #include "segment_symbols.h"
diff --git a/yamls/jp/boot.yaml b/yamls/jp/boot.yaml
index 48412b0..b81b099 100644
--- a/yamls/jp/boot.yaml
+++ b/yamls/jp/boot.yaml
@@ -10,7 +10,7 @@
       - [0x0011F0, c, boot/idle]
       - [0x0014A0, c, boot/viconfig]
       - [0x001640, c, boot/ovlmgr]
-      - [0x0017F0, c, boot/z_std_dma]
+      - [0x0017F0, c, boot/m_std_dma]
       - [0x0022A0, c, boot/yaz0]
       - [0x0026C0, c, boot/syncprintf]
       - [0x002720, c, boot/fault]
@@ -217,7 +217,7 @@
       - [0x016FC0, .data, boot/idle]
 
       - [0x016FD0, .data, boot/carthandle]
-      - [0x016FE0, .data, boot/z_std_dma]
+      - [0x016FE0, .data, boot/m_std_dma]
       - [0x016FF0, .data, boot/fault]
       - [0x017050, .data, boot/fault_drawer]
 
@@ -264,7 +264,7 @@
       - [0x018580, .rodata, boot/boot_main]
       - [0x018590, .rodata, boot/idle]
       - [0x0185B0, .rodata, boot/ovlmgr]
-      - [0x0185D0, .rodata, boot/z_std_dma]
+      - [0x0185D0, .rodata, boot/m_std_dma]
       - [0x0187F0, .rodata, boot/yaz0]
       - [0x018840, .rodata, boot/fault]
       - [0x019250, .rodata, boot/fault_drawer]
@@ -295,7 +295,7 @@
       - { start: 0x019D40, type: .bss, vram: 0x8003E940, name: boot/boot_main }
       - { start: 0x019D40, type: .bss, vram: 0x8003F330, name: boot/idle }
       - { start: 0x019D40, type: .bss, vram: 0x8003FF30, name: boot/viconfig }
-      - { start: 0x019D40, type: .bss, vram: 0x8003FF40, name: boot/z_std_dma }
+      - { start: 0x019D40, type: .bss, vram: 0x8003FF40, name: boot/m_std_dma }
       - { start: 0x019D40, type: .bss, vram: 0x800406C0, name: boot/yaz0 }
       - { start: 0x019D40, type: .bss, vram: 0x80040AE0, name: boot/fault }
       - { start: 0x019D40, type: .bss, vram: 0x80041960, name: boot/fault_drawer }