aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2022-09-11 00:05:04 -0500
committerGitHub <noreply@github.com>2022-09-11 01:05:04 -0400
commit74cee737f6990fd770838eb8fe4d090028a76bd9 (patch)
tree7fbeb06d9c35225f9b95915a6b31fa7322b1f09d
parentLink to the symbols branch (diff)
downloadpokeyellow-74cee737f6990fd770838eb8fe4d090028a76bd9.tar.gz
pokeyellow-74cee737f6990fd770838eb8fe4d090028a76bd9.tar.xz
pokeyellow-74cee737f6990fd770838eb8fe4d090028a76bd9.zip
Rename `macros/wram.asm` to `macros/ram.asm` (#388)
-rw-r--r--constants/map_object_constants.asm4
-rw-r--r--constants/pokemon_data_constants.asm2
-rw-r--r--macros/ram.asm (renamed from macros/wram.asm)0
-rw-r--r--ram.asm2
4 files changed, 4 insertions, 4 deletions
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
index 5c666d83..377edcea 100644
--- a/constants/map_object_constants.asm
+++ b/constants/map_object_constants.asm
@@ -1,4 +1,4 @@
-; spritestatedata1 struct members (see macros/wram.asm)
+; spritestatedata1 struct members (see macros/ram.asm)
const_def
const SPRITESTATEDATA1_PICTUREID ; 0
const SPRITESTATEDATA1_MOVEMENTSTATUS ; 1
@@ -18,7 +18,7 @@
const SPRITESTATEDATA1_0F ; f
DEF SPRITESTATEDATA1_LENGTH EQU const_value
-; spritestatedata2 struct members (see macros/wram.asm)
+; spritestatedata2 struct members (see macros/ram.asm)
const_def
const SPRITESTATEDATA2_WALKANIMATIONCOUNTER ; 0
const SPRITESTATEDATA2_01 ; 1
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 1fd7ce19..028d6711 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -23,7 +23,7 @@ DEF BASE_TMHM rb (NUM_TM_HM + 7) / 8
rb_skip
DEF BASE_DATA_SIZE EQU _RS
-; party_struct members (see macros/wram.asm)
+; party_struct members (see macros/ram.asm)
rsreset
DEF MON_SPECIES rb
DEF MON_HP rw
diff --git a/macros/wram.asm b/macros/ram.asm
index df5dcf90..df5dcf90 100644
--- a/macros/wram.asm
+++ b/macros/ram.asm
diff --git a/ram.asm b/ram.asm
index 24040b14..077ae799 100644
--- a/ram.asm
+++ b/ram.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-INCLUDE "macros/wram.asm"
+INCLUDE "macros/ram.asm"
INCLUDE "ram/vram.asm"