Revert "Rename Variable to BallSize"

This reverts commit 5bd8802b60.
This commit is contained in:
NicoleFaye 2023-12-11 17:20:45 -08:00
parent 5bd8802b60
commit 535c297c7b
17 changed files with 22 additions and 23 deletions

View File

@ -1,6 +1,6 @@
LoadBallGfx: ; 0xdcc3
xor a
ld [wBallSize], a
ld [wd4c8], a
ld a, [wBallType]
cp GREAT_BALL
jr nc, .notPokeBall
@ -41,7 +41,7 @@ LoadBallGfx: ; 0xdcc3
LoadMiniBallGfx: ; 0xdd12
ld a, $1
ld [wBallSize], a
ld [wd4c8], a
ld a, [wBallType]
cp GREAT_BALL
jr nc, .notPokeBall
@ -83,7 +83,7 @@ LoadMiniBallGfx: ; 0xdd12
LoadSuperMiniPinballGfx: ; 0xdd62
; Loads the mini pinball graphics, which are used when entering the Slot or Ditto caves.
ld a, $2
ld [wBallSize], a
ld [wd4c8], a
ld a, $2a
ld hl, PinballBallSuperMiniGfx
ld de, vTilesOB tile $40

View File

@ -10,7 +10,7 @@ HandleBallLossDiglettBonus: ; 0xe056
ld a, $1
ld [wReturningFromBonusStage], a
ld a, $2
ld [wBallSize], a
ld [wd4c8], a
xor a
ld [wDisableHorizontalScrollForBallStart], a
ld a, [wCompletedBonusStage]

View File

@ -36,7 +36,7 @@ HandleBallLossGengarBonus: ; 0xdf1a
ld a, $1
ld [wReturningFromBonusStage], a
ld a, $2
ld [wBallSize], a
ld [wd4c8], a
xor a
ld [wDisableHorizontalScrollForBallStart], a
ld a, [wCompletedBonusStage]

View File

@ -42,7 +42,7 @@ HandleBallLossMeowthBonus: ; 0xdfe2
ld a, $1
ld [wReturningFromBonusStage], a
ld a, $2
ld [wBallSize], a
ld [wd4c8], a
xor a
ld [wDisableHorizontalScrollForBallStart], a
ld [wd712], a

View File

@ -36,7 +36,7 @@ HandleBallLossMewtwoBonus: ; 0xdf7e
ld a, $1
ld [wReturningFromBonusStage], a
ld a, $2
ld [wBallSize], a
ld [wd4c8], a
xor a
ld [wDisableHorizontalScrollForBallStart], a
ld a, [wCompletedBonusStage]

View File

@ -41,7 +41,7 @@ HandleBallLossSeelBonus: ; 0xe08b
ld a, $1
ld [wReturningFromBonusStage], a
ld a, $2
ld [wBallSize], a
ld [wd4c8], a
xor a
ld [wDisableHorizontalScrollForBallStart], a
ld [wd794], a

View File

@ -46,7 +46,7 @@ DrawPinball: ; 0x17e81
ld hl, hSCY
sub [hl]
ld c, a
ld a, [wBallSize]
ld a, [wd4c7]
srl a
srl a
srl a
@ -59,5 +59,5 @@ DrawPinball: ; 0x17e81
ld a, [wBallYPos + 1]
ld [wd4c6], a
ld a, [wBallRotation]
ld [wBallSize], a
ld [wd4c7], a
ret

View File

@ -58,7 +58,7 @@ Func_1c203: ; 0x1c203
ld a, [wBallYPos + 1]
ld [wd4c6], a
ld a, [wBallRotation]
ld [wBallSize], a
ld [wd4c7], a
ret
LoadBonusMultiplierRailingGraphics_BlueField: ; 0x1c21e

View File

@ -378,7 +378,7 @@ Func_142d7: ; 0x142d7
ret
LoadBallGraphics: ; 0x142fc
ld a, [wBallSize]
ld a, [wd4c8]
and a
jr nz, .miniBall
callba LoadBallGfx

View File

@ -14,7 +14,7 @@ InitBlueField: ; 0x1c000
ld [wExtraBalls], a
ld [wLostBall], a
ld [wBallType], a
ld [wBallSize], a
ld [wd4c8], a
ld hl, wPreviousNumPokeballs
ld [hli], a
ld [hli], a ; wNumPokeballs

View File

@ -9,7 +9,7 @@ InitDiglettBonusStage: ; 0x199f2
ld a, [wBallType]
ld [wBallTypeBackup], a
xor a
ld [wBallSize], a
ld [wd4c8], a
ld [wBallType], a
ld [wCompletedBonusStage], a
; initialize all digletts to hiding

View File

@ -14,7 +14,7 @@ InitGengarBonusStage: ; 0x18099
ld a, [wBallType]
ld [wBallTypeBackup], a
xor a
ld [wBallSize], a
ld [wd4c8], a
ld [wBallType], a
ld [wCompletedBonusStage], a
ld hl, GastlyInitialData

View File

@ -3,12 +3,12 @@ InitMeowthBonusStage: ; 0x24000
and a
ret nz
xor a
ld [wBallSize], a
ld [wd4c8], a
ld [wStageCollisionState], a
ld a, [wBallType]
ld [wBallTypeBackup], a
xor a
ld [wBallSize], a
ld [wd4c8], a
ld [wBallType], a
ld [wCompletedBonusStage], a
ld a, $1

View File

@ -9,7 +9,7 @@ InitMewtwoBonusStage: ; 0x1924f
ld a, [wBallType]
ld [wBallTypeBackup], a
xor a
ld [wBallSize], a
ld [wd4c8], a
ld [wBallType], a
ld [wCompletedBonusStage], a
ld hl, InitMewtwoOrbitingBallData

View File

@ -14,7 +14,7 @@ InitRedField: ; 0x30000
ld [wExtraBalls], a
ld [wLostBall], a
ld [wBallType], a
ld [wBallSize], a
ld [wd4c8], a
ld hl, wPreviousNumPokeballs
ld [hli], a
ld [hli], a ; wNumPokeballs

View File

@ -3,14 +3,14 @@ InitSeelBonusStage: ; 0x25a7c
and a
ret nz
xor a
ld [wBallSize], a
ld [wd4c8], a
ld [wStageCollisionState], a
ld a, $1
ld [wDisableHorizontalScrollForBallStart], a
ld a, [wBallType]
ld [wBallTypeBackup], a
xor a
ld [wBallSize], a
ld [wd4c8], a
ld [wBallType], a
ld [wCompletedBonusStage], a
ld hl, InitialSeelCoords

View File

@ -298,8 +298,7 @@ wd4c6:: ; 0xd4c6
wd4c7:: ; 0xd4c7
ds $1
wBallSize:: ; 0xd4c8
; set to 0 for default, 1 for mini, 2 for super mini
wd4c8:: ; 0xd4c8
ds $1
wLostBall:: ; 0xd4c9