You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Rename Map<N>Object addresses to MapObject<N>; create wMapObjectsBackups and sMapObjectsBackups in respective WRAM/SRAM sections (#32)
This commit is contained in:
@@ -135,3 +135,8 @@ SECTION "Boxes 8-14", SRAM
|
||||
; All 14 boxes fit exactly within 2 SRAM banks
|
||||
assert box_n == NUM_BOXES, \
|
||||
"boxes: Expected {d:NUM_BOXES} total boxes, got {d:box_n}"
|
||||
|
||||
|
||||
SECTION "SRAM Map Objects Backups", SRAM
|
||||
|
||||
sMapObjectsBackups:: ds wMapObjectsBackupsEnd - wMapObjectsBackups
|
||||
|
24
ram/wram.asm
24
ram/wram.asm
@@ -133,8 +133,6 @@ wPrinterConnectionOpen:: db
|
||||
wPrinterOpcode:: db
|
||||
wPrevDexEntry:: db
|
||||
wDisableTextAcceleration:: db
|
||||
wPrevLandmark:: db
|
||||
wCurLandmark:: db
|
||||
|
||||
wLinkMode::
|
||||
; a LINK_* value for the link type
|
||||
@@ -2340,10 +2338,10 @@ endr
|
||||
wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE
|
||||
|
||||
wMapObjects::
|
||||
wPlayerObject:: map_object wPlayer ; player is map object 0
|
||||
; wMap1Object - wMap15Object
|
||||
wPlayerObject:: map_object wPlayerObject ; player is map object 0
|
||||
; wMapObject1 - wMapObject15
|
||||
for n, 1, NUM_OBJECTS
|
||||
wMap{d:n}Object:: map_object wMap{d:n}
|
||||
wMapObject{d:n}:: map_object wMapObject{d:n}
|
||||
endr
|
||||
|
||||
wObjectMasks:: ds NUM_OBJECTS
|
||||
@@ -2689,6 +2687,22 @@ wPokeAnimBitmaskBuffer:: ds 7
|
||||
wPokeAnimStructEnd::
|
||||
|
||||
|
||||
SECTION "Map Objects Backups", WRAMX
|
||||
|
||||
wMapObjectsBackups::
|
||||
; wMap1ObjectsBackup* - wMap10ObjectsBackup*
|
||||
; ds (2 + MAPOBJECT_LENGTH * (NUM_OBJECTS - 1)) * NUM_MAP_OBJECTS_BACKUPS
|
||||
for n, 1, NUM_MAP_OBJECTS_BACKUPS
|
||||
wMap{d:n}ObjectsBackupMapGroup:: db
|
||||
wMap{d:n}ObjectsBackupMapNumber:: db
|
||||
wMap{d:n}ObjectsBackupData::
|
||||
for m, 1, NUM_OBJECTS
|
||||
wMap{d:n}ObjectsBackupObject{d:m}:: map_object wMap{d:n}ObjectsBackupObject{d:m}
|
||||
endr
|
||||
endr
|
||||
wMapObjectsBackupsEnd:: db ; list terminator
|
||||
|
||||
|
||||
SECTION "GBC Video", WRAMX, ALIGN[8]
|
||||
|
||||
; eight 4-color palettes each
|
||||
|
Reference in New Issue
Block a user