labeled jackpot stuff

2026-04-25 07:19:49 -05:00 · 2017-07-21 14:55:21 +01:00 · 2017-07-21 14:55:21 +01:00 · 3f2765e7cb
commit 3f2765e7cb
parent a0ee496a54
9 changed files with 49 additions and 49 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/home.asm
+++ b/home.asm
@ -3287,9 +3287,9 @@ AddBCDEToCurBufferValue: ; 0x351c
 	callba AddBigBCD6FromQueue
 	ret

-Func_3538: ; 0x3538
-; Add BCD value bcde to [wd47a].  Cap at $99999999.
-	ld hl, wd47a
+AddBCDEToJackpot: ; 0x3538
+; Add BCD value bcde to [wCurrentJackpot].  Cap at $99999999.
+	ld hl, wCurrentJackpot
 	ld a, [hl]
 	add e
 	daa
@ -3307,7 +3307,7 @@ Func_3538: ; 0x3538
 	daa
 	ld [hli], a
 	ret nc
-	ld hl, wd47a
+	ld hl, wCurrentJackpot
 	ld a, $99
 	ld [hli], a
 	ld [hli], a
@ -3315,15 +3315,15 @@ Func_3538: ; 0x3538
 	ld [hli], a
 	ret

-Retrieve8DigitBCDValueAtwd47a: ; 0x3556
-; Retrieves a 4-byte BCD value at wd47a
-	ld a, [wd47a]
+RetrieveJackpot: ; 0x3556
+; Retrieves a 4-byte BCD value at wCurrentJackpot
+	ld a, [wCurrentJackpot]
 	ld e, a
-	ld a, [wd47a + 1]
+	ld a, [wCurrentJackpot + 1]
 	ld d, a
-	ld a, [wd47a + 2]
+	ld a, [wCurrentJackpot + 2]
 	ld c, a
-	ld a, [wd47a + 3]
+	ld a, [wCurrentJackpot + 3]
 	ld b, a
 	ret

@ -3352,8 +3352,8 @@ Func_3570:
 	ret

 Func_3579: ; 0x3579
-; Delete 4-byte BCD value at wd47a
-	ld hl, wd47a
+; Delete 4-byte BCD value at wCurrentJackpot
+	ld hl, wCurrentJackpot
 	xor a
 	ld [hli], a
 	ld [hli], a
--- a/home/text.asm
+++ b/home/text.asm
@ -493,9 +493,9 @@ HandleScrollingText: ; 0x3325 activates while text is scrolling
 	ld [hl], $0 ;+0
 	ret

-Func_3357: ; 0x3357
+LoadStationaryTextAndHeader: ; 0x3357 LoadStationaryTextAndHeader
 	ld a, $1
-	ld [hli], a
+	ld [hli], a ;Enable and load StationaryText de. then load the text after it in until a $00 is loaded in
 	ld a, [de]
 	ld [hli], a
 	inc de
@ -512,12 +512,12 @@ Func_3357: ; 0x3357
 	pop af
 	ld l, a
 	ld h, wBottomMessageText / $100
-.asm_336b
+.Loop
 	ld a, [de]
 	ld [hli], a
 	inc de
 	and a
-	jr nz, .asm_336b
+	jr nz, .Loop
 	ret

 LoadScoreTextFromStack: ; 0x3372 load stationary text header DE into HL, then load 4 byte BCD score from the stack into the buffer, ending in an 0 and space
@ -700,7 +700,7 @@ UpdateBottomText: ; 0x33e3
 	call LoadOrCopyVRAMData
 	ret

-Func_3475: ; 0x3475
+MainLoopUntilTextIsClear: ; 0x3475
 	xor a
 	ld [hJoypadState], a
 	ld [hNewlyPressedButtons], a
@ -715,7 +715,7 @@ Func_3475: ; 0x3475
 	rst AdvanceFrame
 	ld a, [wBottomTextEnabled]
 	and a
-	jr nz, Func_3475 ;loops until wBottomTextEnabled is zero
+	jr nz, MainLoopUntilTextIsClear ;loops until wBottomTextEnabled is zero
 	ret

 FivePoints:       ; 34a6
--- a/text/scrolling_text.asm
+++ b/text/scrolling_text.asm
@ -74,7 +74,7 @@ JackpotText:
 	db $42, $00, $b4, $00
 	db "JACKPOT @"

-Data_2a50:
+CatchModeJackpotScoreStationaryTextHeader:
 	db $4a, $10, $b4, $00, $00, $00 ;stationarytextheader

 YouGotAText:
--- a/wram.asm
+++ b/wram.asm
@ -131,8 +131,8 @@ wd478:: ; 0xd478
 wd479:: ; 0xd479
 	ds $1

-wd47a:: ; 0xd47a
-; BCD buffer
+wCurrentJackpot:: ; 0xd47a
+; BCD buffer. holds catchem jackpot score
 	ds $4

 wBallType:: ; 0xd47e