From 3f2765e7cbf86f3c616a21ef4fa21bbf1ebfebc6 Mon Sep 17 00:00:00 2001 From: chaos-lord Date: Fri, 21 Jul 2017 14:55:21 +0100 Subject: labeled jackpot stuff --- engine/pinball_game/catchem_mode.asm | 16 ++++++++-------- .../catchem_mode/catchem_mode_blue_field.asm | 8 ++++---- .../pinball_game/catchem_mode/catchem_mode_red_field.asm | 10 +++++----- .../evolution_mode/evolution_mode_blue_field.asm | 10 +++++----- .../evolution_mode/evolution_mode_red_field.asm | 12 ++++++------ 5 files changed, 28 insertions(+), 28 deletions(-) (limited to 'engine') diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm index 2780437..a541348 100644 --- a/engine/pinball_game/catchem_mode.asm +++ b/engine/pinball_game/catchem_mode.asm @@ -766,14 +766,14 @@ CapturePokemon: ; 0x1052d ld a, [wBallCaptureAnimationFrameCounter] cp $1 ret nz - call Func_3475 + call MainLoopUntilTextIsClear ld de, $0000 call PlaySong rst AdvanceFrame lb de, $23, $29 call PlaySoundEffect - call Func_10825 - call Func_3475 + call ShowJackpotText + call MainLoopUntilTextIsClear ld a, [wNumPartyMons] and a call z, Func_10848 @@ -1156,21 +1156,21 @@ PlayLowTimeSfx: ; 0x107f8 call PlaySoundEffect ret -Func_10825: ; 0x10825 - call Retrieve8DigitBCDValueAtwd47a ;retreive somethign score related, put it on the stack +ShowJackpotText: ; 0x10825 + call RetrieveJackpot ;retreive somethign score related, put it on the stack push bc ;store data on stack to bge read in by LoadScoreTextFromStack push de call AddBCDEToCurBufferValue call FillBottomMessageBufferWithBlackTile call EnableBottomText ld hl, wStationaryText2 - ld de, Data_2a50 + ld de, CatchModeJackpotScoreStationaryTextHeader call LoadScoreTextFromStack pop de pop bc ld hl, wStationaryText1 ld de, JackpotText - call Func_3357 + call LoadStationaryTextAndHeader ret Func_10848: ; 0x10848 @@ -1184,7 +1184,7 @@ Func_10848: ; 0x10848 ld hl, wScrollingText1 ld de, PokemonCaughtSpecialBonusText call LoadScrollingText - call Func_3475 + call MainLoopUntilTextIsClear ret Func_10871: ; 0x10871 diff --git a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm index b36aa74..b6b9462 100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm @@ -134,7 +134,7 @@ Func_20394: ; 0x20394 pop bc ld hl, wStationaryText1 ld de, HitText - call Func_3357 + call LoadStationaryTextAndHeader ld a, [wNumMonHits] callba Func_10611 ld c, $2 @@ -278,18 +278,18 @@ Func_204f1: ; 0x204f1 pop bc ld hl, wStationaryText1 ld de, FlippedText - call Func_3357 + call LoadStationaryTextAndHeader .asm_2055e ld bc, $0001 ld de, $0000 - call Func_3538 + call AddBCDEToJackpot scf ret Func_20569: ; 0x20569 ld bc, $0000 ld de, $1000 - call Func_3538 + call AddBCDEToJackpot ret Func_20573: ; 0x20573 diff --git a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm index cd1cfdc..e02f160 100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm @@ -132,7 +132,7 @@ Func_200d3: ; 0x200d3 pop bc ld hl, wStationaryText1 ld de, HitText - call Func_3357 + call LoadStationaryTextAndHeader ld a, [wNumMonHits] callba Func_10611 ld c, $2 @@ -276,22 +276,22 @@ Func_20230: ; 0x20230 pop bc ld hl, wStationaryText1 ld de, FlippedText - call Func_3357 + call LoadStationaryTextAndHeader .asm_2029d ld bc, $0001 ld de, $0000 - call Func_3538 + call AddBCDEToJackpot scf ret Func_202a8: ; 0x202a8 ld bc, $0000 ld de, $1000 - call Func_3538 + call AddBCDEToJackpot ret Func_202b2: ; 0x202b2 ld bc, $0005 ld de, $0000 - call Func_3538 + call AddBCDEToJackpot ret 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 e5a54e9..0e4ba19 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm @@ -265,7 +265,7 @@ Func_20da0: ; 0x20da0 Func_20e34: ; 0x20e34 ld bc, $0001 ld de, $5000 - call Func_3538 + call AddBCDEToJackpot ld a, [wd551] and a jr nz, .asm_20e5c @@ -430,7 +430,7 @@ Func_20f2a: ; 0x20f2a Func_20f4b: ; 0x20f4b ld bc, $0000 ld de, $1500 - call Func_3538 + call AddBCDEToJackpot ld a, [wd551] and a jr nz, .asm_20f73 @@ -715,14 +715,14 @@ Func_2112a: ; 0x2112a call Func_8e1 .asm_211a8 callba Func_10e0a - call Func_3475 + call MainLoopUntilTextIsClear ld de, $0000 call PlaySong rst AdvanceFrame lb de, $2d, $26 call PlaySoundEffect - callba Func_10825 - call Func_3475 + callba ShowJackpotText + call MainLoopUntilTextIsClear ld a, $1 ld [wd54d], a 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 60bba51..08278dc 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm @@ -268,7 +268,7 @@ Func_2077b: ; 0x2077b Func_2080f: ; 0x2080f ld bc, $0001 ld de, $5000 - call Func_3538 + call AddBCDEToJackpot ld a, [wd551] and a jr nz, .asm_20837 @@ -311,7 +311,7 @@ Func_20839: ; 0x20839 Func_2085a: ; 0x2085a ld bc, $0007 ld de, $5000 - call Func_3538 + call AddBCDEToJackpot ld a, [wd551] and a jr nz, .asm_20885 @@ -455,7 +455,7 @@ Func_2092c: ; 0x2092c Func_2094d: ; 0x2094d ld bc, $0000 ld de, $1500 - call Func_3538 + call AddBCDEToJackpot ld a, [wd551] and a jr nz, .asm_20975 @@ -717,14 +717,14 @@ Func_20b02: ; 0x20b02 call Func_8e1 .asm_20b80 callba Func_10e0a - call Func_3475 + call MainLoopUntilTextIsClear ld de, $0000 call PlaySong rst AdvanceFrame lb de, $2d, $26 call PlaySoundEffect - callba Func_10825 - call Func_3475 + callba ShowJackpotText + call MainLoopUntilTextIsClear ld a, $1 ld [wd54d], a scf -- cgit v1.2.3