From f177ec55b1691fda4162b2a7de11b06854e01938 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 12 Jul 2017 19:30:49 -0400 Subject: Document RNG --- engine/pinball_game/evolution_mode.asm | 4 ++-- engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm | 2 +- engine/pinball_game/evolution_mode/evolution_mode_red_field.asm | 2 +- engine/pinball_game/slot.asm | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'engine') diff --git a/engine/pinball_game/evolution_mode.asm b/engine/pinball_game/evolution_mode.asm index 226ba48..d6db1a8 100755 --- a/engine/pinball_game/evolution_mode.asm +++ b/engine/pinball_game/evolution_mode.asm @@ -443,7 +443,7 @@ InitEvolutionModeForMon: ; 0x10d1d jr nz, .asm_10d8a xor a .asm_10d8a - call Func_a21 + call RandomRange sla a ld c, a pop hl @@ -478,7 +478,7 @@ InitEvolutionModeForMon: ; 0x10d1d .asm_10dc0 push bc ld a, c - call Func_a21 + call RandomRange ld c, a ld b, $0 ld hl, wd55c 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 afcb9ea..5dac074 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm @@ -638,7 +638,7 @@ asm_210c7: Func_2111d: ; 0x2111d ld a, $11 - call Func_a21 + call RandomRange ld c, a ld b, $0 ld hl, wd566 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 5bbf336..018ea91 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm @@ -640,7 +640,7 @@ asm_20a9f: Func_20af5: ; 0x20af5 ld a, $11 - call Func_a21 + call RandomRange ld c, a ld b, $0 ld hl, wd566 diff --git a/engine/pinball_game/slot.asm b/engine/pinball_game/slot.asm index a81fc14..11998fa 100644 --- a/engine/pinball_game/slot.asm +++ b/engine/pinball_game/slot.asm @@ -269,7 +269,7 @@ SlotRewardBonusMultiplier: ; 0xefa7 SlotRewardSmallPoints: ; 0xefb2 ld a, $8 - call Func_a21 + call RandomRange ld [wCurSlotBonus], a ld b, $80 .asm_efbc @@ -308,7 +308,7 @@ SlotRewardSmallPoints: ; 0xefb2 SlotRewardBigPoints: ; 0xeff3 ld a, $8 - call Func_a21 + call RandomRange ld [wCurSlotBonus], a ld b, $80 .asm_effd @@ -417,7 +417,7 @@ BallTypeProgressionBlueField: ; 0xf0bb SlotBonusMultiplier: ; 0xf0c1 ld a, $4 - call Func_a21 + call RandomRange ld [wCurSlotBonus], a ld b, $80 .asm_f0cb -- cgit v1.2.3 From 8887222e60f6af052e1da709851254cc63e6625f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 14 Jul 2017 10:29:47 -0700 Subject: Label Bonus Stage transition stuff --- engine/pinball_game.asm | 16 ++++++++-------- engine/pinball_game/ball_init/ball_init_blue_field.asm | 4 ++-- engine/pinball_game/ball_init/ball_init_red_field.asm | 4 ++-- .../pinball_game/ball_loss/ball_loss_diglett_bonus.asm | 4 ++-- engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm | 4 ++-- engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm | 4 ++-- engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm | 4 ++-- engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm | 4 ++-- .../pinball_game/draw_sprites/draw_red_field_sprites.asm | 2 +- engine/pinball_game/load_stage_data/load_blue_field.asm | 2 +- engine/pinball_game/load_stage_data/load_red_field.asm | 2 +- .../object_collision/blue_stage_resolve_collision.asm | 6 +++--- .../object_collision/diglett_bonus_resolve_collision.asm | 2 +- .../object_collision/gengar_bonus_resolve_collision.asm | 4 ++-- .../object_collision/meowth_bonus_resolve_collision.asm | 8 ++++---- .../object_collision/mewtwo_bonus_resolve_collision.asm | 4 ++-- .../object_collision/red_stage_resolve_collision.asm | 6 +++--- .../object_collision/seel_bonus_resolve_collision.asm | 4 ++-- engine/pinball_game/slot.asm | 2 +- engine/pinball_game/stage_init/init_blue_field.asm | 6 +++--- engine/pinball_game/stage_init/init_red_field.asm | 4 ++-- engine/pinball_game/stage_init/init_stages.asm | 2 +- 22 files changed, 49 insertions(+), 49 deletions(-) (limited to 'engine') diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm index 66ff1de..466a01f 100644 --- a/engine/pinball_game.asm +++ b/engine/pinball_game.asm @@ -224,12 +224,12 @@ GameScreenFunction_EndBall: ; 0xdab2 ld a, [wGameOver] and a jp nz, TransitionToHighScoresScreen - ld a, [wd495] + ld a, [wGoingToBonusStage] and a - jr nz, .asm_dae6 - ld a, [wd496] + jr nz, .goingToBonusStage + ld a, [wReturningFromBonusStage] and a - jr nz, .asm_db28 + jr nz, .returningFromBonusStage call FadeOut ld a, [wUpdateAudioEngineUsingTimerInterrupt] and a @@ -243,7 +243,7 @@ GameScreenFunction_EndBall: ; 0xdab2 ld [wScreenState], a ret -.asm_dae6 +.goingToBonusStage ld de, $0000 call PlaySong ld bc, $0004 @@ -264,13 +264,13 @@ GameScreenFunction_EndBall: ; 0xdab2 ld a, [wNextStage] ld [wCurrentStage], a xor a - ld [wd496], a - ld [wd495], a + ld [wReturningFromBonusStage], a + ld [wGoingToBonusStage], a ld a, $0 ld [wScreenState], a ret -.asm_db28 +.returningFromBonusStage ld de, $0000 call PlaySong ld bc, $0004 diff --git a/engine/pinball_game/ball_init/ball_init_blue_field.asm b/engine/pinball_game/ball_init/ball_init_blue_field.asm index c2142e2..9728be0 100644 --- a/engine/pinball_game/ball_init/ball_init_blue_field.asm +++ b/engine/pinball_game/ball_init/ball_init_blue_field.asm @@ -1,5 +1,5 @@ InitBallBlueField: ; 0x1c08d - ld a, [wd496] + ld a, [wReturningFromBonusStage] and a jp nz, StartBallAfterBonusStageBlueField ld a, $0 @@ -78,7 +78,7 @@ StartBallAfterBonusStageBlueField: ; 0x1c129 ld [wBallYVelocity + 1], a ld [wBallXVelocity], a ld [wBallXVelocity + 1], a - ld [wd496], a + ld [wReturningFromBonusStage], a ld [wSCX], a ld [wd7be], a ld a, [wBallTypeBackup] diff --git a/engine/pinball_game/ball_init/ball_init_red_field.asm b/engine/pinball_game/ball_init/ball_init_red_field.asm index 34d94b5..c37e21c 100644 --- a/engine/pinball_game/ball_init/ball_init_red_field.asm +++ b/engine/pinball_game/ball_init/ball_init_red_field.asm @@ -1,5 +1,5 @@ InitBallRedField: ; 0x3007d - ld a, [wd496] + ld a, [wReturningFromBonusStage] and a jp nz, StartBallAfterBonusStageRedField ld a, $0 @@ -83,7 +83,7 @@ StartBallAfterBonusStageRedField: ; 0x30128 ld [wBallYVelocity + 1], a ld [wBallXVelocity], a ld [wBallXVelocity + 1], a - ld [wd496], a + ld [wReturningFromBonusStage], a ld [wSCX], a ld [wd7be], a ld a, [wBallTypeBackup] diff --git a/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm index 6827c19..b4e341f 100644 --- a/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm @@ -6,9 +6,9 @@ HandleBallLossDiglettBonus: ; 0xe056 lb de, $00, $0b call PlaySoundEffect xor a - ld [wd495], a + ld [wGoingToBonusStage], a ld a, $1 - ld [wd496], a + ld [wReturningFromBonusStage], a ld a, $2 ld [wd4c8], a xor a 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 4c37222..59bc3d3 100644 --- a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm @@ -32,9 +32,9 @@ HandleBallLossGengarBonus: ; 0xdf1a .asm_df57 xor a - ld [wd495], a + ld [wGoingToBonusStage], a ld a, $1 - ld [wd496], a + ld [wReturningFromBonusStage], a ld a, $2 ld [wd4c8], a xor a diff --git a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm index 1bc7035..05d731b 100644 --- a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm @@ -38,9 +38,9 @@ HandleBallLossMeowthBonus: ; 0xdfe2 ld [wTimeRanOut], a ld [wTimerActive], a xor a - ld [wd495], a + ld [wGoingToBonusStage], a ld a, $1 - ld [wd496], a + ld [wReturningFromBonusStage], a ld a, $2 ld [wd4c8], a xor 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 07a51f0..949f8a8 100644 --- a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm @@ -32,9 +32,9 @@ HandleBallLossMewtwoBonus: ; 0xdf7e .asm_dfbb xor a - ld [wd495], a + ld [wGoingToBonusStage], a ld a, $1 - ld [wd496], a + ld [wReturningFromBonusStage], a ld a, $2 ld [wd4c8], a xor a diff --git a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm index 59d4bd7..ee2e41a 100644 --- a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm @@ -37,9 +37,9 @@ HandleBallLossSeelBonus: ; 0xe08b xor a ld [wTimerActive], a ld [wTimerActive], a ; duplicate instruction - ld [wd495], a + ld [wGoingToBonusStage], a ld a, $1 - ld [wd496], a + ld [wReturningFromBonusStage], a ld a, $2 ld [wd4c8], a xor a 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 cc57f8d..17f1d2c 100644 --- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm @@ -102,7 +102,7 @@ DrawTimerDigit: ; 0x17627 Func_1762f: ; 0x1762f lb de, $60, $0c ld a, [wCurrentStage] - cp STAGE_BLUE_FIELD_BOTTOM + 1 + cp FIRST_BONUS_STAGE ret nc lb de, $00, $00 bit 0, a diff --git a/engine/pinball_game/load_stage_data/load_blue_field.asm b/engine/pinball_game/load_stage_data/load_blue_field.asm index de5c455..f9eb138 100644 --- a/engine/pinball_game/load_stage_data/load_blue_field.asm +++ b/engine/pinball_game/load_stage_data/load_blue_field.asm @@ -435,7 +435,7 @@ Func_1c4b6: ; 0x1c4b6 ld a, [wOpenedSlotByGetting3Pokeballs] and a jr z, .asm_1c4d2 - ld a, [wd498] + ld a, [wNextBonusStage] add $15 callba LoadBillboardTileData ret diff --git a/engine/pinball_game/load_stage_data/load_red_field.asm b/engine/pinball_game/load_stage_data/load_red_field.asm index 51a00c9..f195f92 100644 --- a/engine/pinball_game/load_stage_data/load_red_field.asm +++ b/engine/pinball_game/load_stage_data/load_red_field.asm @@ -441,7 +441,7 @@ Func_14377: ; 0x14377 ld a, [wOpenedSlotByGetting3Pokeballs] and a jr z, .asm_14393 - ld a, [wd498] + ld a, [wNextBonusStage] add $15 callba LoadBillboardTileData 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 e2ac723..8d80360 100644 --- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm @@ -2620,9 +2620,9 @@ DoSlotLogic_BlueField: ; 0x1e830 xor a ld [wBonusStageSlotRewardActive], a ld a, $1 - ld [wd495], a + ld [wGoingToBonusStage], a ld [wMoveToNextScreenState], a - ld a, [wd498] + ld a, [wNextBonusStage] ld c, a ld b, $0 ld hl, BonusStages_BlueField @@ -2726,7 +2726,7 @@ OpenSlotCave_BlueField: ; 0x1e9c0 ld a, [wOpenedSlotByGetting3Pokeballs] and a jr z, .asm_1e9dc - ld a, [wd498] + ld a, [wNextBonusStage] add $15 jr .asm_1e9e3 diff --git a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm index 738010d..bf48d71 100644 --- a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm @@ -672,7 +672,7 @@ Func_1ab30: ; 0x1ab30 call InitAnimation xor a ld [wDugrioState], a - ld [wd498], a + ld [wNextBonusStage], a ; BONUS_STAGE_ORDER_GENGAR ld a, $1 ld [wCompletedBonusStage], a call FillBottomMessageBufferWithBlackTile 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 10afcd3..0ddb3c4 100644 --- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm @@ -999,8 +999,8 @@ Func_189af: ; 0x189af ret nz ld a, $1 ld [wd6a8], a - ld a, $1 - ld [wd498], a + ld a, BONUS_STAGE_ORDER_MEWTWO + ld [wNextBonusStage], a ld a, $1 ld [wCompletedBonusStage], a call FillBottomMessageBufferWithBlackTile diff --git a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm index 85b4598..95cd4b5 100644 --- a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm @@ -188,12 +188,12 @@ ResolveMeowthBonusGameObjectCollisions: ; 0x2442a ld a, [wd712] cp $2 jr nc, .asm_24498 - ld a, [wd498] - cp $4 + ld a, [wNextBonusStage] + cp BONUS_STAGE_ORDER_SEEL ret z - ld a, $4 + ld a, BONUS_STAGE_ORDER_SEEL ld [wd712], a - ld [wd498], a + ld [wNextBonusStage], a ld a, $96 ld [wd739], a ld de, $0000 diff --git a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm index 17e0b0b..119ffa3 100644 --- a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm @@ -339,8 +339,8 @@ Func_19638: ; 0x19638 ret nz ld a, $1 ld [wd6b3], a - ld a, [wd499] - ld [wd498], a + ld a, [wInitialNextBonusStage] + ld [wNextBonusStage], a ld a, [wNumMewtwoBonusCompletions] cp $2 ; only counts up to 2. Gets reset to 0 when Mew is encountered in Catch 'Em Mode. jr z, .asm_1965e 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 7d9774e..8134d0e 100644 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -2066,9 +2066,9 @@ DoSlotLogic_RedField: ; 0x16352 xor a ld [wBonusStageSlotRewardActive], a ld a, $1 - ld [wd495], a + ld [wGoingToBonusStage], a ld [wMoveToNextScreenState], a - ld a, [wd498] + ld a, [wNextBonusStage] ld c, a ld b, $0 ld hl, BonusStages_RedField @@ -2178,7 +2178,7 @@ OpenSlotCave_RedField: ; 0x164e3 ld a, [wOpenedSlotByGetting3Pokeballs] and a jr z, .asm_164ff - ld a, [wd498] + ld a, [wNextBonusStage] add $15 jr .asm_16506 diff --git a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm index 39e8044..df40da0 100644 --- a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm @@ -7,8 +7,8 @@ ResolveSeelBonusGameObjectCollisions: ; 0x25c5a ld a, [wd794] cp $2 jr nc, .asm_25c98 - ld a, $1 - ld [wd498], a + ld a, BONUS_STAGE_ORDER_MEWTWO + ld [wNextBonusStage], a ld de, $0000 call PlaySong ld a, $1 diff --git a/engine/pinball_game/slot.asm b/engine/pinball_game/slot.asm index 11998fa..0cf52d2 100644 --- a/engine/pinball_game/slot.asm +++ b/engine/pinball_game/slot.asm @@ -219,7 +219,7 @@ Func_eef9: ; 0xeef9 cp $d ret nz push hl - ld hl, wd498 + ld hl, wNextBonusStage add [hl] pop hl ret diff --git a/engine/pinball_game/stage_init/init_blue_field.asm b/engine/pinball_game/stage_init/init_blue_field.asm index 0200f2d..ed624c5 100644 --- a/engine/pinball_game/stage_init/init_blue_field.asm +++ b/engine/pinball_game/stage_init/init_blue_field.asm @@ -30,9 +30,9 @@ InitBlueField: ; 0x1c000 ld a, $3 ld [wd49e], a ld [wd610], a - ld a, $2 - ld [wd498], a - ld [wd499], a + ld a, BONUS_STAGE_ORDER_MEOWTH + ld [wNextBonusStage], a + ld [wInitialNextBonusStage], a ld a, $80 ld [wIndicatorStates], a ld [wIndicatorStates + 3], a diff --git a/engine/pinball_game/stage_init/init_red_field.asm b/engine/pinball_game/stage_init/init_red_field.asm index a40ace1..82778c3 100644 --- a/engine/pinball_game/stage_init/init_red_field.asm +++ b/engine/pinball_game/stage_init/init_red_field.asm @@ -30,8 +30,8 @@ InitRedField: ; 0x30000 ld a, $3 ld [wd49e], a ld [wd610], a - ld [wd498], a - ld [wd499], a + ld [wNextBonusStage], a ; BONUS_STAGE_ORDER_DIGLETT + ld [wInitialNextBonusStage], a ; BONUS_STAGE_ORDER_DIGLETT ld a, $4 ld [wStageCollisionState], a ld [wd7ad], a diff --git a/engine/pinball_game/stage_init/init_stages.asm b/engine/pinball_game/stage_init/init_stages.asm index 5e26639..621a828 100644 --- a/engine/pinball_game/stage_init/init_stages.asm +++ b/engine/pinball_game/stage_init/init_stages.asm @@ -53,7 +53,7 @@ ResetDataForStageInitialization: ; 0x8388 ret .asm_8398 ld a, [wCurrentStage] - cp STAGE_BLUE_FIELD_BOTTOM + 1 + cp FIRST_BONUS_STAGE ret nc ; Check if bonus stage ld hl, wPartyMons ld bc, $0170 -- cgit v1.2.3 From 504e04e292a309ca6e9a12c0c5e3fbd8bd7bab13 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 16 Jul 2017 08:53:12 -0700 Subject: Use sHighScores label --- engine/high_scores_screen.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine') diff --git a/engine/high_scores_screen.asm b/engine/high_scores_screen.asm index 1aa3bb2..3d867c6 100644 --- a/engine/high_scores_screen.asm +++ b/engine/high_scores_screen.asm @@ -356,7 +356,7 @@ Func_ccb6: ; 0xccb6 ld de, wBlueHighScore5Id + $3 call Func_d361 ld hl, wRedHighScore1Points - ld de, $a000 + ld de, sHighScores ld bc, $0082 call SaveData ret @@ -523,7 +523,7 @@ Func_cdce: ; 0xcdce ld de, wBlueHighScore5Id + $3 call Func_d361 ld hl, wRedHighScore1Points - ld de, $a000 + ld de, sHighScores ld bc, $0082 call SaveData and a @@ -1016,7 +1016,7 @@ Func_d1d2: ; 0xd1d2 ld hl, wScreenState inc [hl] ld hl, wRedHighScore1Points - ld de, $a000 + ld de, sHighScores ld bc, $0082 call SaveData ret -- cgit v1.2.3