From 4c239a6f65bb995be8f400c05f0c9cb38beae326 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Sun, 11 Sep 2022 00:05:07 -0500 Subject: [PATCH] Rename `macros/wram.asm` to `macros/ram.asm` (#1003) --- constants/audio_constants.asm | 2 +- constants/battle_anim_constants.asm | 4 ++-- constants/battle_constants.asm | 2 +- constants/gfx_constants.asm | 2 +- constants/map_object_constants.asm | 4 ++-- constants/pokemon_data_constants.asm | 2 +- constants/sprite_anim_constants.asm | 2 +- docs/design_flaws.md | 2 +- engine/games/slot_machine.asm | 2 +- macros/{wram.asm => ram.asm} | 0 ram.asm | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) rename macros/{wram.asm => ram.asm} (100%) diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index b1fba292c..f9b016cd0 100644 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -30,7 +30,7 @@ DEF NUM_MUSIC_CHANS EQU const_value DEF NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS DEF NUM_CHANNELS EQU const_value -; channel_struct members (see macros/wram.asm) +; channel_struct members (see macros/ram.asm) rsreset DEF CHANNEL_MUSIC_ID rw DEF CHANNEL_MUSIC_BANK rb diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index 8104ba041..bf6b45e5a 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -1,4 +1,4 @@ -; battle_anim_struct members (see macros/wram.asm) +; battle_anim_struct members (see macros/ram.asm) rsreset DEF BATTLEANIMSTRUCT_INDEX rb DEF BATTLEANIMSTRUCT_OAMFLAGS rb @@ -816,7 +816,7 @@ DEF NUM_ANIM_BGS EQU const_value - 1 const ANIM_GFX_ENEMYFEET DEF NUM_ANIM_GFX EQU const_value - 1 -; battle_bg_effect struct members (see macros/wram.asm) +; battle_bg_effect struct members (see macros/ram.asm) rsreset DEF BG_EFFECT_STRUCT_FUNCTION rb DEF BG_EFFECT_STRUCT_JT_INDEX rb diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index cc5e36d08..e6a1f3665 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -54,7 +54,7 @@ DEF MOVE_LENGTH EQU _RS ; stat constants ; indexes for: ; - wPlayerStats and wEnemyStats (see wram.asm) -; - party_struct and battle_struct members (see macros/wram.asm) +; - party_struct and battle_struct members (see macros/ram.asm) const_def 1 const STAT_HP const STAT_ATK diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 7459969cd..4a56ce2b6 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -33,7 +33,7 @@ DEF HP_GREEN EQU 0 DEF HP_YELLOW EQU 1 DEF HP_RED EQU 2 -; sprite_oam_struct members (see macros/wram.asm) +; sprite_oam_struct members (see macros/ram.asm) rsreset DEF SPRITEOAMSTRUCT_YCOORD rb ; 0 DEF SPRITEOAMSTRUCT_XCOORD rb ; 1 diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 863435fd1..706e77053 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -1,4 +1,4 @@ -; object_struct members (see macros/wram.asm) +; object_struct members (see macros/ram.asm) rsreset DEF OBJECT_SPRITE rb ; 00 DEF OBJECT_MAP_OBJECT_INDEX rb ; 01 @@ -96,7 +96,7 @@ DEF ABSOLUTE_TILE_ID_F EQU 2 DEF RELATIVE_ATTRIBUTES EQU 1 << RELATIVE_ATTRIBUTES_F DEF ABSOLUTE_TILE_ID EQU 1 << ABSOLUTE_TILE_ID_F -; map_object struct members (see macros/wram.asm) +; map_object struct members (see macros/ram.asm) rsreset DEF MAPOBJECT_OBJECT_STRUCT_ID rb ; 0 DEF MAPOBJECT_SPRITE rb ; 1 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index ee0e6be03..365d4a903 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -72,7 +72,7 @@ DEF NUM_GROWTH_RATES EQU const_value ; pokedex entries (see data/pokemon/dex_entries.asm) DEF NUM_DEX_ENTRY_BANKS EQU 4 -; party_struct members (see macros/wram.asm) +; party_struct members (see macros/ram.asm) rsreset DEF MON_SPECIES rb DEF MON_ITEM rb diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 41b113a4b..bc8d3b1bb 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -1,4 +1,4 @@ -; sprite_anim_struct members (see macros/wram.asm) +; sprite_anim_struct members (see macros/ram.asm) rsreset DEF SPRITEANIMSTRUCT_INDEX rb ; 0 DEF SPRITEANIMSTRUCT_FRAMESET_ID rb ; 1 diff --git a/docs/design_flaws.md b/docs/design_flaws.md index 431cb2f66..c7ea7f7a3 100644 --- a/docs/design_flaws.md +++ b/docs/design_flaws.md @@ -621,7 +621,7 @@ And edit [engine/pokegear/radio.asm](https://github.com/pret/pokecrystal/blob/ma ## The 6-bit caught level can only record up to level 63 -Crystal added the Poké Seer, who tells you your Pokémon's caught data: where it was caught, what time, and at what level. The status screen also displays the gender of its Original Trainer, since Crystal added player genders. This data is packed into two previously-unused bytes in the `box_struct`; from [macros/wram.asm](https://github.com/pret/pokecrystal/blob/master/macros/wram.asm): +Crystal added the Poké Seer, who tells you your Pokémon's caught data: where it was caught, what time, and at what level. The status screen also displays the gender of its Original Trainer, since Crystal added player genders. This data is packed into two previously-unused bytes in the `box_struct`; from [macros/ram.asm](https://github.com/pret/pokecrystal/blob/master/macros/ram.asm): ```asm MACRO box_struct diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 887bea399..0aaa63614 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -14,7 +14,7 @@ DEF SLOTS_NO_BIAS EQU -1 DEF REEL_SIZE EQU 15 -; Constants for slot_reel offsets (see macros/wram.asm) +; Constants for slot_reel offsets (see macros/ram.asm) rsreset DEF REEL_ACTION rb ; 0 DEF REEL_TILEMAP_ADDR rw ; 1 diff --git a/macros/wram.asm b/macros/ram.asm similarity index 100% rename from macros/wram.asm rename to macros/ram.asm diff --git a/ram.asm b/ram.asm index 24040b140..077ae7991 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"