pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Revert removal of fixed space in WRAM UNIONs to avoid bugs due to implications of shared memory regions (#6) (bug fix to 2d5bd722cd)

Browse Source
This commit is contained in:
xCrystal 2023-08-10 19:22:56 +02:00
parent 1ee4cc49ed
commit 1e02f136fd
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ram/wram.asm
View File

@ -972,8 +972,10 @@ wTileAnimBuffer:: ds 1 tiles
UNION UNION
wOtherPlayerLinkMode:: db wOtherPlayerLinkMode:: db
wOtherPlayerLinkAction:: db wOtherPlayerLinkAction:: db
ds 3
wPlayerLinkAction:: db wPlayerLinkAction:: db
wUnusedLinkAction:: db wUnusedLinkAction:: db
ds 3
NEXTU NEXTU
wLinkReceivedSyncBuffer:: ds 5 wLinkReceivedSyncBuffer:: ds 5
wLinkPlayerSyncBuffer:: ds 5 wLinkPlayerSyncBuffer:: ds 5
@ -1286,6 +1288,7 @@ SECTION UNION "Miscellaneous WRAM 1", WRAMX
wBufferMonNickname:: ds MON_NAME_LENGTH wBufferMonNickname:: ds MON_NAME_LENGTH
wBufferMonOT:: ds NAME_LENGTH wBufferMonOT:: ds NAME_LENGTH
wBufferMon:: party_struct wBufferMon wBufferMon:: party_struct wBufferMon
ds 8
wMonOrItemNameBuffer:: ds NAME_LENGTH wMonOrItemNameBuffer:: ds NAME_LENGTH
ds NAME_LENGTH ds NAME_LENGTH
@ -1320,6 +1323,7 @@ wBugContestResults::
bugcontestwinner wBugContestThirdPlace bugcontestwinner wBugContestThirdPlace
wBugContestWinnersEnd:: wBugContestWinnersEnd::
bugcontestwinner wBugContestTemp bugcontestwinner wBugContestTemp
ds 4
wBugContestWinnerName:: ds NAME_LENGTH wBugContestWinnerName:: ds NAME_LENGTH
@ -1367,6 +1371,7 @@ wNextRadioLine:: db
wRadioTextDelay:: db wRadioTextDelay:: db
wNumRadioLinesPrinted:: db wNumRadioLinesPrinted:: db
wOaksPKMNTalkSegmentCounter:: db wOaksPKMNTalkSegmentCounter:: db
ds 5
wRadioText:: ds 2 * SCREEN_WIDTH wRadioText:: ds 2 * SCREEN_WIDTH
@ -1406,6 +1411,7 @@ wPrintedUnownTileDest:: ds 1 tiles
SECTION UNION "Miscellaneous WRAM 1", WRAMX SECTION UNION "Miscellaneous WRAM 1", WRAMX
; trainer HUD data ; trainer HUD data
ds 1
wPlaceBallsDirection:: db wPlaceBallsDirection:: db
wTrainerHUDTiles:: ds 4 wTrainerHUDTiles:: ds 4
@ -1454,6 +1460,7 @@ SECTION UNION "Miscellaneous WRAM 1", WRAMX
UNION UNION
wBoxNameBuffer:: ds BOX_NAME_LENGTH wBoxNameBuffer:: ds BOX_NAME_LENGTH
NEXTU NEXTU
ds 1
wBillsPCTempListIndex:: db wBillsPCTempListIndex:: db
wBillsPCTempBoxCount:: db wBillsPCTempBoxCount:: db
ENDU ENDU
@ -1518,6 +1525,12 @@ wDebugColorIsShiny:: db
wDebugColorCurTMHM:: db wDebugColorCurTMHM:: db
SECTION UNION "Miscellaneous WRAM 1", WRAMX
; Every previous SECTION UNION takes up 60 or fewer bytes,
; except the initial "mon buffer" one.
ds 60
UNION UNION
; trainer data ; trainer data
wSeenTrainerBank:: db wSeenTrainerBank:: db
@ -1572,6 +1585,7 @@ wCurCoordEvent::
wCurCoordEventSceneID:: db wCurCoordEventSceneID:: db
wCurCoordEventMapY:: db wCurCoordEventMapY:: db
wCurCoordEventMapX:: db wCurCoordEventMapX:: db
ds 1
wCurCoordEventScriptAddr:: dw wCurCoordEventScriptAddr:: dw
NEXTU NEXTU
@ -1603,10 +1617,12 @@ wFacingDirection:: db
wWalkingX:: db wWalkingX:: db
wWalkingY:: db wWalkingY:: db
wWalkingTile:: db wWalkingTile:: db
ds 6
wPlayerTurningDirection:: db wPlayerTurningDirection:: db
NEXTU NEXTU
; std script buffer ; std script buffer
ds 1
wJumpStdScriptBuffer:: ds 3 wJumpStdScriptBuffer:: ds 3
NEXTU NEXTU
@ -1618,10 +1634,12 @@ wAvailableCallers:: ds CONTACT_LIST_SIZE
NEXTU NEXTU
; phone caller contact ; phone caller contact
ds 1
wCallerContact:: ds PHONE_CONTACT_SIZE wCallerContact:: ds PHONE_CONTACT_SIZE
NEXTU NEXTU
; backup menu data ; backup menu data
ds 7
wMenuCursorPositionBackup:: db wMenuCursorPositionBackup:: db
wMenuScrollPositionBackup:: db wMenuScrollPositionBackup:: db