Leahnaya/poketcg2
1
0
Fork 0
mirror of https://github.com/pret/poketcg2.git synced 2026-04-25 07:29:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Relabel Challenge Cup/Machine pool buffer

Browse Source
This commit is contained in:
earthoul 2026-01-10 21:47:59 +09:00
parent 88b8839218
commit b49d2e2b06
No known key found for this signature in database
GPG Key ID: 9049439C902677E4
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/engine/bank03.asm
View File

@ -5249,7 +5249,7 @@ Func_ef40:
or a
jr nz, .asm_ef54
ld a, $31
ld [wRemainingIntroCards], a
ld [wNumRandomDuelists], a
ld a, LOW($51ed)
ld [wFilteredListPtr], a
ld a, HIGH($51ed)
@ -5257,7 +5257,7 @@ Func_ef40:
jr .asm_ef63
.asm_ef54
ld a, $25
ld [wRemainingIntroCards], a
ld [wNumRandomDuelists], a
ld a, LOW($524f)
ld [wFilteredListPtr], a
ld a, HIGH($524f)
@ -5305,7 +5305,7 @@ Func_ef97:
ld l, a
ld a, [wFilteredListPtr + 1]
ld h, a
ld a, [wRemainingIntroCards]
ld a, [wNumRandomDuelists]
call Random
sla a
add_hl_a

6
src/engine/bank11.asm
View File

@ -307,7 +307,7 @@ SetChallengeCupOpponents:
jr nz, .gr_cup
; tcg cup
ld a, NUM_TCG_CHALLENGE_CUP_OPPONENT_POOL
ld [wNumChallengeCupOpponents], a
ld [wNumRandomDuelists], a
ld a, LOW(TCGChallengeCupOpponents)
ld [wFilteredListPtr], a
ld a, HIGH(TCGChallengeCupOpponents)
@ -317,7 +317,7 @@ SetChallengeCupOpponents:
jr .get_cup_index
.gr_cup
ld a, NUM_GR_CHALLENGE_CUP_OPPONENT_POOL
ld [wNumChallengeCupOpponents], a
ld [wNumRandomDuelists], a
ld a, LOW(GRChallengeCupOpponents)
ld [wFilteredListPtr], a
ld a, HIGH(GRChallengeCupOpponents)
@ -387,7 +387,7 @@ SetChallengeCupOpponents:
ld l, a
ld a, [wFilteredListPtr + 1]
ld h, a
ld a, [wNumChallengeCupOpponents]
ld a, [wNumRandomDuelists]
call Random
sla a
sla a

3
src/wram.asm
View File

@ -2319,7 +2319,8 @@ wFilteredListPtr:: ; d575
; TODO: is this really union?
UNION
wNumChallengeCupOpponents:: ; d577
; for challenge cups and challenge machines
wNumRandomDuelists:: ; d577
ds $1
wChallengeCupIndex:: ; d578