summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/high_scores_screen.asm2
-rwxr-xr-xengine/pinball_game.asm10
-rwxr-xr-xengine/pinball_game/ball_init/ball_init.asm2
-rwxr-xr-xengine/pinball_game/ball_loss/ball_loss_blue_field.asm2
-rwxr-xr-xengine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm2
-rwxr-xr-xengine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm2
-rwxr-xr-xengine/pinball_game/ball_loss/ball_loss_red_field.asm2
-rwxr-xr-xengine/pinball_game/catchem_mode.asm14
-rwxr-xr-xengine/pinball_game/draw_sprites/draw_red_field_sprites.asm2
-rwxr-xr-xengine/pinball_game/end_of_ball_bonus.asm2
-rwxr-xr-xengine/pinball_game/evolution_mode/evolution_mode_blue_field.asm4
-rwxr-xr-xengine/pinball_game/evolution_mode/evolution_mode_red_field.asm4
-rwxr-xr-xengine/pinball_game/menu.asm4
-rwxr-xr-xengine/pinball_game/object_collision/blue_stage_resolve_collision.asm18
-rwxr-xr-xengine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm2
-rwxr-xr-xengine/pinball_game/object_collision/red_stage_resolve_collision.asm18
-rwxr-xr-xengine/pinball_game/save_game.asm2
-rwxr-xr-xengine/pinball_game/vertical_screen_transition.asm6
-rwxr-xr-xengine/pokedex.asm4
19 files changed, 51 insertions, 51 deletions
diff --git a/engine/high_scores_screen.asm b/engine/high_scores_screen.asm
index 920fc9d..9823d67 100755
--- a/engine/high_scores_screen.asm
+++ b/engine/high_scores_screen.asm
@@ -645,7 +645,7 @@ Func_cf58: ; 0xcf58
ret
Func_cf7d: ; 0xcf7d
- ld a, [wd809]
+ ld a, [wNewlyPressedButtonsPersistent]
ld b, a
ld a, [wda85]
bit 6, b
diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm
index 2e2021b..766f900 100755
--- a/engine/pinball_game.asm
+++ b/engine/pinball_game.asm
@@ -15,7 +15,7 @@ GameScreenFunction_LoadGFX: ; 0xd861
call FillBottomMessageBufferWithBlackTile
ld a, $1
ld [wd85d], a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld hl, wScreenState
inc [hl]
ret
@@ -56,7 +56,7 @@ GameScreenFunction_StartBall: ; 0xd87f
and a
call nz, Func_e5d
ld a, $1
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
xor a
ld [wd7c1], a
call Func_b66
@@ -179,7 +179,7 @@ GameScreenFunction_HandleBallLoss: ; 0xda36
ld [wd7eb], a
xor a
ld [wd7e9], a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
call HandleTilts
ld a, [wCurrentStage]
@@ -203,7 +203,7 @@ GameScreenFunction_HandleBallLoss: ; 0xda36
jr z, .asm_daa9
ld a, $2
ld [wd49c], a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
call FillBottomMessageBufferWithBlackTile
call Func_30db
ld hl, wd5dc
@@ -306,7 +306,7 @@ TransitionToHighScoresScreen: ; 0xdb5d
ld hl, rIE
res 1, [hl]
xor a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld a, [wCurrentStage]
ld c, a
ld b, $0
diff --git a/engine/pinball_game/ball_init/ball_init.asm b/engine/pinball_game/ball_init/ball_init.asm
index 73cb5a4..e7a13c7 100755
--- a/engine/pinball_game/ball_init/ball_init.asm
+++ b/engine/pinball_game/ball_init/ball_init.asm
@@ -23,7 +23,7 @@ InitBallForStage: ; 0x83ba
ld [wBallSpin], a
ld [wBallRotation], a
inc a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
ld a, $20
ld [wSCX], a
diff --git a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
index e4d8692..e9a83fb 100755
--- a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
@@ -81,7 +81,7 @@ Func_ded6: ; 0xded6
ld [wd604], a
ld a, $1e
ld [wd607], a
- callba Func_10ac8
+ callba ConcludeEvolutionMode
ret
.asm_df05
diff --git a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm
index 631a882..c2cff1f 100755
--- a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm
@@ -14,7 +14,7 @@ HandleBallLossGengarBonus: ; 0xdf1a
ld a, [wd6a7]
and a
ret nz
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
ld [wBallSpin], a
ld [wBallRotation], a
diff --git a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm
index 90cc448..4cafb02 100755
--- a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm
@@ -14,7 +14,7 @@ HandleBallLossMewtwoBonus: ; 0xdf7e
ld a, [wd6b2]
and a
ret nz
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
ld [wBallSpin], a
ld [wBallRotation], a
diff --git a/engine/pinball_game/ball_loss/ball_loss_red_field.asm b/engine/pinball_game/ball_loss/ball_loss_red_field.asm
index f76bf6e..e219fbc 100755
--- a/engine/pinball_game/ball_loss/ball_loss_red_field.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_red_field.asm
@@ -81,7 +81,7 @@ Func_ddfd: ; 0xddfd
ld [wd604], a
ld a, $1e
ld [wd607], a
- callba Func_10ac8
+ callba ConcludeEvolutionMode
jr .asm_de40
.asm_de2d
diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm
index 3fb9ed3..7dbe8f9 100755
--- a/engine/pinball_game/catchem_mode.asm
+++ b/engine/pinball_game/catchem_mode.asm
@@ -690,7 +690,7 @@ BallCaptureInit: ; 0x10496
ld [wBallYVelocity], a
ld [wBallYVelocity + 1], a
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
lb de, $00, $0b
call PlaySoundEffect
@@ -788,7 +788,7 @@ CapturePokemon: ; 0x1052d
ld [wBallYPos], a
ld [wCapturingMon], a
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
callba RestoreBallSaverAfterCatchEmMode
call ConcludeCatchEmMode
@@ -1078,14 +1078,14 @@ SetPokemonOwnedFlag: ; 0x1077c
call SaveData
ret
-Func_107a5: ; 0x107a5
+ResetIndicatorStates: ; 0x107a5
xor a
ld hl, wIndicatorStates
ld b, $13
-.asm_107ab
+.loop
ld [hli], a
dec b
- jr nz, .asm_107ab
+ jr nz, .loop
ret
Func_107b0: ; 0x107b0
@@ -1244,7 +1244,7 @@ Func_10871: ; 0x10871
ret
Func_108f5: ; 0x108f5
- call Func_107a5
+ call ResetIndicatorStates
call Func_107c2
call Func_107c8
call Func_107e9
@@ -1375,7 +1375,7 @@ Func_1098c: ; 0x1098c
ret
Func_109fc: ; 0x109fc
- call Func_107a5
+ call ResetIndicatorStates
call Func_107c2
callba Func_1f2ff
ld a, [wCurrentStage]
diff --git a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
index 024527b..2e34743 100755
--- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
@@ -512,7 +512,7 @@ Func_17e5e: ; 0x17e5e
jr .asm_17e64
DrawPinball: ; 0x17e81
- ld a, [wd548]
+ ld a, [wPinballIsVisible]
and a
ret z
ld hl, wBallSpin
diff --git a/engine/pinball_game/end_of_ball_bonus.asm b/engine/pinball_game/end_of_ball_bonus.asm
index 6e8ba8a..8afdf54 100755
--- a/engine/pinball_game/end_of_ball_bonus.asm
+++ b/engine/pinball_game/end_of_ball_bonus.asm
@@ -40,7 +40,7 @@ LoadEAcuteCharacterGfx: ; 0xf55c
Func_f57f: ; 0xf57f
xor a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld hl, wBottomMessageText
ld a, $81
ld b, $40
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
index abf1ca8..a1af8f5 100755
--- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
@@ -175,7 +175,7 @@ Func_20c76: ; 0x20c76
Func_20d30: ; 0x20d30
callba RestoreBallSaverAfterCatchEmMode
callba PlaceEvolutionInParty
- callba Func_10ac8
+ callba ConcludeEvolutionMode
ld de, $0001
call PlaySong
ld hl, wNumPokemonEvolvedInBallBonus
@@ -201,7 +201,7 @@ Func_20d7c: ; 0x20d7c
ret nz
call FillBottomMessageBufferWithBlackTile
callba RestoreBallSaverAfterCatchEmMode
- callba Func_10ac8
+ callba ConcludeEvolutionMode
ld de, $0001
call PlaySong
scf
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
index 3b42550..a1149c1 100755
--- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
@@ -178,7 +178,7 @@ Func_20651: ; 0x20651
Func_2070b: ; 0x2070b
callba RestoreBallSaverAfterCatchEmMode
callba PlaceEvolutionInParty
- callba Func_10ac8
+ callba ConcludeEvolutionMode
ld de, $0001
call PlaySong
ld hl, wNumPokemonEvolvedInBallBonus
@@ -204,7 +204,7 @@ Func_20757: ; 0x20757
ret nz
call FillBottomMessageBufferWithBlackTile
callba RestoreBallSaverAfterCatchEmMode
- callba Func_10ac8
+ callba ConcludeEvolutionMode
ld de, $0001
call PlaySong
scf
diff --git a/engine/pinball_game/menu.asm b/engine/pinball_game/menu.asm
index d97d039..a31ff1f 100755
--- a/engine/pinball_game/menu.asm
+++ b/engine/pinball_game/menu.asm
@@ -6,7 +6,7 @@ HandleInGameMenu: ; 0x86d7
ld [wd917], a
call FillBottomMessageBufferWithBlackTile
xor a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld hl, wBottomMessageText
ld a, $81
ld b, $30
@@ -83,7 +83,7 @@ HandleInGameMenu: ; 0x86d7
pop af
ld [wd917], a
ld a, $1
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld a, [wInGameMenuIndex]
and a
ret
diff --git a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
index ecd555c..1cabbd8 100755
--- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
@@ -1827,11 +1827,11 @@ ResolveSlowpokeCollision: ; 0x1d216
cp $1
jr nz, .asm_1d2b6
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld a, [wLeftAlleyCount]
cp $3
jr nz, .asm_1d299
- callba Func_10ab3
+ callba StartEvolutionMode
ld a, [wd643]
and a
ret z
@@ -1853,7 +1853,7 @@ ResolveSlowpokeCollision: ; 0x1d216
cp $4
jr nz, .asm_1d2c3
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ret
.asm_1d2c3
@@ -1949,7 +1949,7 @@ ResolveCloysterCollision: ; 0x1d32d
cp $1
jr nz, .asm_1d3cb
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld a, [wRightAlleyCount]
cp $2
jr c, .noCatchEmMode
@@ -1975,7 +1975,7 @@ ResolveCloysterCollision: ; 0x1d32d
cp $4
jr nz, .asm_1d3d8
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ret
.asm_1d3d8
@@ -5788,7 +5788,7 @@ Func_1e757: ; 0x1e757
cp $c
jr nz, .asm_1e7d0
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wBallSpin], a
ld [wBallRotation], a
ret
@@ -5843,7 +5843,7 @@ Func_1e830: ; 0x1e830
callba Func_10000
jr nc, .asm_1e84b
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
ret
@@ -5891,12 +5891,12 @@ Func_1e830: ; 0x1e830
cp $d
jr nc, .asm_1e858
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
ld a, [wCatchEmOrEvolutionSlotRewardActive]
cp EVOLUTION_MODE_SLOT_REWARD
ret nz
- callba Func_10ab3
+ callba StartEvolutionMode
xor a
ld [wCatchEmOrEvolutionSlotRewardActive], a
ret
diff --git a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
index c3482d6..c73bacf 100755
--- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
@@ -877,7 +877,7 @@ Func_1894c: ; 0x1894c
jr z, .asm_18980
inc a
ld [wd6a5], a
- ld a, [wd548]
+ ld a, [wPinballIsVisible]
ld hl, wEnableBallGravityAndTilt
and [hl]
jr z, .asm_18973
diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
index 2647c0a..ac5ead8 100755
--- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
@@ -4499,7 +4499,7 @@ ResolveBellsproutCollision: ; 0x15e93
cp $1
jr nz, .asm_15f35
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld a, [wRightAlleyCount]
cp $2
jr c, .noCatchEmMode
@@ -4523,7 +4523,7 @@ ResolveBellsproutCollision: ; 0x15e93
cp $4
jr nz, .asm_15f42
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ret
.asm_15f42
@@ -4909,7 +4909,7 @@ ResolveDittoSlotCollision: ; 0x160f0
cp $9
jr nz, .asm_1616d
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wBallSpin], a
ld [wBallRotation], a
ret
@@ -4917,9 +4917,9 @@ ResolveDittoSlotCollision: ; 0x160f0
.asm_1616d
cp $6
jr nz, .asm_1618e
- callba Func_10ab3
+ callba StartEvolutionMode
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
ld a, $5
ld [wd803], a
@@ -5127,7 +5127,7 @@ Func_16279: ; 0x16279
cp $c
jr nz, .asm_162f2
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wBallSpin], a
ld [wBallRotation], a
ret
@@ -5182,7 +5182,7 @@ Func_16352: ; 0x16352
callba Func_10000
jr nc, .asm_1636d
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
ret
@@ -5230,12 +5230,12 @@ Func_16352: ; 0x16352
cp $d
jr nc, .asm_1637a
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wEnableBallGravityAndTilt], a
ld a, [wCatchEmOrEvolutionSlotRewardActive]
cp EVOLUTION_MODE_SLOT_REWARD
ret nz
- callba Func_10ab3
+ callba StartEvolutionMode
ld a, [wd7ad]
ld c, a
ld a, [wStageCollisionState]
diff --git a/engine/pinball_game/save_game.asm b/engine/pinball_game/save_game.asm
index 644abb3..1d2f539 100755
--- a/engine/pinball_game/save_game.asm
+++ b/engine/pinball_game/save_game.asm
@@ -13,7 +13,7 @@ SaveGame: ; 0xda05
ld hl, rIE
res 1, [hl]
xor a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld a, SCREEN_TITLESCREEN
ld [wCurrentScreen], a
xor a
diff --git a/engine/pinball_game/vertical_screen_transition.asm b/engine/pinball_game/vertical_screen_transition.asm
index 81203d5..94290f2 100755
--- a/engine/pinball_game/vertical_screen_transition.asm
+++ b/engine/pinball_game/vertical_screen_transition.asm
@@ -1,14 +1,14 @@
FieldVerticalTransition: ; 0xe674
push af
- ld a, [wd548]
+ ld a, [wPinballIsVisible]
push af
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wd803], a
callba DrawSpritesForStage
call CleanOAMBuffer
pop af
- ld [wd548], a
+ ld [wPinballIsVisible], a
pop af
ld [wCurrentStage], a
xor a
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 7f7eddd..8251d03 100755
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -831,11 +831,11 @@ Func_28513: ; 0x28513
Func_285ca: ; 0x285ca
xor a
- ld [wd80a], a
+ ld [wPressedButtonsPersistent], a
call Func_28972
call Func_28a8a
call Func_28ad1
- ld a, [wd80a]
+ ld a, [wPressedButtonsPersistent]
ret
Func_285db: ; 0x285db
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 04:31:12 +0000