Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename `macros/wram.asm` to `macros/ram.asm` (#1003)

This commit is contained in:
vulcandth 2022-09-11 00:05:07 -05:00 committed by GitHub
parent 53e1c48092
commit 4c239a6f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/audio_constants.asm
View File

@ -30,7 +30,7 @@ DEF NUM_MUSIC_CHANS EQU const_value
DEF NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS DEF NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS
DEF NUM_CHANNELS EQU const_value DEF NUM_CHANNELS EQU const_value
; channel_struct members (see macros/wram.asm) ; channel_struct members (see macros/ram.asm)
rsreset rsreset
DEF CHANNEL_MUSIC_ID rw DEF CHANNEL_MUSIC_ID rw
DEF CHANNEL_MUSIC_BANK rb DEF CHANNEL_MUSIC_BANK rb

4
constants/battle_anim_constants.asm
View File

@ -1,4 +1,4 @@
; battle_anim_struct members (see macros/wram.asm) ; battle_anim_struct members (see macros/ram.asm)
rsreset rsreset
DEF BATTLEANIMSTRUCT_INDEX rb DEF BATTLEANIMSTRUCT_INDEX rb
DEF BATTLEANIMSTRUCT_OAMFLAGS rb DEF BATTLEANIMSTRUCT_OAMFLAGS rb
@ -816,7 +816,7 @@ DEF NUM_ANIM_BGS EQU const_value - 1
const ANIM_GFX_ENEMYFEET const ANIM_GFX_ENEMYFEET
DEF NUM_ANIM_GFX EQU const_value - 1 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 rsreset
DEF BG_EFFECT_STRUCT_FUNCTION rb DEF BG_EFFECT_STRUCT_FUNCTION rb
DEF BG_EFFECT_STRUCT_JT_INDEX rb DEF BG_EFFECT_STRUCT_JT_INDEX rb

2
constants/battle_constants.asm
View File

@ -54,7 +54,7 @@ DEF MOVE_LENGTH EQU _RS
; stat constants ; stat constants
; indexes for: ; indexes for:
; - wPlayerStats and wEnemyStats (see wram.asm) ; - 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_def 1
const STAT_HP const STAT_HP
const STAT_ATK const STAT_ATK

2
constants/gfx_constants.asm
View File

@ -33,7 +33,7 @@ DEF HP_GREEN EQU 0
DEF HP_YELLOW EQU 1 DEF HP_YELLOW EQU 1
DEF HP_RED EQU 2 DEF HP_RED EQU 2
; sprite_oam_struct members (see macros/wram.asm) ; sprite_oam_struct members (see macros/ram.asm)
rsreset rsreset
DEF SPRITEOAMSTRUCT_YCOORD rb ; 0 DEF SPRITEOAMSTRUCT_YCOORD rb ; 0
DEF SPRITEOAMSTRUCT_XCOORD rb ; 1 DEF SPRITEOAMSTRUCT_XCOORD rb ; 1

4
constants/map_object_constants.asm
View File

@ -1,4 +1,4 @@
; object_struct members (see macros/wram.asm) ; object_struct members (see macros/ram.asm)
rsreset rsreset
DEF OBJECT_SPRITE rb ; 00 DEF OBJECT_SPRITE rb ; 00
DEF OBJECT_MAP_OBJECT_INDEX rb ; 01 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 RELATIVE_ATTRIBUTES EQU 1 << RELATIVE_ATTRIBUTES_F
DEF ABSOLUTE_TILE_ID EQU 1 << ABSOLUTE_TILE_ID_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 rsreset
DEF MAPOBJECT_OBJECT_STRUCT_ID rb ; 0 DEF MAPOBJECT_OBJECT_STRUCT_ID rb ; 0
DEF MAPOBJECT_SPRITE rb ; 1 DEF MAPOBJECT_SPRITE rb ; 1

2
constants/pokemon_data_constants.asm
View File

@ -72,7 +72,7 @@ DEF NUM_GROWTH_RATES EQU const_value
; pokedex entries (see data/pokemon/dex_entries.asm) ; pokedex entries (see data/pokemon/dex_entries.asm)
DEF NUM_DEX_ENTRY_BANKS EQU 4 DEF NUM_DEX_ENTRY_BANKS EQU 4
; party_struct members (see macros/wram.asm) ; party_struct members (see macros/ram.asm)
rsreset rsreset
DEF MON_SPECIES rb DEF MON_SPECIES rb
DEF MON_ITEM rb DEF MON_ITEM rb

2
constants/sprite_anim_constants.asm
View File

@ -1,4 +1,4 @@
; sprite_anim_struct members (see macros/wram.asm) ; sprite_anim_struct members (see macros/ram.asm)
rsreset rsreset
DEF SPRITEANIMSTRUCT_INDEX rb ; 0 DEF SPRITEANIMSTRUCT_INDEX rb ; 0
DEF SPRITEANIMSTRUCT_FRAMESET_ID rb ; 1 DEF SPRITEANIMSTRUCT_FRAMESET_ID rb ; 1

2
docs/design_flaws.md
View File

@ -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 ## 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 ```asm
MACRO box_struct MACRO box_struct

2
engine/games/slot_machine.asm
View File

@ -14,7 +14,7 @@ DEF SLOTS_NO_BIAS EQU -1
DEF REEL_SIZE EQU 15 DEF REEL_SIZE EQU 15
; Constants for slot_reel offsets (see macros/wram.asm) ; Constants for slot_reel offsets (see macros/ram.asm)
rsreset rsreset
DEF REEL_ACTION rb ; 0 DEF REEL_ACTION rb ; 0
DEF REEL_TILEMAP_ADDR rw ; 1 DEF REEL_TILEMAP_ADDR rw ; 1

0
macros/wram.asm → macros/ram.asm
View File

2
ram.asm
View File

@ -1,6 +1,6 @@
INCLUDE "constants.asm" INCLUDE "constants.asm"
INCLUDE "macros/wram.asm" INCLUDE "macros/ram.asm"
INCLUDE "ram/vram.asm" INCLUDE "ram/vram.asm"