Avoid magic numbers for most CopyData calls (#542)

This commit is contained in:
dannye
2025-11-25 22:54:43 +00:00
parent 266074c0c1
commit 0f3c9354a9
10 changed files with 45 additions and 5 deletions

View File

@@ -18905,9 +18905,9 @@ WRAM0 bank #0:
$cd3d = wTitleMonSpecies
$cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
$cd3d = wTempSCX
$cd3d = wUnusedCreditsByte
$cd3d = wMoveDownSmallStarsOAMCount
$cd3d = wStoppingWhichSlotMachineWheel
$cd3d = wUnusedCreditsByte
$cd3d = wFieldMoves
$cd3d = wHoFTeamIndex
$cd3d = wCoordIndex
@@ -18943,6 +18943,7 @@ WRAM0 bank #0:
$cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay
$cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue
$cd3f = wSlotMachineWheel2Offset
$cd3f = wHUDUnusedTopTile
$cd3f = wFlyAnimBirdSpriteImageIndex
$cd3f = wNameOfPlayerMonToBeTraded
$cd3f = wDayCareTotalCost
@@ -18954,11 +18955,13 @@ WRAM0 bank #0:
$cd40 = wOptionsCancelCursorX
$cd40 = wTrainerScreenY
$cd40 = wSlotMachineWheel3Offset
$cd40 = wHUDCornerTile
$cd40 = wPlayerSpinInPlaceAnimSoundID
$cd40 = wHiddenObjectY
$cd40 = wHoFMonOrPlayer
$cd41 = wSlotMachineWheel1BottomTile
$cd41 = wSlotMachineWinningSymbol
$cd41 = wHUDTriangleTile
$cd41 = wHoFTeamIndex2
$cd41 = wNumFieldMoves
$cd41 = wDayCarePerLevelCost
@@ -18967,6 +18970,7 @@ WRAM0 bank #0:
$cd41 = wTrainerScreenX
$cd41 = wHiddenItemOrCoinsIndex
$cd42 = wSlotMachineWheel1MiddleTile
$cd42 = wHUDGraphicsTilesEnd
$cd42 = wHoFTeamNo
$cd42 = wFieldMovesLeftmostXCoord
$cd43 = wLastFieldMoveID

View File

@@ -18607,6 +18607,7 @@
00:cd3f wDayCareTotalCost
00:cd3f wFlyAnimBirdSpriteImageIndex
00:cd3f wHUDGraphicsTiles
00:cd3f wHUDUnusedTopTile
00:cd3f wHiddenObjectIndex
00:cd3f wHoFMonLevel
00:cd3f wJigglypuffFacingDirections
@@ -18617,6 +18618,7 @@
00:cd3f wSlotMachineWheel2Offset
00:cd3f wTrainerFacingDirection
00:cd3f wTrainerInfoTextBoxNextRowOffset
00:cd40 wHUDCornerTile
00:cd40 wHiddenObjectY
00:cd40 wHoFMonOrPlayer
00:cd40 wOptionsCancelCursorX
@@ -18624,6 +18626,7 @@
00:cd40 wSlotMachineWheel3Offset
00:cd40 wTrainerScreenY
00:cd41 wDayCarePerLevelCost
00:cd41 wHUDTriangleTile
00:cd41 wHiddenItemOrCoinsIndex
00:cd41 wHiddenObjectX
00:cd41 wHoFTeamIndex2
@@ -18633,6 +18636,7 @@
00:cd41 wTradedPlayerMonOT
00:cd41 wTrainerScreenX
00:cd42 wFieldMovesLeftmostXCoord
00:cd42 wHUDGraphicsTilesEnd
00:cd42 wHoFTeamNo
00:cd42 wSlotMachineWheel1MiddleTile
00:cd43 wLastFieldMoveID

View File

@@ -18915,9 +18915,9 @@ WRAM0 bank #0:
$cd3d = wTitleMonSpecies
$cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
$cd3d = wTempSCX
$cd3d = wUnusedCreditsByte
$cd3d = wMoveDownSmallStarsOAMCount
$cd3d = wStoppingWhichSlotMachineWheel
$cd3d = wUnusedCreditsByte
$cd3d = wFieldMoves
$cd3d = wHoFTeamIndex
$cd3d = wCoordIndex
@@ -18953,6 +18953,7 @@ WRAM0 bank #0:
$cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay
$cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue
$cd3f = wSlotMachineWheel2Offset
$cd3f = wHUDUnusedTopTile
$cd3f = wFlyAnimBirdSpriteImageIndex
$cd3f = wNameOfPlayerMonToBeTraded
$cd3f = wDayCareTotalCost
@@ -18964,11 +18965,13 @@ WRAM0 bank #0:
$cd40 = wOptionsCancelCursorX
$cd40 = wTrainerScreenY
$cd40 = wSlotMachineWheel3Offset
$cd40 = wHUDCornerTile
$cd40 = wPlayerSpinInPlaceAnimSoundID
$cd40 = wHiddenObjectY
$cd40 = wHoFMonOrPlayer
$cd41 = wSlotMachineWheel1BottomTile
$cd41 = wSlotMachineWinningSymbol
$cd41 = wHUDTriangleTile
$cd41 = wHoFTeamIndex2
$cd41 = wNumFieldMoves
$cd41 = wDayCarePerLevelCost
@@ -18977,6 +18980,7 @@ WRAM0 bank #0:
$cd41 = wTrainerScreenX
$cd41 = wHiddenItemOrCoinsIndex
$cd42 = wSlotMachineWheel1MiddleTile
$cd42 = wHUDGraphicsTilesEnd
$cd42 = wHoFTeamNo
$cd42 = wFieldMovesLeftmostXCoord
$cd43 = wLastFieldMoveID

View File

@@ -18617,6 +18617,7 @@
00:cd3f wDayCareTotalCost
00:cd3f wFlyAnimBirdSpriteImageIndex
00:cd3f wHUDGraphicsTiles
00:cd3f wHUDUnusedTopTile
00:cd3f wHiddenObjectIndex
00:cd3f wHoFMonLevel
00:cd3f wJigglypuffFacingDirections
@@ -18627,6 +18628,7 @@
00:cd3f wSlotMachineWheel2Offset
00:cd3f wTrainerFacingDirection
00:cd3f wTrainerInfoTextBoxNextRowOffset
00:cd40 wHUDCornerTile
00:cd40 wHiddenObjectY
00:cd40 wHoFMonOrPlayer
00:cd40 wOptionsCancelCursorX
@@ -18634,6 +18636,7 @@
00:cd40 wSlotMachineWheel3Offset
00:cd40 wTrainerScreenY
00:cd41 wDayCarePerLevelCost
00:cd41 wHUDTriangleTile
00:cd41 wHiddenItemOrCoinsIndex
00:cd41 wHiddenObjectX
00:cd41 wHoFTeamIndex2
@@ -18643,6 +18646,7 @@
00:cd41 wTradedPlayerMonOT
00:cd41 wTrainerScreenX
00:cd42 wFieldMovesLeftmostXCoord
00:cd42 wHUDGraphicsTilesEnd
00:cd42 wHoFTeamNo
00:cd42 wSlotMachineWheel1MiddleTile
00:cd43 wLastFieldMoveID

View File

@@ -18995,6 +18995,7 @@ WRAM0 bank #0:
$cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay
$cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue
$cd3f = wSlotMachineWheel2Offset
$cd3f = wHUDUnusedTopTile
$cd3f = wFlyAnimBirdSpriteImageIndex
$cd3f = wNameOfPlayerMonToBeTraded
$cd3f = wDayCareTotalCost
@@ -19006,11 +19007,13 @@ WRAM0 bank #0:
$cd40 = wOptionsCancelCursorX
$cd40 = wTrainerScreenY
$cd40 = wSlotMachineWheel3Offset
$cd40 = wHUDCornerTile
$cd40 = wPlayerSpinInPlaceAnimSoundID
$cd40 = wHiddenObjectY
$cd40 = wHoFMonOrPlayer
$cd41 = wSlotMachineWheel1BottomTile
$cd41 = wSlotMachineWinningSymbol
$cd41 = wHUDTriangleTile
$cd41 = wHoFTeamIndex2
$cd41 = wNumFieldMoves
$cd41 = wDayCarePerLevelCost
@@ -19019,6 +19022,7 @@ WRAM0 bank #0:
$cd41 = wTrainerScreenX
$cd41 = wHiddenItemOrCoinsIndex
$cd42 = wSlotMachineWheel1MiddleTile
$cd42 = wHUDGraphicsTilesEnd
$cd42 = wHoFTeamNo
$cd42 = wFieldMovesLeftmostXCoord
$cd43 = wLastFieldMoveID
@@ -20647,8 +20651,8 @@ HRAM bank #0:
$ffdc = hOaksAideRewardItem
$ffdc = hGymGateAnswer
$ffdc = hItemToRemoveIndex
$ffdd = hPlayerXCoord
$ffdd = hOaksAideNumMonsOwned
$ffdd = hPlayerXCoord
$ffe0 = hBackupGymGateIndex
$ffe0 = hUnlockedSilphCoDoors
$ffe1 = hStartTileID

View File

@@ -18659,6 +18659,7 @@
00:cd3f wDayCareTotalCost
00:cd3f wFlyAnimBirdSpriteImageIndex
00:cd3f wHUDGraphicsTiles
00:cd3f wHUDUnusedTopTile
00:cd3f wHiddenObjectIndex
00:cd3f wHoFMonLevel
00:cd3f wJigglypuffFacingDirections
@@ -18669,6 +18670,7 @@
00:cd3f wSlotMachineWheel2Offset
00:cd3f wTrainerFacingDirection
00:cd3f wTrainerInfoTextBoxNextRowOffset
00:cd40 wHUDCornerTile
00:cd40 wHiddenObjectY
00:cd40 wHoFMonOrPlayer
00:cd40 wOptionsCancelCursorX
@@ -18676,6 +18678,7 @@
00:cd40 wSlotMachineWheel3Offset
00:cd40 wTrainerScreenY
00:cd41 wDayCarePerLevelCost
00:cd41 wHUDTriangleTile
00:cd41 wHiddenItemOrCoinsIndex
00:cd41 wHiddenObjectX
00:cd41 wHoFTeamIndex2
@@ -18685,6 +18688,7 @@
00:cd41 wTradedPlayerMonOT
00:cd41 wTrainerScreenX
00:cd42 wFieldMovesLeftmostXCoord
00:cd42 wHUDGraphicsTilesEnd
00:cd42 wHoFTeamNo
00:cd42 wSlotMachineWheel1MiddleTile
00:cd43 wLastFieldMoveID

View File

@@ -18905,9 +18905,9 @@ WRAM0 bank #0:
$cd3d = wTitleMonSpecies
$cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
$cd3d = wTempSCX
$cd3d = wUnusedCreditsByte
$cd3d = wMoveDownSmallStarsOAMCount
$cd3d = wStoppingWhichSlotMachineWheel
$cd3d = wUnusedCreditsByte
$cd3d = wFieldMoves
$cd3d = wHoFTeamIndex
$cd3d = wCoordIndex
@@ -18943,6 +18943,7 @@ WRAM0 bank #0:
$cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay
$cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue
$cd3f = wSlotMachineWheel2Offset
$cd3f = wHUDUnusedTopTile
$cd3f = wFlyAnimBirdSpriteImageIndex
$cd3f = wNameOfPlayerMonToBeTraded
$cd3f = wDayCareTotalCost
@@ -18954,11 +18955,13 @@ WRAM0 bank #0:
$cd40 = wOptionsCancelCursorX
$cd40 = wTrainerScreenY
$cd40 = wSlotMachineWheel3Offset
$cd40 = wHUDCornerTile
$cd40 = wPlayerSpinInPlaceAnimSoundID
$cd40 = wHiddenObjectY
$cd40 = wHoFMonOrPlayer
$cd41 = wSlotMachineWheel1BottomTile
$cd41 = wSlotMachineWinningSymbol
$cd41 = wHUDTriangleTile
$cd41 = wHoFTeamIndex2
$cd41 = wNumFieldMoves
$cd41 = wDayCarePerLevelCost
@@ -18967,6 +18970,7 @@ WRAM0 bank #0:
$cd41 = wTrainerScreenX
$cd41 = wHiddenItemOrCoinsIndex
$cd42 = wSlotMachineWheel1MiddleTile
$cd42 = wHUDGraphicsTilesEnd
$cd42 = wHoFTeamNo
$cd42 = wFieldMovesLeftmostXCoord
$cd43 = wLastFieldMoveID

View File

@@ -18607,6 +18607,7 @@
00:cd3f wDayCareTotalCost
00:cd3f wFlyAnimBirdSpriteImageIndex
00:cd3f wHUDGraphicsTiles
00:cd3f wHUDUnusedTopTile
00:cd3f wHiddenObjectIndex
00:cd3f wHoFMonLevel
00:cd3f wJigglypuffFacingDirections
@@ -18617,6 +18618,7 @@
00:cd3f wSlotMachineWheel2Offset
00:cd3f wTrainerFacingDirection
00:cd3f wTrainerInfoTextBoxNextRowOffset
00:cd40 wHUDCornerTile
00:cd40 wHiddenObjectY
00:cd40 wHoFMonOrPlayer
00:cd40 wOptionsCancelCursorX
@@ -18624,6 +18626,7 @@
00:cd40 wSlotMachineWheel3Offset
00:cd40 wTrainerScreenY
00:cd41 wDayCarePerLevelCost
00:cd41 wHUDTriangleTile
00:cd41 wHiddenItemOrCoinsIndex
00:cd41 wHiddenObjectX
00:cd41 wHoFTeamIndex2
@@ -18633,6 +18636,7 @@
00:cd41 wTradedPlayerMonOT
00:cd41 wTrainerScreenX
00:cd42 wFieldMovesLeftmostXCoord
00:cd42 wHUDGraphicsTilesEnd
00:cd42 wHoFTeamNo
00:cd42 wSlotMachineWheel1MiddleTile
00:cd43 wLastFieldMoveID

View File

@@ -18998,6 +18998,7 @@ WRAM0 bank #0:
$cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay
$cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue
$cd3f = wSlotMachineWheel2Offset
$cd3f = wHUDUnusedTopTile
$cd3f = wFlyAnimBirdSpriteImageIndex
$cd3f = wNameOfPlayerMonToBeTraded
$cd3f = wDayCareTotalCost
@@ -19009,11 +19010,13 @@ WRAM0 bank #0:
$cd40 = wOptionsCancelCursorX
$cd40 = wTrainerScreenY
$cd40 = wSlotMachineWheel3Offset
$cd40 = wHUDCornerTile
$cd40 = wPlayerSpinInPlaceAnimSoundID
$cd40 = wHiddenObjectY
$cd40 = wHoFMonOrPlayer
$cd41 = wSlotMachineWheel1BottomTile
$cd41 = wSlotMachineWinningSymbol
$cd41 = wHUDTriangleTile
$cd41 = wHoFTeamIndex2
$cd41 = wNumFieldMoves
$cd41 = wDayCarePerLevelCost
@@ -19022,6 +19025,7 @@ WRAM0 bank #0:
$cd41 = wTrainerScreenX
$cd41 = wHiddenItemOrCoinsIndex
$cd42 = wSlotMachineWheel1MiddleTile
$cd42 = wHUDGraphicsTilesEnd
$cd42 = wHoFTeamNo
$cd42 = wFieldMovesLeftmostXCoord
$cd43 = wLastFieldMoveID
@@ -20650,8 +20654,8 @@ HRAM bank #0:
$ffdc = hOaksAideRewardItem
$ffdc = hGymGateAnswer
$ffdc = hItemToRemoveIndex
$ffdd = hPlayerXCoord
$ffdd = hOaksAideNumMonsOwned
$ffdd = hPlayerXCoord
$ffe0 = hBackupGymGateIndex
$ffe0 = hUnlockedSilphCoDoors
$ffe1 = hStartTileID

View File

@@ -18662,6 +18662,7 @@
00:cd3f wDayCareTotalCost
00:cd3f wFlyAnimBirdSpriteImageIndex
00:cd3f wHUDGraphicsTiles
00:cd3f wHUDUnusedTopTile
00:cd3f wHiddenObjectIndex
00:cd3f wHoFMonLevel
00:cd3f wJigglypuffFacingDirections
@@ -18672,6 +18673,7 @@
00:cd3f wSlotMachineWheel2Offset
00:cd3f wTrainerFacingDirection
00:cd3f wTrainerInfoTextBoxNextRowOffset
00:cd40 wHUDCornerTile
00:cd40 wHiddenObjectY
00:cd40 wHoFMonOrPlayer
00:cd40 wOptionsCancelCursorX
@@ -18679,6 +18681,7 @@
00:cd40 wSlotMachineWheel3Offset
00:cd40 wTrainerScreenY
00:cd41 wDayCarePerLevelCost
00:cd41 wHUDTriangleTile
00:cd41 wHiddenItemOrCoinsIndex
00:cd41 wHiddenObjectX
00:cd41 wHoFTeamIndex2
@@ -18688,6 +18691,7 @@
00:cd41 wTradedPlayerMonOT
00:cd41 wTrainerScreenX
00:cd42 wFieldMovesLeftmostXCoord
00:cd42 wHUDGraphicsTilesEnd
00:cd42 wHoFTeamNo
00:cd42 wSlotMachineWheel1MiddleTile
00:cd43 wLastFieldMoveID