Rename some labels
- Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
This commit is contained in:
71
wram.asm
71
wram.asm
@@ -141,7 +141,7 @@ wDebugFlags:: db
|
||||
wGameLogicPaused:: db
|
||||
wSpriteUpdatesEnabled:: db
|
||||
|
||||
wUnusedScriptByteBuffer:: db
|
||||
wUnusedScriptByte:: db
|
||||
|
||||
wMapTimeOfDay:: db
|
||||
|
||||
@@ -277,10 +277,12 @@ wCurSpriteOAMAddr:: db
|
||||
wCurIcon:: db
|
||||
|
||||
wCurIconTile:: db
|
||||
wSpriteAnimAddrBackup::
|
||||
wSpriteAnimIDBuffer::
|
||||
wCurSpriteOAMFlags::
|
||||
dw
|
||||
UNION
|
||||
wSpriteAnimID::
|
||||
wCurSpriteOAMFlags:: db
|
||||
NEXTU
|
||||
wSpriteAnimAddrBackup:: dw
|
||||
ENDU
|
||||
wCurAnimVTile:: db
|
||||
wCurAnimXCoord:: db
|
||||
wCurAnimYCoord:: db
|
||||
@@ -782,7 +784,7 @@ endc
|
||||
|
||||
NEXTU
|
||||
; pokegear
|
||||
wPokegearPhoneLoadNameBuffer:: db
|
||||
wPokegearPhoneDisplayPosition:: db
|
||||
wPokegearPhoneCursorPosition:: db
|
||||
wPokegearPhoneScrollPosition:: db
|
||||
wPokegearPhoneSelectedPerson:: db
|
||||
@@ -1009,7 +1011,7 @@ ENDU
|
||||
NEXTU
|
||||
; link data prep
|
||||
ds 1000
|
||||
wCurLinkOTPartyMonTypePtr:: dw
|
||||
wCurLinkOTPartyMonTypePointer:: dw
|
||||
wLinkOTPartyMonTypes:: ds 2 * PARTY_LENGTH
|
||||
|
||||
NEXTU
|
||||
@@ -1145,7 +1147,7 @@ wDebugRoomStartFunction:: dw
|
||||
wDebugRoomSelectFunction:: dw
|
||||
wDebugRoomAutoFunction:: dw
|
||||
wDebugRoomPageCount:: db
|
||||
wDebugRoomPagedValuesPtr:: dw
|
||||
wDebugRoomPagesPointer:: dw
|
||||
|
||||
wDebugRoomROMChecksum:: dw
|
||||
wDebugRoomCurChecksumBank:: db
|
||||
@@ -1173,10 +1175,10 @@ ENDU
|
||||
SECTION "Video", WRAM0
|
||||
|
||||
UNION
|
||||
; wBGMapBuffer
|
||||
wBGMapBuffer:: ds 40
|
||||
wBGMapPalBuffer:: ds 40
|
||||
wBGMapBufferPtrs:: ds 40 ; 20 bg map addresses (16x8 tiles)
|
||||
; bg map
|
||||
wBGMapBuffer:: ds 40
|
||||
wBGMapPalBuffer:: ds 40
|
||||
wBGMapBufferPointers:: ds 20 * 2
|
||||
wBGMapBufferEnd::
|
||||
|
||||
NEXTU
|
||||
@@ -1186,11 +1188,11 @@ wCreditsTimer:: db
|
||||
|
||||
NEXTU
|
||||
; mobile data
|
||||
wMobileMonSpeciesPointerBuffer:: dw
|
||||
wMobileMonStructurePointerBuffer:: dw
|
||||
wMobileMonOTNamePointerBuffer:: dw
|
||||
wMobileMonNicknamePointerBuffer:: dw
|
||||
wMobileMonMailPointerBuffer:: dw
|
||||
wMobileMonSpeciesPointer:: dw
|
||||
wMobileMonStructPointer:: dw
|
||||
wMobileMonOTNamePointer:: dw
|
||||
wMobileMonNicknamePointer:: dw
|
||||
wMobileMonMailPointer:: dw
|
||||
|
||||
NEXTU
|
||||
; more mobile data
|
||||
@@ -1205,7 +1207,7 @@ wcd27:: ds 1
|
||||
wcd28:: ds 1
|
||||
wcd29:: ds 1
|
||||
|
||||
wMobileMonSpeciesBuffer::
|
||||
wMobileMonSpecies::
|
||||
wcd2a:: db
|
||||
|
||||
wTempOddEggNickname:: ; ds 11
|
||||
@@ -1368,7 +1370,7 @@ wMonType:: db
|
||||
|
||||
wCurSpecies:: db
|
||||
|
||||
wNamedObjectTypeBuffer:: db
|
||||
wNamedObjectType:: db
|
||||
|
||||
ds 1
|
||||
|
||||
@@ -1528,7 +1530,8 @@ wMenuBorderLeftCoord:: db
|
||||
wMenuBorderBottomCoord:: db
|
||||
wMenuBorderRightCoord:: db
|
||||
wMenuDataPointer:: dw
|
||||
wMenuCursorBuffer:: dw
|
||||
wMenuCursorPosition:: db
|
||||
ds 1
|
||||
wMenuDataBank:: db
|
||||
ds 6
|
||||
wMenuHeaderEnd::
|
||||
@@ -1597,9 +1600,9 @@ wTextDelayFrames:: db
|
||||
wVBlankOccurred:: db
|
||||
|
||||
wPredefID:: db
|
||||
wPredefTemp:: dw
|
||||
wPredefHL:: dw
|
||||
wPredefAddress:: dw
|
||||
wFarCallBCBuffer:: dw
|
||||
wFarCallBC:: dw
|
||||
|
||||
wUnusedLinkCommunicationByte:: db
|
||||
|
||||
@@ -2026,7 +2029,7 @@ wCallerContact:: ds PHONE_CONTACT_SIZE
|
||||
NEXTU
|
||||
; backup menu data
|
||||
ds 7
|
||||
wMenuCursorBufferBackup:: db
|
||||
wMenuCursorPositionBackup:: db
|
||||
wMenuScrollPositionBackup:: db
|
||||
|
||||
NEXTU
|
||||
@@ -2048,7 +2051,9 @@ wStringBuffer3:: ds STRING_BUFFER_LENGTH
|
||||
wStringBuffer4:: ds STRING_BUFFER_LENGTH
|
||||
wStringBuffer5:: ds STRING_BUFFER_LENGTH
|
||||
|
||||
wBattleMenuCursorBuffer:: dw
|
||||
wBattleMenuCursorPosition:: db
|
||||
|
||||
ds 1
|
||||
|
||||
wCurBattleMon:: db
|
||||
wCurMoveNum:: db
|
||||
@@ -2071,7 +2076,7 @@ wTMHMPocketScrollPosition:: db
|
||||
|
||||
wSwitchMon::
|
||||
wSwitchItem::
|
||||
wMoveSwapBuffer::
|
||||
wSwappingMove::
|
||||
wd0e3:: ; mobile
|
||||
db
|
||||
|
||||
@@ -2126,7 +2131,7 @@ ENDU
|
||||
wListPointer:: dw
|
||||
wUnusedNamesPointer:: dw
|
||||
|
||||
wItemAttributesPtr:: dw
|
||||
wItemAttributesPointer:: dw
|
||||
|
||||
wCurItem:: db
|
||||
wCurItemQuantity::
|
||||
@@ -2154,8 +2159,8 @@ wPokemonWithdrawDepositParameter::
|
||||
; 3: Put into Day-Care
|
||||
db
|
||||
|
||||
wItemQuantityChangeBuffer:: db
|
||||
wItemQuantityBuffer:: db
|
||||
wItemQuantityChange:: db
|
||||
wItemQuantity:: db
|
||||
|
||||
wTempMon:: party_struct wTempMon
|
||||
|
||||
@@ -2167,7 +2172,7 @@ wHandlePlayerStep:: db
|
||||
|
||||
wPartyMenuActionText:: db
|
||||
|
||||
wItemAttributeParamBuffer:: db
|
||||
wItemAttributeValue:: db
|
||||
|
||||
wCurPartyLevel:: db
|
||||
|
||||
@@ -2348,7 +2353,7 @@ wCurDecorationCategory:: db
|
||||
|
||||
NEXTU
|
||||
; withdraw/deposit items
|
||||
wPCItemQuantityChangeBuffer:: db
|
||||
wPCItemQuantityChange:: db
|
||||
wPCItemQuantity:: db
|
||||
|
||||
NEXTU
|
||||
@@ -2493,8 +2498,8 @@ wPutativeTMHMMove:: db
|
||||
wInitListType:: db
|
||||
wBattleHasJustStarted:: db
|
||||
|
||||
wNamedObjectIndexBuffer::
|
||||
wDeciramBuffer::
|
||||
wNamedObjectIndex::
|
||||
wTextDecimalByte::
|
||||
wTempByteValue::
|
||||
wNumSetBits::
|
||||
wTypeMatchup::
|
||||
@@ -3017,7 +3022,7 @@ wFruitTreeFlags:: flag_array NUM_FRUIT_TREES
|
||||
|
||||
ds 2
|
||||
|
||||
wLuckyNumberDayBuffer:: dw
|
||||
wLuckyNumberDayTimer:: dw
|
||||
ds 2
|
||||
wSpecialPhoneCallID:: db
|
||||
ds 3
|
||||
|
Reference in New Issue
Block a user