ref: 74cee737f6990fd770838eb8fe4d090028a76bd9
parent: 0c4d2e178ebbcee1d0b8de6354fef2d1134d90bc
author: vulcandth <vulcandth@gmail.com>
date: Sat Sep 10 20:05:04 EDT 2022
Rename `macros/wram.asm` to `macros/ram.asm` (#388)
--- 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
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -23,7 +23,7 @@
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
--- /dev/null
+++ b/macros/ram.asm
@@ -1,0 +1,115 @@
+; Used in wram.asm
+
+MACRO flag_array
+ ds ((\1) + 7) / 8
+ENDM
+
+DEF BOX_STRUCT_LENGTH EQU 25 + NUM_MOVES * 2
+
+MACRO box_struct
+\1Species:: db
+\1HP:: dw
+\1BoxLevel:: db
+\1Status:: db
+\1Type::
+\1Type1:: db
+\1Type2:: db
+\1CatchRate:: db
+\1Moves:: ds NUM_MOVES
+\1OTID:: dw
+\1Exp:: ds 3
+\1HPExp:: dw
+\1AttackExp:: dw
+\1DefenseExp:: dw
+\1SpeedExp:: dw
+\1SpecialExp:: dw
+\1DVs:: ds 2
+\1PP:: ds NUM_MOVES
+ENDM
+
+MACRO party_struct
+ box_struct \1
+\1Level:: db
+\1Stats::
+\1MaxHP:: dw
+\1Attack:: dw
+\1Defense:: dw
+\1Speed:: dw
+\1Special:: dw
+ENDM
+
+MACRO battle_struct
+\1Species:: db
+\1HP:: dw
+\1PartyPos::
+\1BoxLevel:: db
+\1Status:: db
+\1Type::
+\1Type1:: db
+\1Type2:: db
+\1CatchRate:: db
+\1Moves:: ds NUM_MOVES
+\1DVs:: ds 2
+\1Level:: db
+\1Stats::
+\1MaxHP:: dw
+\1Attack:: dw
+\1Defense:: dw
+\1Speed:: dw
+\1Special:: dw
+\1PP:: ds NUM_MOVES
+ENDM
+
+MACRO spritestatedata1
+\1PictureID:: db
+\1MovementStatus:: db
+\1ImageIndex:: db
+\1YStepVector:: db
+\1YPixels:: db
+\1XStepVector:: db
+\1XPixels:: db
+\1IntraAnimFrameCounter:: db
+\1AnimFrameCounter:: db
+\1FacingDirection:: db
+\1YAdjusted:: db
+\1XAdjusted:: db
+\1CollisionData:: db
+ ds 3
+\1End::
+ENDM
+
+MACRO spritestatedata2
+\1WalkAnimationCounter:: db
+ ds 1
+\1YDisplacement:: db
+\1XDisplacement:: db
+\1MapY:: db
+\1MapX:: db
+\1MovementByte1:: db
+\1GrassPriority:: db
+\1MovementDelay:: db
+\1OrigFacingDirection:: db
+ ds 3
+\1PictureID:: db
+\1ImageBaseOffset:: db
+ ds 1
+\1End::
+ENDM
+
+MACRO sprite_oam_struct
+\1YCoord:: db
+\1XCoord:: db
+\1TileID:: db
+\1Attributes:: db
+ENDM
+
+MACRO map_connection_struct
+\1ConnectedMap:: db
+\1ConnectionStripSrc:: dw
+\1ConnectionStripDest:: dw
+\1ConnectionStripLength:: db
+\1ConnectedMapWidth:: db
+\1ConnectedMapYAlignment:: db
+\1ConnectedMapXAlignment:: db
+\1ConnectedMapViewPointer:: dw
+ENDM
--- a/macros/wram.asm
+++ /dev/null
@@ -1,115 +1,0 @@
-; Used in wram.asm
-
-MACRO flag_array
- ds ((\1) + 7) / 8
-ENDM
-
-DEF BOX_STRUCT_LENGTH EQU 25 + NUM_MOVES * 2
-
-MACRO box_struct
-\1Species:: db
-\1HP:: dw
-\1BoxLevel:: db
-\1Status:: db
-\1Type::
-\1Type1:: db
-\1Type2:: db
-\1CatchRate:: db
-\1Moves:: ds NUM_MOVES
-\1OTID:: dw
-\1Exp:: ds 3
-\1HPExp:: dw
-\1AttackExp:: dw
-\1DefenseExp:: dw
-\1SpeedExp:: dw
-\1SpecialExp:: dw
-\1DVs:: ds 2
-\1PP:: ds NUM_MOVES
-ENDM
-
-MACRO party_struct
- box_struct \1
-\1Level:: db
-\1Stats::
-\1MaxHP:: dw
-\1Attack:: dw
-\1Defense:: dw
-\1Speed:: dw
-\1Special:: dw
-ENDM
-
-MACRO battle_struct
-\1Species:: db
-\1HP:: dw
-\1PartyPos::
-\1BoxLevel:: db
-\1Status:: db
-\1Type::
-\1Type1:: db
-\1Type2:: db
-\1CatchRate:: db
-\1Moves:: ds NUM_MOVES
-\1DVs:: ds 2
-\1Level:: db
-\1Stats::
-\1MaxHP:: dw
-\1Attack:: dw
-\1Defense:: dw
-\1Speed:: dw
-\1Special:: dw
-\1PP:: ds NUM_MOVES
-ENDM
-
-MACRO spritestatedata1
-\1PictureID:: db
-\1MovementStatus:: db
-\1ImageIndex:: db
-\1YStepVector:: db
-\1YPixels:: db
-\1XStepVector:: db
-\1XPixels:: db
-\1IntraAnimFrameCounter:: db
-\1AnimFrameCounter:: db
-\1FacingDirection:: db
-\1YAdjusted:: db
-\1XAdjusted:: db
-\1CollisionData:: db
- ds 3
-\1End::
-ENDM
-
-MACRO spritestatedata2
-\1WalkAnimationCounter:: db
- ds 1
-\1YDisplacement:: db
-\1XDisplacement:: db
-\1MapY:: db
-\1MapX:: db
-\1MovementByte1:: db
-\1GrassPriority:: db
-\1MovementDelay:: db
-\1OrigFacingDirection:: db
- ds 3
-\1PictureID:: db
-\1ImageBaseOffset:: db
- ds 1
-\1End::
-ENDM
-
-MACRO sprite_oam_struct
-\1YCoord:: db
-\1XCoord:: db
-\1TileID:: db
-\1Attributes:: db
-ENDM
-
-MACRO map_connection_struct
-\1ConnectedMap:: db
-\1ConnectionStripSrc:: dw
-\1ConnectionStripDest:: dw
-\1ConnectionStripLength:: db
-\1ConnectedMapWidth:: db
-\1ConnectedMapYAlignment:: db
-\1ConnectedMapXAlignment:: db
-\1ConnectedMapViewPointer:: dw
-ENDM
--- 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"