Leahnaya/poketcg2
1
0
Fork 0
mirror of https://github.com/pret/poketcg2.git synced 2026-10-01 21:47:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor Challenge Cups

Browse Source
This commit is contained in:
earthoul
2026-01-09 19:49:55 +09:00
parent 51636a1446
commit 4ac919eaa7
16 changed files with 1536 additions and 1440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/constants/challenge_cup_constants.asm
View File

@@ -1,3 +1,41 @@
; challenge cup constants
const_def
const TCG_CHALLENGE_CUP ; 0
const GR_CHALLENGE_CUP ; 1
; wChallengeCupIndex constants
; actual titles:
; TCG: "Challenge Cup" (1, 2, 3)
; GR: "Team GR Cup" (1, 2), "King Cup" (3)
const_def
const CHALLENGE_CUP_1 ; 0
const CHALLENGE_CUP_2 ; 1
const CHALLENGE_CUP_3 ; 2
; VAR_*_CHALLENGE_CUP_STATE constants
; cup 1 and 2: limited time windows
; cup 3: post-game
const_def
const CHALLENGE_CUP_DEAD ; 0
const CHALLENGE_CUP_1_START ; 1
const CHALLENGE_CUP_1_END ; 2
const CHALLENGE_CUP_2_START ; 3
const CHALLENGE_CUP_2_END ; 4
const CHALLENGE_CUP_3_UNLOCKED ; 5
const CHALLENGE_CUP_3_START ; 6
; challenge cup rounds
DEF NUM_CHALLENGE_CUP_ROUNDS EQU 3
; VAR_*_CHALLENGE_CUP_RESULT constants
const_def
const CHALLENGE_CUP_RESULT_NONE ; 0
const CHALLENGE_CUP_RESULT_WON ; 1
const CHALLENGE_CUP_RESULT_LOST ; 2
; challenge cup win threshold for coin prizes
DEF NUM_CHALLENGE_CUP_WIN_THRESHOLD EQU 10
; cup opponents
const_def
const GRANDMASTERCUP_GENE ; 0
@@ -17,7 +55,7 @@ DEF NUM_GRANDMASTERCUP_OPPONENTS EQU NUM_GRANDMASTERCUP_DUELISTS - 1 ; 7
DEF NUM_TCG_CHALLENGE_CUP_OPPONENT_POOL EQU 44
DEF NUM_GR_CHALLENGE_CUP_OPPONENT_POOL EQU 27
; cup prizes
; cup prize cards
DEF NUM_GRANDMASTERCUP_PRIZE_POOL EQU 37
const_def

126
src/constants/var_constants.asm
View File

@@ -1,64 +1,64 @@
const_def
const VAR_00 ; $00
const VAR_01 ; $01
const VAR_02 ; $02
const VAR_03 ; $03
const VAR_TIMES_MET_RONALD ; $04
const VAR_05 ; $05
const VAR_06 ; $06
const VAR_07 ; $07
const VAR_08 ; $08
const VAR_09 ; $09
const VAR_0A ; $0a
const VAR_0B ; $0b
const VAR_0C ; $0c
const VAR_0D ; $0d
const VAR_0E ; $0e
const VAR_0F ; $0f
const VAR_GRANDMASTERCUP_PRIZE_INDEX_0 ; $10
const VAR_GRANDMASTERCUP_PRIZE_INDEX_1 ; $11
const VAR_GRANDMASTERCUP_PRIZE_INDEX_2 ; $12
const VAR_GRANDMASTERCUP_PRIZE_INDEX_3 ; $13
const VAR_GRANDMASTERCUP_OPPONENT_DECK_0 ; $14
const VAR_GRANDMASTERCUP_OPPONENT_DECK_1 ; $15
const VAR_GRANDMASTERCUP_OPPONENT_DECK_2 ; $16
const VAR_GRANDMASTERCUP_OPPONENT_DECK_3 ; $17
const VAR_GRANDMASTERCUP_OPPONENT_DECK_4 ; $18
const VAR_GRANDMASTERCUP_OPPONENT_DECK_5 ; $19
const VAR_GRANDMASTERCUP_OPPONENT_DECK_6 ; $1a
const VAR_1B ; $1b
const VAR_1C ; $1c
const VAR_1D ; $1d
const VAR_1E ; $1e
const VAR_1F ; $1f
const VAR_20 ; $20
const VAR_21 ; $21
const VAR_IMAKUNI_BLACK_WIN_COUNT ; $22
const VAR_23 ; $23
const VAR_24 ; $24
const VAR_25 ; $25
const VAR_26 ; $26
const VAR_27 ; $27
const VAR_28 ; $28
const VAR_TCG_CHALLENGE_CUP_PRIZE_INDEX ; $29
const VAR_2A ; $2a
const VAR_2B ; $2b
const VAR_2C ; $2c
const VAR_2D ; $2d
const VAR_2E ; $2e
const VAR_2F ; $2f
const VAR_30 ; $30
const VAR_GR_CHALLENGE_CUP_PRIZE_INDEX ; $31
const VAR_32 ; $32
const VAR_33 ; $33
const VAR_34 ; $34
const VAR_35 ; $35
const VAR_36 ; $36
const VAR_37 ; $37
const VAR_38 ; $38
const VAR_39 ; $39
const VAR_CARD_DUNGEON_PROGRESS ; $3a
const VAR_3B ; $3b: AARON_STEP_*; Fighting Fort
const VAR_NPC_DECK_ID ; $3c
const VAR_DUEL_START_THEME ; $3d
const VAR_3E ; $3e
const VAR_00 ; $00
const VAR_01 ; $01
const VAR_02 ; $02
const VAR_03 ; $03
const VAR_TIMES_MET_RONALD ; $04
const VAR_05 ; $05
const VAR_06 ; $06
const VAR_07 ; $07
const VAR_08 ; $08
const VAR_09 ; $09
const VAR_0A ; $0a
const VAR_0B ; $0b
const VAR_0C ; $0c
const VAR_0D ; $0d
const VAR_0E ; $0e
const VAR_0F ; $0f
const VAR_GRANDMASTERCUP_PRIZE_INDEX_0 ; $10
const VAR_GRANDMASTERCUP_PRIZE_INDEX_1 ; $11
const VAR_GRANDMASTERCUP_PRIZE_INDEX_2 ; $12
const VAR_GRANDMASTERCUP_PRIZE_INDEX_3 ; $13
const VAR_GRANDMASTERCUP_OPPONENT_DECK_0 ; $14
const VAR_GRANDMASTERCUP_OPPONENT_DECK_1 ; $15
const VAR_GRANDMASTERCUP_OPPONENT_DECK_2 ; $16
const VAR_GRANDMASTERCUP_OPPONENT_DECK_3 ; $17
const VAR_GRANDMASTERCUP_OPPONENT_DECK_4 ; $18
const VAR_GRANDMASTERCUP_OPPONENT_DECK_5 ; $19
const VAR_GRANDMASTERCUP_OPPONENT_DECK_6 ; $1a
const VAR_1B ; $1b
const VAR_1C ; $1c
const VAR_1D ; $1d
const VAR_1E ; $1e
const VAR_1F ; $1f
const VAR_20 ; $20
const VAR_21 ; $21
const VAR_IMAKUNI_BLACK_WIN_COUNT ; $22
const VAR_23 ; $23
const VAR_24 ; $24
const VAR_25 ; $25
const VAR_26 ; $26
const VAR_27 ; $27
const VAR_TCG_CHALLENGE_CUP_STATE ; $28
const VAR_TCG_CHALLENGE_CUP_PRIZE_INDEX ; $29
const VAR_TIMES_WON_TCG_CHALLENGE_CUP ; $2a
const VAR_TCG_CHALLENGE_CUP_RESULT ; $2b
const VAR_CHALLENGECUP_CURRENT_ROUND ; $2c
const VAR_CHALLENGECUP_ROUND1_OPPONENT_DECK_ID ; $2d
const VAR_CHALLENGECUP_ROUND2_OPPONENT_DECK_ID ; $2e
const VAR_CHALLENGECUP_ROUND3_OPPONENT_DECK_ID ; $2f
const VAR_GR_CHALLENGE_CUP_STATE ; $30
const VAR_GR_CHALLENGE_CUP_PRIZE_INDEX ; $31
const VAR_TIMES_WON_GR_CHALLENGE_CUP ; $32
const VAR_GR_CHALLENGE_CUP_RESULT ; $33
const VAR_34 ; $34
const VAR_35 ; $35
const VAR_36 ; $36
const VAR_37 ; $37
const VAR_38 ; $38
const VAR_39 ; $39
const VAR_CARD_DUNGEON_PROGRESS ; $3a
const VAR_3B ; $3b: AARON_STEP_*; Fighting Fort
const VAR_NPC_DECK_ID ; $3c
const VAR_DUEL_START_THEME ; $3d
const VAR_3E ; $3e

3
src/data/challenge_cup_opponents.asm
View File

@@ -1,4 +1,5 @@
; deck id, bitmask 0/1/2
; deck id and bitmask cup1, 2, 3 for SetChallengeCupOpponents
TCGChallengeCupOpponents:
db ROLLING_STONE_DECK_ID, %111, %011, %011
db GREAT_EARTHQUAKE_DECK_ID, %111, %011, %011

2
src/data/grand_master_cup.asm
View File

@@ -1,5 +1,5 @@
; deck id and bitmask for SetGrandMasterCupOpponents
GrandMasterCupOpps:
GrandMasterCupOpponents:
db EVEN3_YEARS_ON_A_ROCK_DECK_ID, %01111111 ; GRANDMASTERCUP_GENE
db RAGING_BILLOW_OF_FISTS_DECK_ID, %01111111 ; GRANDMASTERCUP_MITCH
db MAX_ENERGY_DECK_ID, %01111111 ; GRANDMASTERCUP_NIKKI

68
src/engine/bank03.asm
View File

@@ -598,29 +598,29 @@ Func_c3d4:
ret
Func_c439:
ld a, VAR_28
ld a, VAR_TCG_CHALLENGE_CUP_STATE
call GetVarValue
cp $05
cp CHALLENGE_CUP_3_UNLOCKED
jr c, .skip
ld a, [wCurIsland]
cp TCG_ISLAND
jr nz, .asm_c450
jr nz, .determine
ld a, [wCurOWLocation]
cp OWMAP_TCG_CHALLENGE_HALL
jr z, .skip
.asm_c450
ld a, VAR_28
ld c, $05
.determine
ld a, VAR_TCG_CHALLENGE_CUP_STATE
ld c, CHALLENGE_CUP_3_UNLOCKED
call SetVarValue
ld a, $04
ld a, 4
call Random
or a
jr nz, .skip
; 1/4 chance
ld a, VAR_28
ld c, $06
ld a, VAR_TCG_CHALLENGE_CUP_STATE
ld c, CHALLENGE_CUP_3_START
call SetVarValue
ld a, VAR_2B
ld a, VAR_TCG_CHALLENGE_CUP_RESULT
call ZeroOutVarValue
ld a, NUM_TCG_CHALLENGE_CUP_PRIZE_POOL
call Random
@@ -631,36 +631,36 @@ Func_c439:
ret
Func_c477:
ld a, VAR_30
ld a, VAR_GR_CHALLENGE_CUP_STATE
call GetVarValue
cp $05
jr c, .asm_c4b4
cp CHALLENGE_CUP_3_UNLOCKED
jr c, .skip
ld a, [wCurIsland]
cp GR_ISLAND
jr nz, .asm_c48e
jr nz, .determine
ld a, [wCurOWLocation]
cp OWMAP_GR_CHALLENGE_HALL
jr z, .asm_c4b4
.asm_c48e
ld a, VAR_30
ld c, $05
jr z, .skip
.determine
ld a, VAR_GR_CHALLENGE_CUP_STATE
ld c, CHALLENGE_CUP_3_UNLOCKED
call SetVarValue
ld a, $05
ld a, 5
call Random
or a
jr nz, .asm_c4b4
jr nz, .skip
; 1/5 chance
ld a, VAR_30
ld c, $06
ld a, VAR_GR_CHALLENGE_CUP_STATE
ld c, CHALLENGE_CUP_3_START
call SetVarValue
ld a, VAR_33
ld a, VAR_GR_CHALLENGE_CUP_RESULT
call ZeroOutVarValue
ld a, NUM_GR_CHALLENGE_CUP_PRIZE_POOL
call Random
ld c, a
ld a, VAR_GR_CHALLENGE_CUP_PRIZE_INDEX
call SetVarValue
.asm_c4b4
.skip
ret
; load the NPC duelist header corresponding to register a into wCurrentNPCDuelistData
@@ -2184,18 +2184,18 @@ GeneralVarMasks:
db $1a, %00001111 ; VAR_25
db $1a, %11110000 ; VAR_26
db $1b, %00001111 ; VAR_27
db $1b, %01110000 ; VAR_28
db $1b, %01110000 ; VAR_TCG_CHALLENGE_CUP_STATE
db $1c, %00011111 ; VAR_TCG_CHALLENGE_CUP_PRIZE_INDEX
db $1d, %00001111 ; VAR_2A
db $1d, %00110000 ; VAR_2B
db $1d, %11000000 ; VAR_2C
db $1e, %11111111 ; VAR_2D
db $1f, %11111111 ; VAR_2E
db $20, %11111111 ; VAR_2F
db $21, %00000111 ; VAR_30
db $1d, %00001111 ; VAR_TIMES_WON_TCG_CHALLENGE_CUP
db $1d, %00110000 ; VAR_TCG_CHALLENGE_CUP_RESULT
db $1d, %11000000 ; VAR_CHALLENGECUP_CURRENT_ROUND
db $1e, %11111111 ; VAR_CHALLENGECUP_ROUND1_OPPONENT_DECK_ID
db $1f, %11111111 ; VAR_CHALLENGECUP_ROUND2_OPPONENT_DECK_ID
db $20, %11111111 ; VAR_CHALLENGECUP_ROUND3_OPPONENT_DECK_ID
db $21, %00000111 ; VAR_GR_CHALLENGE_CUP_STATE
db $21, %11111000 ; VAR_GR_CHALLENGE_CUP_PRIZE_INDEX
db $22, %00001111 ; VAR_32
db $22, %00110000 ; VAR_33
db $22, %00001111 ; VAR_TIMES_WON_GR_CHALLENGE_CUP
db $22, %00110000 ; VAR_GR_CHALLENGE_CUP_RESULT
db $23, %00000111 ; VAR_34
db $24, %11111111 ; VAR_35
db $25, %11111111 ; VAR_36

146
src/engine/bank0c.asm
View File

@@ -1230,7 +1230,7 @@ GrChallengeHallEntrance_NPCs:
db $ff
GrChallengeHallEntrance_NPCInteractions:
npc_script NPC_GR_CLERK_CHALLENGE_HALL_ENTRANCE, Func_314a1
npc_script NPC_GR_CLERK_CHALLENGE_HALL_ENTRANCE, Script_GRChallengeHallEntranceGRClerk
db $ff
GrChallengeHallEntrance_MapScripts:
@@ -1247,18 +1247,18 @@ Func_31426:
ret
Func_3142d:
ld a, VAR_30
ld a, VAR_GR_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $01
jr z, .asm_3143f
cp $03
jr z, .asm_3143f
cp $06
jr nz, .asm_31444
.asm_3143f
cp CHALLENGE_CUP_1_START
jr z, .active
cp CHALLENGE_CUP_2_START
jr z, .active
cp CHALLENGE_CUP_3_START
jr nz, .inactive
.active
ld a, MUSIC_GR_CHALLENGE_CUP
ld [wNextMusic], a
.asm_31444
.inactive
scf
ccf
ret
@@ -1266,38 +1266,40 @@ Func_3142d:
Func_31447:
ld a, [wTempPrevMap]
cp OVERWORLD_MAP_GR
jr nz, .asm_3148e
ld a, VAR_30
jr nz, .done
ld a, VAR_GR_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $01
jr z, .asm_31460
cp $03
jr z, .asm_31460
cp $06
jr nz, .asm_3148e
.asm_31460
ld a, VAR_33
cp CHALLENGE_CUP_1_START
jr z, .active
cp CHALLENGE_CUP_2_START
jr z, .active
cp CHALLENGE_CUP_3_START
jr nz, .done
.active
ld a, VAR_GR_CHALLENGE_CUP_RESULT
farcall GetVarValue
cp $01
cp CHALLENGE_CUP_RESULT_WON
push af
ld a, VAR_33
ld a, VAR_GR_CHALLENGE_CUP_RESULT
farcall ZeroOutVarValue
pop af
jr nz, .asm_3148e
ld a, VAR_30
jr nz, .done
ld a, VAR_GR_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $06
jr z, .asm_31486
cp CHALLENGE_CUP_3_START
jr z, .adjust
inc a
ld c, a
ld a, VAR_30
ld a, VAR_GR_CHALLENGE_CUP_STATE
farcall SetVarValue
jr .asm_3148e
.asm_31486
ld a, VAR_30
ld c, $05
jr .done
; keep the state var < 7
; verbose: dec a between inc a :: ld c, a above should suffice
.adjust
ld a, VAR_GR_CHALLENGE_CUP_STATE
ld c, CHALLENGE_CUP_3_UNLOCKED
farcall SetVarValue
.asm_3148e
.done
scf
ret
@@ -1314,7 +1316,7 @@ Func_31499:
scf
ret
Func_314a1:
Script_GRChallengeHallEntranceGRClerk:
ld a, NPC_GR_CLERK_CHALLENGE_HALL_ENTRANCE
ld [wScriptNPC], a
ldtx hl, DialogReceptionistText
@@ -1325,38 +1327,38 @@ Func_314a1:
xor a
start_script
start_dialog
get_var VAR_33
compare_loaded_var $00
script_jump_if_b0z .ows_314f8
get_var VAR_30
compare_loaded_var $05
script_jump_if_b0nz .ows_314ec
script_jump_if_b1z .ows_314f2
compare_loaded_var $03
script_jump_if_b0nz .ows_314e0
script_jump_if_b1z .ows_314e6
compare_loaded_var $01
script_jump_if_b0nz .ows_314da
print_npc_text Text0e2b
script_jump .ows_314fb
.ows_314da
print_npc_text Text0e2c
script_jump .ows_314fb
.ows_314e0
print_npc_text Text0e2d
script_jump .ows_314fb
.ows_314e6
print_npc_text Text0e2e
script_jump .ows_314fb
.ows_314ec
print_npc_text Text0e2f
script_jump .ows_314fb
.ows_314f2
print_npc_text Text0e30
script_jump .ows_314fb
.ows_314f8
print_npc_text Text0e31
.ows_314fb
get_var VAR_GR_CHALLENGE_CUP_RESULT
compare_loaded_var CHALLENGE_CUP_RESULT_NONE
script_jump_if_b0z .gr_cup_played
get_var VAR_GR_CHALLENGE_CUP_STATE
compare_loaded_var CHALLENGE_CUP_3_UNLOCKED
script_jump_if_b0nz .gr_cup3_inactive
script_jump_if_b1z .gr_cup3_active
compare_loaded_var CHALLENGE_CUP_2_START
script_jump_if_b0nz .gr_cup2_active
script_jump_if_b1z .gr_cup2_inactive
compare_loaded_var CHALLENGE_CUP_1_START
script_jump_if_b0nz .gr_cup1_active
print_npc_text GRChallengeHallEntranceClerkGRCup1InactiveText
script_jump .done
.gr_cup1_active
print_npc_text GRChallengeHallEntranceClerkGRCup1ActiveText
script_jump .done
.gr_cup2_active
print_npc_text GRChallengeHallEntranceClerkGRCup2ActiveText
script_jump .done
.gr_cup2_inactive
print_npc_text GRChallengeHallEntranceClerkGRCup2InactiveText
script_jump .done
.gr_cup3_inactive
print_npc_text GRChallengeHallEntranceClerkGRCup3InactiveText
script_jump .done
.gr_cup3_active
print_npc_text GRChallengeHallEntranceClerkGRCup3ActiveText
script_jump .done
.gr_cup_played
print_npc_text GRChallengeHallEntranceClerkGRCupPlayedText
.done
end_dialog
end_script
ret
@@ -3167,7 +3169,7 @@ Func_322a1:
reset_event EVENT_TALKED_TO_KEN
reset_event EVENT_TALKED_TO_ADAM
reset_event EVENT_TALKED_TO_ROBERT
set_var VAR_28, $02
set_var VAR_TCG_CHALLENGE_CUP_STATE, CHALLENGE_CUP_1_END
print_npc_text Text11c2
end_dialog
get_player_direction
@@ -3445,8 +3447,8 @@ Func_324e1:
check_event EVENT_SET_UNTIL_MAP_RELOAD_2
script_jump_if_b0nz .ows_32503
set_event EVENT_BEAT_CATHERINE
set_var VAR_30, $01
set_var VAR_33, $00
set_var VAR_GR_CHALLENGE_CUP_STATE, CHALLENGE_CUP_1_START
set_var VAR_GR_CHALLENGE_CUP_RESULT, CHALLENGE_CUP_RESULT_NONE
send_mail $07
print_npc_text Text11d6
give_booster_packs BoosterList_cd63
@@ -4808,8 +4810,8 @@ Func_32efd:
check_event EVENT_SET_UNTIL_MAP_RELOAD_2
script_jump_if_b0nz .ows_32f21
set_event EVENT_BEAT_HIDERO
set_var VAR_28, $03
set_var VAR_2B, $00
set_var VAR_TCG_CHALLENGE_CUP_STATE, CHALLENGE_CUP_2_START
set_var VAR_TCG_CHALLENGE_CUP_RESULT, CHALLENGE_CUP_RESULT_NONE
script_call .ows_32f52
print_npc_text Text0c8e
give_booster_packs BoosterList_cd75
@@ -4845,7 +4847,7 @@ Func_32efd:
.ows_32f52
check_event EVENT_GOT_PSYDUCK_COIN
script_jump_if_b0nz .ows_32f5a
set_var VAR_30, $02
set_var VAR_GR_CHALLENGE_CUP_STATE, CHALLENGE_CUP_1_END
.ows_32f5a
script_ret
@@ -5377,7 +5379,7 @@ Func_332ff:
.ows_3334e
check_event EVENT_GOT_MAGMAR_COIN
script_jump_if_b0nz .ows_33356
set_var VAR_30, $02
set_var VAR_GR_CHALLENGE_CUP_STATE, CHALLENGE_CUP_1_END
.ows_33356
script_ret

88
src/engine/bank0d.asm
View File

@@ -267,8 +267,8 @@ Func_341f7:
wait_for_fade
send_mail $06
set_var VAR_TIMES_MET_RONALD, $04
set_var VAR_28, $01
set_var VAR_2B, $00
set_var VAR_TCG_CHALLENGE_CUP_STATE, CHALLENGE_CUP_1_START
set_var VAR_TCG_CHALLENGE_CUP_RESULT, CHALLENGE_CUP_RESULT_NONE
get_var VAR_21
compare_loaded_var $00
script_jump_if_b0nz .ows_3421c
@@ -2399,7 +2399,7 @@ GrChallengeHallLobby_StepEvents:
GrChallengeHallLobby_NPCs:
npc NPC_GR_CHALLENGE_HALL_GR_GRANNY, 3, 5, WEST, NULL
npc NPC_CUP_HOST, 2, 10, NORTH, Func_353ce
npc NPC_CUP_HOST, 2, 10, NORTH, GrChallengeHallLobby_DisappearDuringGRCups
npc NPC_GR_CHALLENGE_HALL_GR_CHAP, 8, 9, EAST, Func_35444
npc NPC_GR_CHALLENGE_HALL_GR_WOMAN, 12, 8, WEST, NULL
npc NPC_GR_CLERK_BATTLE_CENTER, 5, 2, SOUTH, NULL
@@ -2408,7 +2408,7 @@ GrChallengeHallLobby_NPCs:
GrChallengeHallLobby_NPCInteractions:
npc_script NPC_GR_CHALLENGE_HALL_GR_GRANNY, Func_35342
npc_script NPC_CUP_HOST, Func_353a8
npc_script NPC_CUP_HOST, Script_CupHostGRLobby
npc_script NPC_GR_CHALLENGE_HALL_GR_WOMAN, Func_35451
npc_script NPC_GR_CHALLENGE_HALL_GR_CHAP, Func_353e5
db $ff
@@ -2428,18 +2428,18 @@ GrChallengeHallLobby_MapScripts:
db $ff
Func_35308:
ld a, VAR_30
ld a, VAR_GR_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $01
jr z, .asm_3531a
cp $03
jr z, .asm_3531a
cp $06
jr nz, .asm_3531f
.asm_3531a
cp CHALLENGE_CUP_1_START
jr z, .active
cp CHALLENGE_CUP_2_START
jr z, .active
cp CHALLENGE_CUP_3_START
jr nz, .inactive
.active
ld a, MUSIC_GR_CHALLENGE_CUP
ld [wNextMusic], a
.asm_3531f
.inactive
scf
ccf
ret
@@ -2515,7 +2515,7 @@ Func_35342:
end_script
ret
Func_353a8:
Script_CupHostGRLobby:
ld a, NPC_CUP_HOST
ld [wScriptNPC], a
ldtx hl, DialogCupHostText
@@ -2527,29 +2527,29 @@ Func_353a8:
start_script
start_dialog
check_event EVENT_MASONS_LAB_CHALLENGE_MACHINE_STATE
script_jump_if_b0z .ows_353c8
print_npc_text Text0e3a
script_jump .ows_353cb
.ows_353c8
print_npc_text Text0e3b
.ows_353cb
script_jump_if_b0z .gr_cup3_unlocked
print_npc_text GRChallengeHallLobbyCupHostStandbyText
script_jump .done
.gr_cup3_unlocked
print_npc_text GRChallengeHallLobbyCupHostStandbyGRCup3Text
.done
end_dialog
end_script
ret
Func_353ce:
ld a, VAR_30
GrChallengeHallLobby_DisappearDuringGRCups:
ld a, VAR_GR_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $01
jr z, .asm_353e3
cp $03
jr z, .asm_353e3
cp $06
jr z, .asm_353e3
cp CHALLENGE_CUP_1_START
jr z, .disappear
cp CHALLENGE_CUP_2_START
jr z, .disappear
cp CHALLENGE_CUP_3_START
jr z, .disappear
scf
ccf
ret
.asm_353e3
.disappear
scf
ret
@@ -2566,11 +2566,11 @@ Func_353e5:
start_dialog
check_event EVENT_MASONS_LAB_CHALLENGE_MACHINE_STATE
script_jump_if_b0z .ows_35423
get_var VAR_30
compare_loaded_var $03
get_var VAR_GR_CHALLENGE_CUP_STATE
compare_loaded_var CHALLENGE_CUP_2_START
script_jump_if_b0nz .ows_35417
script_jump_if_b1z .ows_3541d
compare_loaded_var $01
compare_loaded_var CHALLENGE_CUP_1_START
script_jump_if_b0nz .ows_35417
script_jump_if_b1z .ows_3541d
print_npc_text Text0e3c
@@ -2608,11 +2608,11 @@ Func_353e5:
Func_35444:
ld a, EVENT_94
farcall GetEventValue
jr nz, .asm_3544f
jr nz, .disappear
scf
ccf
ret
.asm_3544f
.disappear
scf
ret
@@ -2627,17 +2627,17 @@ Func_35451:
xor a
start_script
start_dialog
get_var VAR_33
compare_loaded_var $02
get_var VAR_GR_CHALLENGE_CUP_RESULT
compare_loaded_var CHALLENGE_CUP_RESULT_LOST
script_jump_if_b0nz .ows_35490
get_var VAR_30
compare_loaded_var $05
get_var VAR_GR_CHALLENGE_CUP_STATE
compare_loaded_var CHALLENGE_CUP_3_UNLOCKED
script_jump_if_b0nz .ows_35496
script_jump_if_b1z .ows_3549c
compare_loaded_var $03
compare_loaded_var CHALLENGE_CUP_2_START
script_jump_if_b0nz .ows_3548a
script_jump_if_b1z .ows_35484
compare_loaded_var $01
compare_loaded_var CHALLENGE_CUP_1_START
script_jump_if_b0nz .ows_3548a
.ows_35484
print_npc_text Text0e40
@@ -3580,8 +3580,8 @@ Func_35b82:
check_event EVENT_SET_UNTIL_MAP_RELOAD_2
script_jump_if_b0nz .ows_35ba2
set_event EVENT_BEAT_KAMIYA
set_var VAR_30, $03
set_var VAR_33, $00
set_var VAR_GR_CHALLENGE_CUP_STATE, CHALLENGE_CUP_2_START
set_var VAR_GR_CHALLENGE_CUP_RESULT, CHALLENGE_CUP_RESULT_NONE
print_npc_text Text0c20
give_booster_packs BoosterList_cd8e
script_jump .ows_35bbf
@@ -5865,7 +5865,7 @@ Script_36d75:
script_jump .ows_36d87
.ows_36d87
set_event EVENT_FREED_ROD
set_var VAR_28, $04
set_var VAR_TCG_CHALLENGE_CUP_STATE, CHALLENGE_CUP_2_END
set_active_npc_direction EAST
set_npc_direction NPC_ROD, WEST
start_dialog
@@ -6014,7 +6014,7 @@ Func_36e9b:
check_event EVENT_SET_UNTIL_MAP_RELOAD_2
script_jump_if_b0nz .ows_36eba
set_event EVENT_BEAT_MAMI
set_var VAR_30, $04
set_var VAR_GR_CHALLENGE_CUP_STATE, CHALLENGE_CUP_2_END
reset_event EVENT_TALKED_TO_RYOKO
print_npc_text Text112d
give_booster_packs BoosterList_cda2

270
src/engine/bank0f.asm
View File

@@ -2277,7 +2277,7 @@ TcgChallengeHallEntrance_NPCs:
db $ff
TcgChallengeHallEntrance_NPCInteractions:
npc_script NPC_CLERK_TCG_CHALLENGE_HALL_ENTRANCE, Func_3d271
npc_script NPC_CLERK_TCG_CHALLENGE_HALL_ENTRANCE, Script_TCGChallengeHallEntranceClerk
db $ff
TcgChallengeHallEntrance_MapScripts:
@@ -2289,18 +2289,18 @@ TcgChallengeHallEntrance_MapScripts:
db $ff
Func_3d1f6:
ld a, VAR_28
ld a, VAR_TCG_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $01
jr z, .asm_3d208
cp $03
jr z, .asm_3d208
cp $06
jr nz, .asm_3d20d
.asm_3d208
cp CHALLENGE_CUP_1_START
jr z, .active
cp CHALLENGE_CUP_2_START
jr z, .active
cp CHALLENGE_CUP_3_START
jr nz, .inactive
.active
ld a, MUSIC_CHALLENGE_HALL
ld [wNextMusic], a
.asm_3d20d
.inactive
scf
ccf
ret
@@ -2308,38 +2308,40 @@ Func_3d1f6:
Func_3d210:
ld a, [wTempPrevMap]
cp OVERWORLD_MAP_TCG
jr nz, .asm_3d257
ld a, VAR_28
jr nz, .done
ld a, VAR_TCG_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $01
jr z, .asm_3d229
cp $03
jr z, .asm_3d229
cp $06
jr nz, .asm_3d257
.asm_3d229
ld a, VAR_2B
cp CHALLENGE_CUP_1_START
jr z, .active
cp CHALLENGE_CUP_2_START
jr z, .active
cp CHALLENGE_CUP_3_START
jr nz, .done
.active
ld a, VAR_TCG_CHALLENGE_CUP_RESULT
farcall GetVarValue
cp $01
cp CHALLENGE_CUP_RESULT_WON
push af
ld a, VAR_2B
ld a, VAR_TCG_CHALLENGE_CUP_RESULT
farcall ZeroOutVarValue
pop af
jr nz, .asm_3d257
ld a, VAR_28
jr nz, .done
ld a, VAR_TCG_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $06
jr z, .asm_3d24f
cp CHALLENGE_CUP_3_START
jr z, .adjust
inc a
ld c, a
ld a, VAR_28
ld a, VAR_TCG_CHALLENGE_CUP_STATE
farcall SetVarValue
jr .asm_3d257
.asm_3d24f
ld a, VAR_28
ld c, $05
jr .done
; keep the state var < 7
; verbose: dec a between inc a :: ld c, a above should suffice
.adjust
ld a, VAR_TCG_CHALLENGE_CUP_STATE
ld c, CHALLENGE_CUP_3_UNLOCKED
farcall SetVarValue
.asm_3d257
.done
scf
ret
@@ -2361,7 +2363,7 @@ Func_3d269:
scf
ret
Func_3d271:
Script_TCGChallengeHallEntranceClerk:
ld a, NPC_CLERK_TCG_CHALLENGE_HALL_ENTRANCE
ld [wScriptNPC], a
ldtx hl, DialogReceptionistText
@@ -2372,42 +2374,42 @@ Func_3d271:
xor a
start_script
start_dialog
get_var VAR_2B
compare_loaded_var $00
script_jump_if_b0z .ows_3d2d1
get_var VAR_28
compare_loaded_var $05
script_jump_if_b0nz .ows_3d2c5
script_jump_if_b1z .ows_3d2cb
compare_loaded_var $03
script_jump_if_b0nz .ows_3d2b9
script_jump_if_b1z .ows_3d2bf
compare_loaded_var $01
script_jump_if_b0nz .ows_3d2ad
script_jump_if_b1z .ows_3d2b3
print_npc_text Text098a
script_jump .ows_3d2d4
.ows_3d2ad
print_npc_text Text098b
script_jump .ows_3d2d4
.ows_3d2b3
print_npc_text Text098c
script_jump .ows_3d2d4
.ows_3d2b9
print_npc_text Text098d
script_jump .ows_3d2d4
.ows_3d2bf
print_npc_text Text098e
script_jump .ows_3d2d4
.ows_3d2c5
print_npc_text Text098f
script_jump .ows_3d2d4
.ows_3d2cb
print_npc_text Text0990
script_jump .ows_3d2d4
.ows_3d2d1
print_npc_text Text0991
.ows_3d2d4
get_var VAR_TCG_CHALLENGE_CUP_RESULT
compare_loaded_var CHALLENGE_CUP_RESULT_NONE
script_jump_if_b0z .tcg_cup_played
get_var VAR_TCG_CHALLENGE_CUP_STATE
compare_loaded_var CHALLENGE_CUP_3_UNLOCKED
script_jump_if_b0nz .tcg_cup3_inactive
script_jump_if_b1z .tcg_cup3_active
compare_loaded_var CHALLENGE_CUP_2_START
script_jump_if_b0nz .tcg_cup2_active
script_jump_if_b1z .tcg_cup2_over
compare_loaded_var CHALLENGE_CUP_1_START
script_jump_if_b0nz .tcg_cup1_active
script_jump_if_b1z .tcg_cup1_over
print_npc_text TCGChallengeHallEntranceClerkNoCardsText
script_jump .done
.tcg_cup1_active
print_npc_text TCGChallengeHallEntranceClerkTCGCup1ActiveText
script_jump .done
.tcg_cup1_over
print_npc_text TCGChallengeHallEntranceClerkTCGCup1OverText
script_jump .done
.tcg_cup2_active
print_npc_text TCGChallengeHallEntranceClerkTCGCup2ActiveText
script_jump .done
.tcg_cup2_over
print_npc_text TCGChallengeHallEntranceClerkTCGCup2OverText
script_jump .done
.tcg_cup3_inactive
print_npc_text TCGChallengeHallEntranceClerkTCGCup3InactiveText
script_jump .done
.tcg_cup3_active
print_npc_text TCGChallengeHallEntranceClerkTCGCup3ActiveText
script_jump .done
.tcg_cup_played
print_npc_text TCGChallengeHallEntranceClerkTCGCupPlayedText
.done
end_dialog
end_script
ret
@@ -2424,18 +2426,18 @@ TcgChallengeHallLobby_StepEvents:
TcgChallengeHallLobby_NPCs:
npc NPC_TCG_CHALLENGE_HALL_CHAP, 10, 4, SOUTH, NULL
npc NPC_CUP_HOST, 7, 9, EAST, Func_3d5a3
npc NPC_TCG_CHALLENGE_HALL_PUNK, 5, 6, EAST, Func_3d5a3
npc NPC_TCG_CHALLENGE_HALL_PAPPY, 4, 9, EAST, Func_3d5ba
npc NPC_TCG_CHALLENGE_HALL_TECH, 9, 10, NORTH, Func_3d5ba
npc NPC_TCG_CHALLENGE_HALL_GIRL, 13, 9, WEST, Func_3d5ba
npc NPC_CUP_HOST, 7, 9, EAST, TcgChallengeHallLobby_DisappearDuringTCGCups
npc NPC_TCG_CHALLENGE_HALL_PUNK, 5, 6, EAST, TcgChallengeHallLobby_DisappearDuringTCGCups
npc NPC_TCG_CHALLENGE_HALL_PAPPY, 4, 9, EAST, TcgChallengeHallLobby_AppearDuringTCGCups
npc NPC_TCG_CHALLENGE_HALL_TECH, 9, 10, NORTH, TcgChallengeHallLobby_AppearDuringTCGCups
npc NPC_TCG_CHALLENGE_HALL_GIRL, 13, 9, WEST, TcgChallengeHallLobby_AppearDuringTCGCups
npc NPC_CLERK_BATTLE_CENTER, 2, 2, SOUTH, NULL
npc NPC_CLERK_GIFT_CENTER, 4, 2, SOUTH, NULL
db $ff
TcgChallengeHallLobby_NPCInteractions:
npc_script NPC_TCG_CHALLENGE_HALL_CHAP, Func_3d3c0
npc_script NPC_CUP_HOST, Func_3d4e9
npc_script NPC_CUP_HOST, Script_CupHostTCGLobby
npc_script NPC_TCG_CHALLENGE_HALL_PUNK, Func_3d511
npc_script NPC_TCG_CHALLENGE_HALL_PAPPY, Func_3d539
npc_script NPC_TCG_CHALLENGE_HALL_TECH, Func_3d56d
@@ -2460,18 +2462,18 @@ TcgChallengeHallLobby_MapScripts:
db $ff
Func_3d386:
ld a, VAR_28
ld a, VAR_TCG_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $01
jr z, .asm_3d398
cp $03
jr z, .asm_3d398
cp $06
jr nz, .asm_3d39d
.asm_3d398
cp CHALLENGE_CUP_1_START
jr z, .active
cp CHALLENGE_CUP_2_START
jr z, .active
cp CHALLENGE_CUP_3_START
jr nz, .inactive
.active
ld a, MUSIC_CHALLENGE_HALL
ld [wNextMusic], a
.asm_3d39d
.inactive
scf
ccf
ret
@@ -2638,7 +2640,7 @@ Func_3d3c0:
end_script
ret
Func_3d4e9:
Script_CupHostTCGLobby:
ld a, NPC_CUP_HOST
ld [wScriptNPC], a
ldtx hl, DialogCupHostText
@@ -2649,14 +2651,14 @@ Func_3d4e9:
xor a
start_script
start_dialog
get_var VAR_28
compare_loaded_var $00
script_jump_if_b0z .ows_3d50b
print_npc_text Text09ab
script_jump .ows_3d50e
.ows_3d50b
print_npc_text Text09ac
.ows_3d50e
get_var VAR_TCG_CHALLENGE_CUP_STATE
compare_loaded_var CHALLENGE_CUP_DEAD
script_jump_if_b0z .tcg_cup_unlocked
print_npc_text TCGChallengeHallLobbyCupHostNoCardsText
script_jump .done
.tcg_cup_unlocked
print_npc_text TCGChallengeHallLobbyCupHostStandbyText
.done
end_dialog
end_script
ret
@@ -2672,8 +2674,8 @@ Func_3d511:
xor a
start_script
start_dialog
get_var VAR_28
compare_loaded_var $00
get_var VAR_TCG_CHALLENGE_CUP_STATE
compare_loaded_var CHALLENGE_CUP_DEAD
script_jump_if_b0z .ows_3d533
print_npc_text Text09ad
script_jump .ows_3d536
@@ -2695,16 +2697,16 @@ Func_3d539:
xor a
start_script
start_dialog
get_var VAR_2B
compare_loaded_var $02
get_var VAR_TCG_CHALLENGE_CUP_RESULT
compare_loaded_var CHALLENGE_CUP_RESULT_LOST
script_jump_if_b0nz .ows_3d561
get_var VAR_28
compare_loaded_var $06
get_var VAR_TCG_CHALLENGE_CUP_STATE
compare_loaded_var CHALLENGE_CUP_3_START
print_variable_npc_text Text09af, Text09b0
script_jump .ows_3d56a
.ows_3d561
get_var VAR_28
compare_loaded_var $06
get_var VAR_TCG_CHALLENGE_CUP_STATE
compare_loaded_var CHALLENGE_CUP_3_START
print_variable_npc_text Text09b1, Text09b2
.ows_3d56a
end_dialog
@@ -2743,34 +2745,34 @@ Func_3d588:
end_script
ret
Func_3d5a3:
ld a, VAR_28
TcgChallengeHallLobby_DisappearDuringTCGCups:
ld a, VAR_TCG_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $01
jr z, .asm_3d5b8
cp $03
jr z, .asm_3d5b8
cp $06
jr z, .asm_3d5b8
cp CHALLENGE_CUP_1_START
jr z, .disappear
cp CHALLENGE_CUP_2_START
jr z, .disappear
cp CHALLENGE_CUP_3_START
jr z, .disappear
scf
ccf
ret
.asm_3d5b8
.disappear
scf
ret
Func_3d5ba:
ld a, VAR_28
TcgChallengeHallLobby_AppearDuringTCGCups:
ld a, VAR_TCG_CHALLENGE_CUP_STATE
farcall GetVarValue
cp $01
jr z, .asm_3d5ce
cp $03
jr z, .asm_3d5ce
cp $06
jr z, .asm_3d5ce
cp CHALLENGE_CUP_1_START
jr z, .appear
cp CHALLENGE_CUP_2_START
jr z, .appear
cp CHALLENGE_CUP_3_START
jr z, .appear
scf
ret
.asm_3d5ce
.appear
scf
ccf
ret
@@ -3876,7 +3878,7 @@ Func_3ddb8:
farcall Func_454fa
ld a, VAR_GRANDMASTERCUP_OPPONENT_DECK_0
farcall GetVarValue
farcall Func_45484
farcall GetNPCByDeck_AdjustAmy_PokemonDome
lb de, 9, 4
ld b, WEST
farcall LoadOWObjectInMap
@@ -4312,7 +4314,7 @@ Script_3e158:
move_active_npc .NPCMovement_3e1ae
wait_for_player_animation
quit_script
farcall Func_454bc
farcall LoadGrandMasterCupOpponentTitleAndName
ld a, $01
start_script
start_dialog
@@ -4337,7 +4339,7 @@ Script_3e158:
print_npc_text Text0fb9
end_dialog
end_script
farcall Func_454ab
farcall SetGrandMasterCupDuelParams
ret
.NPCMovement_3e1a9:
db WEST, MOVE_1
@@ -4360,7 +4362,7 @@ Script_3e1b8:
farcall SetVarValue
ld a, VAR_1B
farcall GetVarValue
farcall Func_45484
farcall GetNPCByDeck_AdjustAmy_PokemonDome
lb de, 9, 4
ld b, WEST
farcall LoadOWObjectInMap
@@ -4377,7 +4379,7 @@ Script_3e1b8:
move_active_npc .NPCMovement_3e212
wait_for_player_animation
quit_script
farcall Func_454bc
farcall LoadGrandMasterCupOpponentTitleAndName
ld a, $01
start_script
start_dialog
@@ -4389,7 +4391,7 @@ Script_3e1b8:
print_npc_text Text0fbd
end_dialog
end_script
farcall Func_454ab
farcall SetGrandMasterCupDuelParams
ret
.NPCMovement_3e20d:
db WEST, MOVE_1
@@ -4412,7 +4414,7 @@ Script_3e21c:
farcall SetVarValue
ld a, VAR_1E
farcall GetVarValue
farcall Func_45484
farcall GetNPCByDeck_AdjustAmy_PokemonDome
lb de, 9, 4
ld b, WEST
farcall LoadOWObjectInMap
@@ -4435,7 +4437,7 @@ Script_3e21c:
farcall GetNPCByDeck
cp NPC_RONALD
jr z, .asm_3e272
farcall Func_454bc
farcall LoadGrandMasterCupOpponentTitleAndName
ld a, $01
start_script
print_npc_text Text0fc0
@@ -4455,7 +4457,7 @@ Script_3e21c:
print_npc_text Text0fc3
end_dialog
end_script
farcall Func_454ab
farcall SetGrandMasterCupDuelParams
ret
.NPCMovement_3e295:
db WEST, MOVE_1
@@ -4487,7 +4489,7 @@ Func_3e2a4:
ld h, $00
ld l, a
call LoadTxRam3
farcall Func_454e3
farcall LoadGrandMasterCupOpponentName
ld a, $01
start_script
print_npc_text Text0fc4
@@ -4499,7 +4501,7 @@ Func_3e2a4:
end_dialog
quit_script
farcall Func_45488
farcall Func_45484
farcall GetNPCByDeck_AdjustAmy_PokemonDome
push af
ld b, $0f
ld hl, .NPCMovement_3e33f
@@ -4526,7 +4528,7 @@ Func_3e2a4:
ld h, $00
ld l, a
call LoadTxRam3
farcall Func_454e3
farcall LoadGrandMasterCupOpponentName
ld a, $01
start_script
print_npc_text Text0fc7
@@ -4560,7 +4562,7 @@ Func_3e2a4:
wait_for_player_animation
start_dialog
quit_script
farcall Func_454e3
farcall LoadGrandMasterCupOpponentName
ld a, $01
start_script
print_npc_text Text0fcb
@@ -4583,7 +4585,7 @@ Func_3e2a4:
end_dialog
quit_script
farcall Func_45488
farcall Func_45484
farcall GetNPCByDeck_AdjustAmy_PokemonDome
push af
ld b, $0f
ld hl, .NPCMovement_3e411
@@ -4600,7 +4602,7 @@ Func_3e2a4:
.ows_3e3c0:
quit_script
farcall Func_454e3
farcall LoadGrandMasterCupOpponentName
ld a, $01
start_script
print_npc_text Text0fcd

1475
src/engine/bank10.asm
View File

File diff suppressed because it is too large Load Diff

144
src/engine/bank11.asm
View File

@@ -300,85 +300,94 @@ WaitForSFXToFinish::
SECTION "Bank 11@5301", ROMX[$5301], BANK[$11]
Func_45301:
; for a = TCG_CHALLENGE_CUP or GR_CHALLENGE_CUP,
; set three opponents for the cup
SetChallengeCupOpponents:
or a
jr nz, .asm_4531b
jr nz, .gr_cup
; tcg cup
ld a, NUM_TCG_CHALLENGE_CUP_OPPONENT_POOL
ld [wRemainingIntroCards], a
ld [wNumChallengeCupOpponents], a
ld a, LOW(TCGChallengeCupOpponents)
ld [wFilteredListPtr], a
ld a, HIGH(TCGChallengeCupOpponents)
ld [wFilteredListPtr + 1], a
ld a, VAR_28
ld a, VAR_TCG_CHALLENGE_CUP_STATE
farcall GetVarValue
jr .asm_45330
.asm_4531b
jr .get_cup_index
.gr_cup
ld a, NUM_GR_CHALLENGE_CUP_OPPONENT_POOL
ld [wRemainingIntroCards], a
ld [wNumChallengeCupOpponents], a
ld a, LOW(GRChallengeCupOpponents)
ld [wFilteredListPtr], a
ld a, HIGH(GRChallengeCupOpponents)
ld [wFilteredListPtr + 1], a
ld a, VAR_30
ld a, VAR_GR_CHALLENGE_CUP_STATE
farcall GetVarValue
.asm_45330
cp $03
jr z, .asm_4533a
jr nc, .asm_4533e
ld a, 0
jr .asm_45340
.asm_4533a
ld a, 1
jr .asm_45340
.asm_4533e
ld a, 2
.asm_45340
ld [wd578], a
ld e, 3
ld d, VAR_2D
.get_cup_index
cp CHALLENGE_CUP_2_START
jr z, .cup2
jr nc, .cup3
; cup1
ld a, CHALLENGE_CUP_1
jr .set_cup_index
.cup2
ld a, CHALLENGE_CUP_2
jr .set_cup_index
.cup3
ld a, CHALLENGE_CUP_3
.set_cup_index
ld [wChallengeCupIndex], a
; init
ld e, NUM_CHALLENGE_CUP_ROUNDS
ld d, VAR_CHALLENGECUP_ROUND1_OPPONENT_DECK_ID
ld c, $ff
.asm_45349
.loop_init
ld a, d
farcall SetVarValue
inc d
dec e
jr nz, .asm_45349
jr nz, .loop_init
; set
; b = 1 << c for c = round number [0, 2]
; set opponents randomly with the bitmask b and wChallengeCupIndex
ld c, 0
.asm_45354
.loop_set_opponents
ld b, 1
ld a, c
or a
.asm_45358
jr z, .asm_4535f
.loop_shift
jr z, .loop_pick
sla b
dec a
jr .asm_45358
.asm_4535f
call Func_45379
call Func_453a3
jr c, .asm_4535f
jr .loop_shift
.loop_pick
call .PickOpponent
call .CheckDupe
jr c, .loop_pick
push bc
ld d, a
ld a, VAR_2D
ld a, VAR_CHALLENGECUP_ROUND1_OPPONENT_DECK_ID
add c
ld c, d
farcall SetVarValue
pop bc
inc c
ld a, 3
ld a, NUM_CHALLENGE_CUP_ROUNDS
cp c
jr nz, .asm_45354
jr nz, .loop_set_opponents
ret
Func_45379:
.asm_45379
ld a, [wd578]
; for b = bitmask, choose a random opponent with wChallengeCupIndex
; and return their deck id in a
.PickOpponent:
ld a, [wChallengeCupIndex]
ld d, a
ld a, [wFilteredListPtr]
ld l, a
ld a, [wFilteredListPtr + 1]
ld h, a
ld a, [wRemainingIntroCards]
ld a, [wNumChallengeCupOpponents]
call Random
sla a
sla a
@@ -390,35 +399,36 @@ Func_45379:
ld a, [hl]
pop hl
and b
jr z, .asm_45379
jr z, .PickOpponent
ld a, [hl]
ret
Func_453a3:
; set carry if the opponent is already picked
.CheckDupe:
ld d, a
farcall GetNPCByDeck
ld l, a
ld e, VAR_2D
.asm_453ab
ld e, VAR_CHALLENGECUP_ROUND1_OPPONENT_DECK_ID
.loop_check
ld a, e
farcall GetVarValue
cp $ff
jr z, .asm_453bf
jr z, .done
farcall GetNPCByDeck
inc e
cp l
jr nz, .asm_453ab
jr nz, .loop_check
ld a, d
scf
ret
.asm_453bf
.done
ld a, d
scf
ccf
ret
; special handling for Amy?
Func_453c3:
; GetNPCByDeck, with special handling for Amy
GetNPCByDeck_AdjustAmy:
farcall GetNPCByDeck
cp NPC_AMY_LOUNGE
jr nz, .done
@@ -426,12 +436,12 @@ Func_453c3:
.done
ret
Func_453ce:
ld a, VAR_2C
LoadChallengeCupOpponentName:
ld a, VAR_CHALLENGECUP_CURRENT_ROUND
farcall GetVarValue
ld c, a
dec c
ld a, VAR_2D
ld a, VAR_CHALLENGECUP_ROUND1_OPPONENT_DECK_ID
add c
farcall GetVarValue
farcall GetNPCByDeck
@@ -447,12 +457,12 @@ Func_453ce:
ld [wTxRam2_b + 1], a
ret
Func_453f9:
ld a, VAR_2C
SetChallengeCupDuelParams:
ld a, VAR_CHALLENGECUP_CURRENT_ROUND
farcall GetVarValue
dec a
ld c, a
ld a, VAR_2D
ld a, VAR_CHALLENGECUP_ROUND1_OPPONENT_DECK_ID
add c
farcall GetVarValue
ld [wNPCDuelDeckID], a
@@ -463,6 +473,7 @@ Func_453f9:
ret
SetGrandMasterCupOpponents:
; init
ld e, NUM_GRANDMASTERCUP_OPPONENTS
ld d, VAR_GRANDMASTERCUP_OPPONENT_DECK_0
ld c, $ff
@@ -472,6 +483,7 @@ SetGrandMasterCupOpponents:
inc d
dec e
jr nz, .loop_init
; set
; b = 1 << c for c = opponent slot number [0, 6]
; set opponents randomly with the bitmask b
; so Ronald may only be chosen at the last slot
@@ -481,14 +493,14 @@ SetGrandMasterCupOpponents:
ld a, c
or a
.loop_shift
jr z, .set_opponent
jr z, .loop_pick
sla b
dec a
jr .loop_shift
.set_opponent
.loop_pick
call .PickOpponent
call .CheckDupe
jr c, .set_opponent
jr c, .loop_pick
push bc
ld d, a
ld a, VAR_GRANDMASTERCUP_OPPONENT_DECK_0
@@ -504,7 +516,7 @@ SetGrandMasterCupOpponents:
; for b = bitmask, choose a random opponent and return their deck id in a
.PickOpponent:
ld hl, GrandMasterCupOpps
ld hl, GrandMasterCupOpponents
ld a, NUM_GRANDMASTERCUP_OPPONENT_IDS
call Random
sla a
@@ -542,8 +554,10 @@ SetGrandMasterCupOpponents:
ccf
ret
Func_45484:
call Func_453c3
; just GetNPCByDeck_AdjustAmy
; tried to add something for pokemon dome?
GetNPCByDeck_AdjustAmy_PokemonDome:
call GetNPCByDeck_AdjustAmy
ret
Func_45488:
@@ -565,7 +579,7 @@ Func_45488:
.asm_454aa
ret
Func_454ab:
SetGrandMasterCupDuelParams:
call Func_45488
ld [wNPCDuelDeckID], a
ld a, MUSIC_MATCH_START_CLUB_MASTER
@@ -574,7 +588,7 @@ Func_454ab:
set 1, [hl]
ret
Func_454bc:
LoadGrandMasterCupOpponentTitleAndName:
call Func_45488
farcall GetNPCByDeck
farcall LoadNPCDuelist
@@ -593,7 +607,7 @@ Func_454bc:
ld [wTxRam2_b + 1], a
ret
Func_454e3:
LoadGrandMasterCupOpponentName:
call Func_45488
farcall GetNPCByDeck
farcall LoadNPCDuelist
@@ -785,7 +799,7 @@ Func_4565d:
dec a
add VAR_GRANDMASTERCUP_OPPONENT_DECK_0
farcall GetVarValue
call Func_45484
call GetNPCByDeck_AdjustAmy_PokemonDome
.asm_45672
pop hl
pop de

2
src/text/text10.asm
View File

@@ -459,7 +459,7 @@ Text0f05:
linefw "対戦してみるんじゃよ"
done
Text0f06:
ChallengeMachineWinStreakRecordCorruptedAndResetText:
textfw "「れんしょう きろく」のデータが"
linefw "なんらかのげんいんで こわれました"
linefw "「れんしょう きろく」のデータを"

140
src/text/text6.asm
View File

@@ -122,7 +122,7 @@ Text094d:
linefw "まけてばかり いられないからね"
done
Text094e:
TCGCupClerkCup1ActiveText:
textfw "ただいま チャレンジカップを"
linefw "かいさいしています!"
linefw "さんにんに 勝って めずらしいカード"
@@ -135,7 +135,7 @@ Text094e:
linefw "なりませんか?"
done
Text094f:
TCGCupClerkCup2ActiveText:
textfw "ただいま チャレンジカップを"
linefw "かいさいしています!"
linefw "さんにんに 勝って めずらしいカード"
@@ -152,7 +152,7 @@ Text094f:
linefw "なりませんか?"
done
Text0950:
TCGCupClerkCup3ActiveText:
textfw "ただいま チャレンジカップを"
linefw "かいさいしています!"
linefw "さんにんに 勝って"
@@ -169,41 +169,41 @@ Text0950:
linefw "なりませんか?"
done
Text0951:
TCGCupClerkPlayerWonText:
textfw "チャレンジに せいこうしたかたは"
linefw "チャレンジできない きまりなんです"
linefw "つぎの チャレンジカップまで"
linefw "チャレンジは まってくださいね"
done
Text0952:
TCGCupClerkPlayerLostText:
textfw "1かい チャレンジされた人は"
linefw "しばらく チャレンジできないんです"
linefw "しばらくしてから"
linefw "また きてくださいね"
done
Text0953:
TCGCupClerkEnterPromptText:
textfw "チャレンジャーに なりますか?"
done
Text0954:
TCGCupClerkEnterAcceptedText:
textfw "それでは ステージにどうぞ!"
done
Text0955:
TCGCupClerkEnterDeclinedText:
textfw "そうですか ざんねんですね"
linefw "どうぞ また おこしください"
done
Text0956:
TCGCupClerkRightNoEntryText:
textfw "こちらでは チャレンジャーは"
linefw "うけつけて おりません"
linefw "むかって ひだりのひとに"
linefw "はなしかけて ください"
done
Text0957:
TCGChallengeHallManNoCardsText:
textfw "はい ダメ ダメ"
linefw "きても ムダだよ"
linefw "カードが あつまるまでは"
@@ -216,14 +216,14 @@ Text0957:
linefw "GR団が いなくならないとね"
done
Text0958:
TCGChallengeHallManGoodLuckText:
textfw "チャレンジカップには"
linefw "さんかしてるかい?"
linefw "めずらしいカードが もらえるから"
linefw "がんばるんだぞ"
done
Text0959:
TCGChallengeHallManTCGCup3Text:
textfw "これからのチャレンジカップは"
linefw "とつぜん ひらかれるぞ"
linefw "ちょくちょく ここにきて"
@@ -232,71 +232,71 @@ Text0959:
linefw "やっとらんからな"
done
Text095a:
CupHostTCGCup1IntroText:
textfw "さあ チャレンジカップも"
linefw "もりあがって います!"
linefw "げんざい 勝ちのこっているのは"
linefw "<RAMTEXT>さんです!"
done
Text095b:
CupHostTCGCup1Round1ChallengerText:
textfw "あらたな チャレンジャーは"
linefw "<RAMNAME>さんです!"
done
Text095c:
CupHostTCGCup2IntroText:
textfw "さあ チャレンジカップ!"
linefw "もりあがって まいりましたぁ!!"
linefw "げんざい 勝ちのこっているのは"
linefw "<RAMTEXT>さんです!"
done
Text095d:
CupHostTCGCup2Round1ChallengerText:
textfw "あらたな チャレンジャーは"
linefw " "
linefw "みなさん ごぞんじの"
linefw "<RAMNAME>さんです!"
done
Text095e:
CupHostTCGCup3IntroText:
textfw "すばらしい もりあがりをみせている"
linefw "こんかいの チャレンジカップ!"
linefw "げんざい 勝ちのこっているのは"
linefw "<RAMTEXT>さんです!"
done
Text095f:
CupHostTCGCup3Round1ChallengerText:
textfw "ここで むかえるチャレンジャーは"
linefw "そう みなさん ごぞんじの方です!"
linefw "さいきょうの ポケモンカードマスター"
linefw "<RAMNAME>さんです!!"
done
Text0960:
CupHostTCGCupRound1DuelStartText:
textfw "よろしいですか?"
linefw "まずは サイドカードは 4枚です!"
linefw "さあ!!"
linefw "対戦の スタートです!"
done
Text0961:
CupHostTCGCup1Or2Round1PlayerWonText:
textfw "<RAMNAME>さんの勝ちです!"
linefw "おめでとうございます!"
linefw "<RAMNAME>さん!"
linefw "ひとり 勝ちぬきです!!"
done
Text0962:
CupHostTCGCup1Round1NextChallengerText:
textfw "さあ つぎのチャレンジャーさん"
linefw "ステージに あがってください!"
done
Text0963:
CupHostTCGCup2Round1NextChallengerText:
textfw "つぎのチャレンジャーさん!"
linefw "ステージに どうぞ!"
done
Text0964:
CupHostTCGCup3Round1PlayerWonText:
textfw "<RAMNAME>さんの勝ちです!"
linefw "さすが ポケモンカードマスター"
linefw "みごとな たたかいぶりでした!"
@@ -304,26 +304,26 @@ Text0964:
linefw "ひとり 勝ちぬきです!!"
done
Text0965:
CupHostTCGCup3Round1NextChallengerText:
textfw "つぎのチャレンジャーさん!"
linefw "ステージに どうぞ!"
done
Text0966:
CupHostTCGCup1Round1PlayerLostText:
textfw "<RAMTEXT>さんの勝ちです!"
linefw " "
linefw "<RAMTEXT>さん ふたり 勝ちぬき!"
linefw "あとひとりで カードかくとくぅ!"
done
Text0967:
CupHostTCGCup2Round1PlayerLostText:
textfw "<RAMTEXT>さんの勝ちです!"
linefw " "
linefw "<RAMTEXT>さん ふたり 勝ちぬき!"
linefw "あとひとりで カードかくとくです!"
done
Text0968:
CupHostTCGCup3Round1PlayerLostText:
textfw "なんと! ポケモンカードマスター"
linefw "<RAMNAME>さん やぶれました!"
linefw "<RAMTEXT>さんの勝ちです!"
@@ -332,69 +332,69 @@ Text0968:
linefw "あと ひとりで カードゲット!"
done
Text0969:
CupHostTCGCupPlayerWonOpponentEliminatedText:
textfw "<RAMTEXT>さんは ざんねんでした"
linefw "きをつけて おかえりください"
done
Text096a:
CupHostTCGCupRound2ChallengerText:
textfw "あらたな チャレンジャーは"
linefw "<RAMTEXT>さんです!"
done
Text096b:
CupHostTCGCupRound2The4PrizesMatchText:
textfw "こんどの対戦も"
linefw "サイドカード 4枚です"
done
Text096c:
CupHostTCGCupAreYourDecksReadyText:
textfw "ふたりとも"
linefw "デッキのじゅんびは いいですか?"
done
Text096d:
CupHostTCGCupMakeYourPreparationsText:
textfw "それでは"
linefw "じゅんびを してください!"
done
Text096e:
CupHostTCGCupRound2DuelStartText:
textfw "それでは <RAMNAME>さん!"
linefw "ふたりめの対戦! スタート!"
done
Text096f:
CupHostTCGCupRound2PlayerWonText:
textfw "やりました <RAMNAME>さん!"
linefw "ふたり 勝ちぬきです!!"
linefw "あと ひとりで ゆうしょうです!"
done
Text0970:
CupHostTCGCup1Round2NextChallengerText:
textfw "さあ つぎのチャレンジャーは"
linefw "だれでしょうか?"
done
Text0971:
CupHostTCGCup2Round2NextChallengerText:
textfw "いよいよ さんにんめの対戦しゃ"
linefw "クラブマスターのとうじょうです!"
linefw "さあ どのクラブマスターが"
linefw "とうじょうするのでしょうか?"
done
Text0972:
CupHostTCGCup3Round2NextChallengerText:
textfw "これからの 対戦は"
linefw "サイドカード 6枚戦です!"
linefw "さあ つぎのチャレンジャーは"
linefw "どなたでしょうか?"
done
Text0973:
CupHostTCGCup1Or2Round2PlayerLostText:
textfw "<RAMTEXT>さんの勝ちです!"
linefw " "
linefw "<RAMTEXT>さん ひとり 勝ちぬき!"
linefw "あとふたりで ゆうしょうです!"
done
Text0974:
CupHostTCGCup3Round2PlayerLostText:
textfw "<RAMTEXT>さんの勝ちです!"
linefw " "
linefw "ポケモンカードマスターを"
@@ -403,123 +403,123 @@ Text0974:
linefw "あと ふたりで ゆうしょうです!"
done
Text0975:
CupHostTCGCup1Round3ChallengerText:
textfw "あらたな チャレンジャーは"
linefw "<RAMTEXT>さんです!"
done
Text0976:
CupHostTCGCup2Round3ChallengerText:
textfw "さいごの対戦しゃは クラブマスター"
linefw "<RAMTEXT>さんです!"
done
Text0977:
CupHostTCGCup3Round3ChallengerClubMasterText:
textfw "こんどの対戦しゃは クラブマスター"
linefw "<RAMTEXT>さんです!"
done
Text0978:
CupHostTCGCup3Round3ChallengerGRText:
textfw "さいごは GR団からのししゃ!"
linefw "<RAMTEXT>さんです!"
done
Text0979:
CupHostTCGCup3Round3ChallengerRonaldText:
textfw "さあ さんにんめは"
linefw "<RAMTEXT>さん です!"
done
Text097a:
RonaldTCGCup3ChallengerText:
textfw "ざんねんだが おまえのゆうしょうは"
linefw "このランドさまが そしするぜ!"
done
Text097b:
CupHostTCGCupRound3The6PrizesMatchText:
textfw "この対戦は"
linefw "サイドカード 6枚です!"
done
Text097c:
CupHostTCGCupRound3DuelStartText:
textfw "それでは <RAMNAME>さん!"
linefw "さんにんめの対戦! スタート!"
done
Text097d:
CupHostTCGCupRound3PlayerWonText:
textfw "おめでとうございます!"
linefw "ついに さんにん勝ちぬきです!"
done
Text097e:
CupHostTCGCup1Or2PlayerChampionText:
textfw "さあ こんかいのチャレンジカップの"
linefw "ゆうしょうは <RAMNAME>さんです!"
done
Text097f:
CupHostTCGCup3PlayerChampionText:
textfw "チャレンジカップのゆうしょうしゃは"
linefw "ポケモンカードマスター"
linefw "<RAMNAME>さんです!!"
done
Text0980:
CupHostTCGCup1Round3PlayerLostText:
textfw "<RAMTEXT>さんの勝ちです!"
linefw " "
linefw "<RAMTEXT>さん ひとり 勝ちぬき!"
linefw "あとふたりで ゆうしょうです!"
done
Text0981:
CupHostTCGCup2Round3PlayerLostText:
textfw "クラブマスター"
linefw "<RAMTEXT>さんの勝ちです!"
linefw "<RAMNAME>さん"
linefw "クラブマスターに やぶれました"
done
Text0982:
CupHostTCGCup3Round3PlayerLostText:
textfw "あー ざんねん!"
linefw "<RAMNAME>さん はいぼくです!!"
linefw "<RAMTEXT>さん ひとり 勝ちぬき!"
linefw "あとふたりで ゆうしょうです!"
done
Text0983:
CupHostTCGCup1ChampionPrizeText:
textfw "それでは <RAMNAME>さん!"
linefw "「ミュウツー<Lv>30」を どうぞ!"
done
Text0984:
CupHostTCGCup2ChampionPrizeText:
textfw "それでは <RAMNAME>さん!"
linefw "「ピカチュウ<Lv>13」を どうぞ!"
done
Text0985:
CupHostTCGCup3ChampionPrizeText:
textfw "それでは <RAMNAME>さん!"
linefw "「<RAMTEXT>」を どうぞ!"
done
Text0986:
CupHostTCGCupPlayer10TimesChampionText:
textfw "そして <RAMNAME>さん"
linefw "チャレンジカップ 10勝めです!"
linefw "10勝たっせいを きねんして"
linefw "こちらのコインを プレゼントします"
done
Text0987:
CupHostTCGCupPlayer10TimesChampionContinueText:
textfw "チャレンジカップ 10勝たっせい"
linefw "おめでとうございます!"
linefw "それでは <RAMNAME>さん"
linefw "「ポニータコイン」 だいじにしてね!"
done
Text0988:
CupHostTCGCupPlayerChampionCongratsText:
textfw "<RAMNAME>さん! ほんとうに!!"
linefw "おめでとう ございました!"
done
Text0989:
CupHostTCGCupPlayerLostEliminatedText:
textfw "<RAMNAME>さんは ざんねんでした"
linefw "きをつけて おかえりください"
done
Text098a:
TCGChallengeHallEntranceClerkNoCardsText:
textfw "いらっしゃいませ"
linefw "チャレンジホールへ ようこそ!"
linefw "ここでは"
@@ -530,7 +530,7 @@ Text098a:
linefw "<RAMNAME>さん"
done
Text098b:
TCGChallengeHallEntranceClerkTCGCup1ActiveText:
textfw "いらっしゃいませ"
linefw "チャレンジホールへ ようこそ!"
linefw "おかげで チャレンジカップを"
@@ -539,7 +539,7 @@ Text098b:
linefw "ぜひ さんかしてください"
done
Text098c:
TCGChallengeHallEntranceClerkTCGCup1OverText:
textfw "1回目の チャレンジカップは"
linefw "おわってしまいました"
linefw "つぎの チャレンジカップは"
@@ -548,7 +548,7 @@ Text098c:
linefw "たまに もどってみてくださいね"
done
Text098d:
TCGChallengeHallEntranceClerkTCGCup2ActiveText:
textfw "いらっしゃいませ"
linefw "チャレンジホールへ ようこそ!"
linefw "チャレンジカップ"
@@ -557,7 +557,7 @@ Text098d:
linefw "おくに おすすみください"
done
Text098e:
TCGChallengeHallEntranceClerkTCGCup2OverText:
textfw "2回目の チャレンジカップは"
linefw "おわってしまいました"
linefw "つぎの チャレンジカップは"
@@ -566,7 +566,7 @@ Text098e:
linefw "もどってきて みてくださいね!"
done
Text098f:
TCGChallengeHallEntranceClerkTCGCup3InactiveText:
textfw "いらっしゃいませ"
linefw "チャレンジホールへ ようこそ!"
linefw "ただいま つぎのチャレンジカップを"
@@ -575,7 +575,7 @@ Text098f:
linefw "いらしてください"
done
Text0990:
TCGChallengeHallEntranceClerkTCGCup3ActiveText:
textfw "いらっしゃいませ"
linefw "チャレンジホールへ ようこそ!"
linefw "ちょうど チャレンジカップが"
@@ -583,7 +583,7 @@ Text0990:
linefw "おいそぎ おくに おすすみください"
done
Text0991:
TCGChallengeHallEntranceClerkTCGCupPlayedText:
textfw "<RAMNAME>さん"
linefw "けっかは どうでしたか?"
linefw "チャレンジカップの 勝ちまけは"
@@ -775,7 +775,7 @@ Text09aa:
linefw "「オムナイト<Lv>19」 ありがとぉー!"
done
Text09ab:
TCGChallengeHallLobbyCupHostNoCardsText:
textfw "わたし チャレンジカップのしかいなの"
linefw "でも しばらくは シゴトないの"
linefw "だって カードが なくて"
@@ -783,7 +783,7 @@ Text09ab:
linefw "あーあ ヒマだわ・・・"
done
Text09ac:
TCGChallengeHallLobbyCupHostStandbyText:
textfw "わたし チャレンジカップのしかいなの"
linefw "でも いまは きゅうけい中"
done

151
src/text/text9.asm
View File

@@ -220,7 +220,7 @@ Text0de8:
linefw "いって やられてしまえ!"
done
Text0de9:
GRChallengeMachineStaff50WinStreakRewards1Text:
textfw "おめでとー!"
linefw "50れんしょう たっせいよ!!"
linefw "きねんのコインを あげるわ"
@@ -229,14 +229,14 @@ Text0de9:
linefw "たいせつにしてね"
done
Text0dea:
GRChallengeMachineStaff50WinStreakRewards2Text:
textfw "50れんしょう おめでとう!"
linefw " "
linefw "どんどん れんしょうきろくを"
linefw "のばしてね!!"
done
Text0deb:
GRCupClerkCup1ActiveText:
textfw "ただいま 「GR団杯」を"
linefw "かいさいしています"
linefw "さんにんに 勝つと"
@@ -249,7 +249,7 @@ Text0deb:
linefw "チャレンジしてみませんか?"
done
Text0dec:
GRCupClerkCup2ActiveText:
textfw "ただいま GR団杯を"
linefw "かいさい中です!"
linefw "GR団メンバー さんにんに 勝って"
@@ -262,7 +262,7 @@ Text0dec:
linefw "なりませんか?"
done
Text0ded:
GRCupClerkCup3ActiveText:
textfw "ただいま GR団のキング"
linefw "ビルリッチさまの こうにん大会"
linefw "GR団 「キング杯」が"
@@ -279,75 +279,75 @@ Text0ded:
linefw "なりませんか?"
done
Text0dee:
GRCupClerkCup1PlayerWonText:
textfw "チャレンジに せいこうしたかたは"
linefw "チャレンジできない きまりなんです"
linefw "つぎの 「GR団杯」まで"
linefw "チャレンジは まってくださいね"
done
Text0def:
GRCupClerkCup2PlayerWonText:
textfw "チャレンジに せいこうしたかたは"
linefw "チャレンジできない きまりなんです"
done
Text0df0:
GRCupClerkCup3PlayerWonText:
textfw "チャレンジに せいこうしたかたは"
linefw "チャレンジできない オキテなんです"
linefw "つぎの 「キング杯」まで"
linefw "チャレンジは まってくださいね"
done
Text0df1:
GRCupClerkPlayerLostText:
textfw "1かい チャレンジされた人は"
linefw "しばらく チャレンジできないんです"
linefw "しばらくしてから"
linefw "また きてくださいね"
done
Text0df2:
GRCupClerkEnterPromptText:
textfw "チャレンジャーに なりますか?"
done
Text0df3:
GRCupClerkEnterAcceptedText:
textfw "それでは"
linefw "ステージへ どうぞ!"
done
Text0df4:
GRCupClerkEnterDeclinedText:
textfw "そうですか ざんねんですね"
linefw "どうぞ また おこしください"
done
Text0df5:
GRCupClerkRightNoEntryText:
textfw "こちらでは チャレンジャーは"
linefw "うけつけて おりません"
linefw "むかって ひだりのひとに"
linefw "はなしかけて ください"
done
Text0df6:
GRChallengeMachineStaffUnderConstructionInitialText:
textfw "えっ? あたしが ここで"
linefw "なにを してるのかって?"
linefw "たのまれて しごとをしてるのよ"
linefw "だ・か・ら じゃましないでね"
done
Text0df7:
GRChallengeMachineStaffUnderConstructionRepeatText:
textfw "ここに ステキなマシンを"
linefw "セットするのよ"
linefw "いまは どこにセットするか"
linefw "かんがえている ところなのよ"
done
Text0df8:
GRChallengeMachineStaffWelcomeText:
textfw "GR団のチャレンジマシンよ"
linefw "むこうのと ちがうから あそんでみて"
linefw "50れんしょうしたら"
linefw "めずらしいコインを あげるわ"
done
Text0df9:
GRChallengeMachineStaffWelcome50WinStreakDoneText:
textfw "こんにちはー"
linefw "ちょうしは どう?"
linefw "あなたが れんしょうきろくを"
@@ -355,7 +355,7 @@ Text0df9:
linefw "チャレンジ がんばってね!"
done
Text0dfa:
CupHostGRCup1IntroText:
textfw "さあ ヒートアップしてきました"
linefw "スリルまんてんの GR団杯!"
linefw "げんざい 勝ちのこっているのは"
@@ -364,19 +364,19 @@ Text0dfa:
linefw "むかえます! そのあいては・・・"
done
Text0dfb:
CupHostGRCup1Round1ChallengerText:
textfw "GR団と たたかっている"
linefw "<RAMNAME>さんのとうじょうです!!"
done
Text0dfc:
CupHostGRCup1Round1DuelStartText:
textfw "よろしいですか?"
linefw "サイドカードは 4枚です!"
linefw "さあ!!"
linefw "対戦の スタートです!"
done
Text0dfd:
CupHostGRCup2IntroText:
textfw "しれつな 対戦が"
linefw "くりひろげられる GR団杯!"
linefw "げんざい 勝ちのこっているのは"
@@ -385,12 +385,12 @@ Text0dfd:
linefw "むかえます! そのあいては・・・"
done
Text0dfe:
CupHostGRCup2Round1ChallengerText:
textfw "GR団と たたかっている"
linefw "<RAMNAME>さんのとうじょうです!!"
done
Text0dff:
CupHostGRCup3IntroText:
textfw "GR団キング ビルリッチさまの"
linefw "カード大会 「キング杯」!"
linefw "いやがうえにも"
@@ -399,41 +399,41 @@ Text0dff:
linefw "<RAMTEXT>さん!"
done
Text0e00:
CupHostGRCup3Round1ChallengerText:
textfw "ここで むかえるチャレンジャーは"
linefw "とくべつ さんかのかたです!"
linefw "ポケモンカードマスター"
linefw "<RAMNAME>さんです!!"
done
Text0e01:
CupHostGRCup3Round1DuelStartText:
textfw "じゅんびは よろしいですか?"
linefw "まずは サイドカード4枚戦です!"
linefw "さあ!!"
linefw "対戦を はじめてください!"
done
Text0e02:
CupHostGRCup1Or2Round1PlayerWonText:
textfw "勝ったのは・・・"
linefw "<RAMNAME>さんです!"
linefw "<RAMNAME>さん!"
linefw "ひとり 勝ちぬきです!!"
done
Text0e03:
CupHostGRCup1Or2Round1PlayerWonOpponentEliminatedText:
textfw "まけた <RAMTEXT>さん"
linefw "ざんねんでした"
linefw "きをつけて おかえりください"
done
Text0e04:
CupHostGRCup1Or2Round1NextChallengerText:
textfw "さあ つぎの対戦を"
linefw "はじめたいと おもいます!!"
linefw "つぎの チャレンジャーさん"
linefw "ステージに あがってください!"
done
Text0e05:
CupHostGRCup3Round1PlayerWonText:
textfw "<RAMNAME>さん 勝ちました!"
linefw "さすが ポケモンカードマスター"
linefw "スゴイ!!"
@@ -442,31 +442,31 @@ Text0e05:
linefw "ひとり 勝ちぬきです!!"
done
Text0e06:
CupHostGRCup3Round1PlayerWonOpponentEliminatedText:
textfw "<RAMTEXT>さんは ざんねんでした"
linefw "どうぞ おかえりください"
done
Text0e07:
CupHostGRCup3Round1NextChallengerText:
textfw "つぎのGR団員さん!"
linefw "ステージに どうぞ!"
done
Text0e08:
CupHostGRCup1Or2Round1PlayerLostText:
textfw "勝ったのは・・・"
linefw "<RAMTEXT>さんでーす!!"
linefw "<RAMTEXT>さんは ふたり 勝ちぬき!"
linefw "あとひとりで カードかくとくです!"
done
Text0e09:
CupHostGRCup1Or2Round1PlayerLostEliminatedText:
textfw "まけた <RAMNAME>さん"
linefw "ざんねんでした!"
linefw "かいだんを おりて"
linefw "おかえりください"
done
Text0e0a:
CupHostGRCup3Round1PlayerLostText:
textfw "なんと! ポケモンカードマスター"
linefw "<RAMNAME>さん やぶれました!"
linefw "<RAMTEXT>さんが"
@@ -475,48 +475,48 @@ Text0e0a:
linefw "あと ひとりで カードゲット!"
done
Text0e0b:
CupHostGRCup3Round1PlayerLostEliminatedText:
textfw "まけた<RAMNAME>さんは"
linefw "おひきとりください"
done
Text0e0c:
CupHostGRCupRound2ChallengerText:
textfw "あらたな チャレンジャーは"
linefw "<RAMTEXT>さんです!"
done
Text0e0d:
CupHostGRCupRound2The4PrizesMatchText:
textfw "こんどの対戦も"
linefw "サイドカード 4枚です"
done
Text0e0e:
CupHostGRCupAreYourDecksReadyText:
textfw "ふたりとも"
linefw "デッキのじゅんびは いいですか?"
done
Text0e0f:
CupHostGRCupMakeYourPreparationsText:
textfw "それでは"
linefw "じゅんびを してください!"
done
Text0e10:
CupHostGRCupRound2DuelStartText:
textfw "それでは <RAMNAME>さん!"
linefw "ふたりめの対戦! スタート!"
done
Text0e11:
CupHostGRCup1Round2PlayerWonText:
textfw "やりました! <RAMNAME>さん!"
linefw "みごとに ふたり 勝ちぬき!!"
linefw "ゆうしょうまで あと ひとりです!"
done
Text0e12:
CupHostGRCupRound2Or3PlayerWonOpponentEliminatedText:
textfw "<RAMTEXT>さんは ざんねんでした"
linefw "きをつけて おかえりください"
done
Text0e13:
CupHostGRCup1Or2Round2NextChallengerText:
textfw "さあ <RAMNAME>さんの"
linefw "さいごの対戦になるのか・・それとも"
linefw "つぎのチャレンジャーさんが"
@@ -525,40 +525,41 @@ Text0e13:
linefw "あがってきて ください"
done
Text0e14:
; just a space in CupHostGRCup1Round2PlayerWonText replaced by a linebreak
CupHostGRCup2Round2PlayerWonText:
textfw "やりました! <RAMNAME>さん"
linefw "みごとに ふたり 勝ちぬき!!"
linefw "ゆうしょうまで"
linefw "あと ひとりです!"
done
Text0e15:
CupHostGRCup3Round2PlayerWonText:
textfw "やりました <RAMNAME>さん!"
linefw "ふたり 勝ちぬきです!!"
linefw "つぎの対戦に 勝てば"
linefw "ゆうしょうです!"
done
Text0e16:
CupHostGRCup3Round2NextChallengerText:
textfw "これからの 対戦は"
linefw "サイドカード 6枚です!"
linefw "さあ GR団のどなたが"
linefw "対戦するのでしょうか?"
done
Text0e17:
CupHostGRCup1Or2Round2PlayerLostText:
textfw "<RAMTEXT>さんの勝ちです!"
linefw " "
linefw "<RAMTEXT>さん ひとり 勝ちぬき!"
linefw "あとふたりで ゆうしょうです!"
done
Text0e18:
CupHostGRCup1Or2Round2PlayerLostEliminatedText:
textfw "<RAMNAME>さんは ざんねんでした"
linefw "きをつけて おかえりください"
done
Text0e19:
CupHostGRCup3Round2PlayerLostText:
textfw "<RAMTEXT>さんが 勝ちました!"
linefw " "
linefw "ポケモンカードマスターを"
@@ -567,46 +568,46 @@ Text0e19:
linefw "あと ふたりで ゆうしょうです!"
done
Text0e1a:
CupHostGRCup3Round2PlayerLostEliminatedText:
textfw "やぶれた <RAMNAME>さんは"
linefw "ざんねんでした"
linefw "そちらの かいだんから"
linefw "きをつけて おかえりください"
done
Text0e1b:
CupHostGRCupRound3ChallengerText:
textfw "あらたな チャレンジャーは"
linefw "<RAMTEXT>さんです!"
done
Text0e1c:
CupHostGRCupRound3DuelStartText:
textfw "それでは <RAMNAME>さん!"
linefw "さんにんめの対戦! スタート!"
done
Text0e1d:
CupHostGRCup1Or2Round3PlayerWonText:
textfw "おめでとうございます!"
linefw "ついに さんにん勝ちぬきです!"
done
Text0e1e:
CupHostGRCup1Or2Round3PlayerChampionText:
textfw "GR団杯の ゆうしょうしゃは"
linefw "<RAMNAME>さんです!"
done
Text0e1f:
CupHostGRCup3Round3PlayerWonText:
textfw "おめでとうございます!"
linefw "れんぞく さんにん勝ちぬきです!"
done
Text0e20:
CupHostGRCup3Round3PlayerChampionText:
textfw "さあ こんかいの「キング杯」の"
linefw "ゆうしょうは"
linefw "ポケモンカードマスター"
linefw "<RAMNAME>さんです!!"
done
Text0e21:
CupHostGRCup1Or2Round3PlayerLostText:
textfw "<RAMTEXT>さんの勝ちです!"
linefw " "
linefw "<RAMNAME>さんの ゆうしょうを"
@@ -615,12 +616,12 @@ Text0e21:
linefw "あとふたりで ゆうしょうです!"
done
Text0e22:
CupHostGRCup1Or2Round3PlayerLostEliminatedText:
textfw "<RAMNAME>さんは ざんねんでした"
linefw "きをつけて おかえりください"
done
Text0e23:
CupHostGRCup3Round3PlayerLostText:
textfw "あー ざんねん!"
linefw "<RAMNAME>さん はいぼくです!!"
linefw "<RAMTEXT>さんの勝ちです!"
@@ -628,27 +629,27 @@ Text0e23:
linefw "あとふたりで ゆうしょうです!"
done
Text0e24:
CupHostGRCup3Round3PlayerLostEliminatedText:
textfw "<RAMNAME>さん"
linefw "おかえりください"
done
Text0e25:
CupHostGRCup1ChampionPrizeText:
textfw "それでは <RAMNAME>さん!"
linefw "「わるいペルシアン」を どうぞ!"
done
Text0e26:
CupHostGRCup2ChampionPrizeText:
textfw "それでは <RAMNAME>さん!"
linefw "「マサキのパソコン」を どうぞ!"
done
Text0e27:
CupHostGRCup3ChampionPrizeText:
textfw "それでは 賞品です!"
linefw "「<RAMTEXT>」!!"
done
Text0e28:
CupHostGRCupPlayer10TimesChampionText:
textfw "<RAMNAME>さん"
linefw "きづいておりましたか?"
linefw "こんかいで"
@@ -657,26 +658,26 @@ Text0e28:
linefw "きねんのコインを さしあげます!"
done
Text0e29:
CupHostGRCupPlayer10TimesChampionContinueText:
textfw "「タッツーコイン」!"
linefw "かわいがって あげてくださいね"
linefw "<RAMNAME>さん! ほんとうに!!"
linefw "おめでとう ございました!"
done
Text0e2a:
CupHostGRCupPlayerChampionCongratsText:
textfw "<RAMNAME>さん! ほんとうに"
linefw "おめでとう ございました!"
done
Text0e2b:
GRChallengeHallEntranceClerkGRCup1InactiveText:
textfw "ここでは GR団員による"
linefw "チャレンジカップが ひらかれます"
linefw "でも いまは じゅんび中です"
linefw "しばらく おまちください"
done
Text0e2c:
GRChallengeHallEntranceClerkGRCup1ActiveText:
textfw "ここは GR団の"
linefw "チャレンジホールです"
linefw "ここでは GR団員による"
@@ -687,7 +688,7 @@ Text0e2c:
linefw "おくに おすすみください"
done
Text0e2d:
GRChallengeHallEntranceClerkGRCup2ActiveText:
textfw "ここは GR団の"
linefw "チャレンジホールです"
linefw "ここでは GR団員による"
@@ -698,28 +699,28 @@ Text0e2d:
linefw "おくに おすすみください"
done
Text0e2e:
GRChallengeHallEntranceClerkGRCup2InactiveText:
textfw "ここでは GR団員による"
linefw "チャレンジカップが ひらかれます"
linefw "でも いまは じゅんび中です"
linefw "しばらく おまちください"
done
Text0e2f:
GRChallengeHallEntranceClerkGRCup3InactiveText:
textfw "ビルリッチさまが ひらく"
linefw "キング杯が かいさいされます"
linefw "いまは じゅんび中ですので"
linefw "しばらく おまちください"
done
Text0e30:
GRChallengeHallEntranceClerkGRCup3ActiveText:
textfw "ただいま ビルリッチさまの大会"
linefw "「キング杯」が おこなわれています"
linefw "しゅつじょうなさるのでしたら"
linefw "おくに おすすみください"
done
Text0e31:
GRChallengeHallEntranceClerkGRCupPlayedText:
textfw "大会は どうでしたか?"
linefw " "
linefw "いえ いえ けっかを"
@@ -788,7 +789,7 @@ Text0e39:
linefw "わたしは すっかり ラッキーよ!"
done
Text0e3a:
GRChallengeHallLobbyCupHostStandbyText:
textfw "あら <RAMNAME>くんも"
linefw "こっちに きたの?"
linefw "わたしよ わからない?"
@@ -799,7 +800,7 @@ Text0e3a:
linefw "しかいすると つかれるわー"
done
Text0e3b:
GRChallengeHallLobbyCupHostStandbyGRCup3Text:
textfw "こんど「キング杯」って いうのが"
linefw "おこなわれるんですって"
linefw "そのしかいも"

292
src/text/text_offsets.asm
View File

@@ -2388,74 +2388,74 @@ TextOffsets::
textpointer Text094b ; 0x094b
textpointer Text094c ; 0x094c
textpointer Text094d ; 0x094d
textpointer Text094e ; 0x094e
textpointer Text094f ; 0x094f
textpointer Text0950 ; 0x0950
textpointer Text0951 ; 0x0951
textpointer Text0952 ; 0x0952
textpointer Text0953 ; 0x0953
textpointer Text0954 ; 0x0954
textpointer Text0955 ; 0x0955
textpointer Text0956 ; 0x0956
textpointer Text0957 ; 0x0957
textpointer Text0958 ; 0x0958
textpointer Text0959 ; 0x0959
textpointer Text095a ; 0x095a
textpointer Text095b ; 0x095b
textpointer Text095c ; 0x095c
textpointer Text095d ; 0x095d
textpointer Text095e ; 0x095e
textpointer Text095f ; 0x095f
textpointer Text0960 ; 0x0960
textpointer Text0961 ; 0x0961
textpointer Text0962 ; 0x0962
textpointer Text0963 ; 0x0963
textpointer Text0964 ; 0x0964
textpointer Text0965 ; 0x0965
textpointer Text0966 ; 0x0966
textpointer Text0967 ; 0x0967
textpointer Text0968 ; 0x0968
textpointer Text0969 ; 0x0969
textpointer Text096a ; 0x096a
textpointer Text096b ; 0x096b
textpointer Text096c ; 0x096c
textpointer Text096d ; 0x096d
textpointer Text096e ; 0x096e
textpointer Text096f ; 0x096f
textpointer Text0970 ; 0x0970
textpointer Text0971 ; 0x0971
textpointer Text0972 ; 0x0972
textpointer Text0973 ; 0x0973
textpointer Text0974 ; 0x0974
textpointer Text0975 ; 0x0975
textpointer Text0976 ; 0x0976
textpointer Text0977 ; 0x0977
textpointer Text0978 ; 0x0978
textpointer Text0979 ; 0x0979
textpointer Text097a ; 0x097a
textpointer Text097b ; 0x097b
textpointer Text097c ; 0x097c
textpointer Text097d ; 0x097d
textpointer Text097e ; 0x097e
textpointer Text097f ; 0x097f
textpointer Text0980 ; 0x0980
textpointer Text0981 ; 0x0981
textpointer Text0982 ; 0x0982
textpointer Text0983 ; 0x0983
textpointer Text0984 ; 0x0984
textpointer Text0985 ; 0x0985
textpointer Text0986 ; 0x0986
textpointer Text0987 ; 0x0987
textpointer Text0988 ; 0x0988
textpointer Text0989 ; 0x0989
textpointer Text098a ; 0x098a
textpointer Text098b ; 0x098b
textpointer Text098c ; 0x098c
textpointer Text098d ; 0x098d
textpointer Text098e ; 0x098e
textpointer Text098f ; 0x098f
textpointer Text0990 ; 0x0990
textpointer Text0991 ; 0x0991
textpointer TCGCupClerkCup1ActiveText ; 0x094e
textpointer TCGCupClerkCup2ActiveText ; 0x094f
textpointer TCGCupClerkCup3ActiveText ; 0x0950
textpointer TCGCupClerkPlayerWonText ; 0x0951
textpointer TCGCupClerkPlayerLostText ; 0x0952
textpointer TCGCupClerkEnterPromptText ; 0x0953
textpointer TCGCupClerkEnterAcceptedText ; 0x0954
textpointer TCGCupClerkEnterDeclinedText ; 0x0955
textpointer TCGCupClerkRightNoEntryText ; 0x0956
textpointer TCGChallengeHallManNoCardsText ; 0x0957
textpointer TCGChallengeHallManGoodLuckText ; 0x0958
textpointer TCGChallengeHallManTCGCup3Text ; 0x0959
textpointer CupHostTCGCup1IntroText ; 0x095a
textpointer CupHostTCGCup1Round1ChallengerText ; 0x095b
textpointer CupHostTCGCup2IntroText ; 0x095c
textpointer CupHostTCGCup2Round1ChallengerText ; 0x095d
textpointer CupHostTCGCup3IntroText ; 0x095e
textpointer CupHostTCGCup3Round1ChallengerText ; 0x095f
textpointer CupHostTCGCupRound1DuelStartText ; 0x0960
textpointer CupHostTCGCup1Or2Round1PlayerWonText ; 0x0961
textpointer CupHostTCGCup1Round1NextChallengerText ; 0x0962
textpointer CupHostTCGCup2Round1NextChallengerText ; 0x0963
textpointer CupHostTCGCup3Round1PlayerWonText ; 0x0964
textpointer CupHostTCGCup3Round1NextChallengerText ; 0x0965
textpointer CupHostTCGCup1Round1PlayerLostText ; 0x0966
textpointer CupHostTCGCup2Round1PlayerLostText ; 0x0967
textpointer CupHostTCGCup3Round1PlayerLostText ; 0x0968
textpointer CupHostTCGCupPlayerWonOpponentEliminatedText ; 0x0969
textpointer CupHostTCGCupRound2ChallengerText ; 0x096a
textpointer CupHostTCGCupRound2The4PrizesMatchText ; 0x096b
textpointer CupHostTCGCupAreYourDecksReadyText ; 0x096c
textpointer CupHostTCGCupMakeYourPreparationsText ; 0x096d
textpointer CupHostTCGCupRound2DuelStartText ; 0x096e
textpointer CupHostTCGCupRound2PlayerWonText ; 0x096f
textpointer CupHostTCGCup1Round2NextChallengerText ; 0x0970
textpointer CupHostTCGCup2Round2NextChallengerText ; 0x0971
textpointer CupHostTCGCup3Round2NextChallengerText ; 0x0972
textpointer CupHostTCGCup1Or2Round2PlayerLostText ; 0x0973
textpointer CupHostTCGCup3Round2PlayerLostText ; 0x0974
textpointer CupHostTCGCup1Round3ChallengerText ; 0x0975
textpointer CupHostTCGCup2Round3ChallengerText ; 0x0976
textpointer CupHostTCGCup3Round3ChallengerClubMasterText ; 0x0977
textpointer CupHostTCGCup3Round3ChallengerGRText ; 0x0978
textpointer CupHostTCGCup3Round3ChallengerRonaldText ; 0x0979
textpointer RonaldTCGCup3ChallengerText ; 0x097a
textpointer CupHostTCGCupRound3The6PrizesMatchText ; 0x097b
textpointer CupHostTCGCupRound3DuelStartText ; 0x097c
textpointer CupHostTCGCupRound3PlayerWonText ; 0x097d
textpointer CupHostTCGCup1Or2PlayerChampionText ; 0x097e
textpointer CupHostTCGCup3PlayerChampionText ; 0x097f
textpointer CupHostTCGCup1Round3PlayerLostText ; 0x0980
textpointer CupHostTCGCup2Round3PlayerLostText ; 0x0981
textpointer CupHostTCGCup3Round3PlayerLostText ; 0x0982
textpointer CupHostTCGCup1ChampionPrizeText ; 0x0983
textpointer CupHostTCGCup2ChampionPrizeText ; 0x0984
textpointer CupHostTCGCup3ChampionPrizeText ; 0x0985
textpointer CupHostTCGCupPlayer10TimesChampionText ; 0x0986
textpointer CupHostTCGCupPlayer10TimesChampionContinueText ; 0x0987
textpointer CupHostTCGCupPlayerChampionCongratsText ; 0x0988
textpointer CupHostTCGCupPlayerLostEliminatedText ; 0x0989
textpointer TCGChallengeHallEntranceClerkNoCardsText ; 0x098a
textpointer TCGChallengeHallEntranceClerkTCGCup1ActiveText ; 0x098b
textpointer TCGChallengeHallEntranceClerkTCGCup1OverText ; 0x098c
textpointer TCGChallengeHallEntranceClerkTCGCup2ActiveText ; 0x098d
textpointer TCGChallengeHallEntranceClerkTCGCup2OverText ; 0x098e
textpointer TCGChallengeHallEntranceClerkTCGCup3InactiveText ; 0x098f
textpointer TCGChallengeHallEntranceClerkTCGCup3ActiveText ; 0x0990
textpointer TCGChallengeHallEntranceClerkTCGCupPlayedText ; 0x0991
textpointer Text0992 ; 0x0992
textpointer Text0993 ; 0x0993
textpointer Text0994 ; 0x0994
@@ -2481,8 +2481,8 @@ TextOffsets::
textpointer Text09a8 ; 0x09a8
textpointer Text09a9 ; 0x09a9
textpointer Text09aa ; 0x09aa
textpointer Text09ab ; 0x09ab
textpointer Text09ac ; 0x09ac
textpointer TCGChallengeHallLobbyCupHostNoCardsText ; 0x09ab
textpointer TCGChallengeHallLobbyCupHostStandbyText ; 0x09ac
textpointer Text09ad ; 0x09ad
textpointer Text09ae ; 0x09ae
textpointer Text09af ; 0x09af
@@ -3567,79 +3567,79 @@ TextOffsets::
textpointer Text0de6 ; 0x0de6
textpointer Text0de7 ; 0x0de7
textpointer Text0de8 ; 0x0de8
textpointer Text0de9 ; 0x0de9
textpointer Text0dea ; 0x0dea
textpointer Text0deb ; 0x0deb
textpointer Text0dec ; 0x0dec
textpointer Text0ded ; 0x0ded
textpointer Text0dee ; 0x0dee
textpointer Text0def ; 0x0def
textpointer Text0df0 ; 0x0df0
textpointer Text0df1 ; 0x0df1
textpointer Text0df2 ; 0x0df2
textpointer Text0df3 ; 0x0df3
textpointer Text0df4 ; 0x0df4
textpointer Text0df5 ; 0x0df5
textpointer Text0df6 ; 0x0df6
textpointer Text0df7 ; 0x0df7
textpointer Text0df8 ; 0x0df8
textpointer Text0df9 ; 0x0df9
textpointer Text0dfa ; 0x0dfa
textpointer Text0dfb ; 0x0dfb
textpointer Text0dfc ; 0x0dfc
textpointer Text0dfd ; 0x0dfd
textpointer Text0dfe ; 0x0dfe
textpointer Text0dff ; 0x0dff
textpointer Text0e00 ; 0x0e00
textpointer Text0e01 ; 0x0e01
textpointer Text0e02 ; 0x0e02
textpointer Text0e03 ; 0x0e03
textpointer Text0e04 ; 0x0e04
textpointer Text0e05 ; 0x0e05
textpointer Text0e06 ; 0x0e06
textpointer Text0e07 ; 0x0e07
textpointer Text0e08 ; 0x0e08
textpointer Text0e09 ; 0x0e09
textpointer Text0e0a ; 0x0e0a
textpointer Text0e0b ; 0x0e0b
textpointer Text0e0c ; 0x0e0c
textpointer Text0e0d ; 0x0e0d
textpointer Text0e0e ; 0x0e0e
textpointer Text0e0f ; 0x0e0f
textpointer Text0e10 ; 0x0e10
textpointer Text0e11 ; 0x0e11
textpointer Text0e12 ; 0x0e12
textpointer Text0e13 ; 0x0e13
textpointer Text0e14 ; 0x0e14
textpointer Text0e15 ; 0x0e15
textpointer Text0e16 ; 0x0e16
textpointer Text0e17 ; 0x0e17
textpointer Text0e18 ; 0x0e18
textpointer Text0e19 ; 0x0e19
textpointer Text0e1a ; 0x0e1a
textpointer Text0e1b ; 0x0e1b
textpointer Text0e1c ; 0x0e1c
textpointer Text0e1d ; 0x0e1d
textpointer Text0e1e ; 0x0e1e
textpointer Text0e1f ; 0x0e1f
textpointer Text0e20 ; 0x0e20
textpointer Text0e21 ; 0x0e21
textpointer Text0e22 ; 0x0e22
textpointer Text0e23 ; 0x0e23
textpointer Text0e24 ; 0x0e24
textpointer Text0e25 ; 0x0e25
textpointer Text0e26 ; 0x0e26
textpointer Text0e27 ; 0x0e27
textpointer Text0e28 ; 0x0e28
textpointer Text0e29 ; 0x0e29
textpointer Text0e2a ; 0x0e2a
textpointer Text0e2b ; 0x0e2b
textpointer Text0e2c ; 0x0e2c
textpointer Text0e2d ; 0x0e2d
textpointer Text0e2e ; 0x0e2e
textpointer Text0e2f ; 0x0e2f
textpointer Text0e30 ; 0x0e30
textpointer Text0e31 ; 0x0e31
textpointer GRChallengeMachineStaff50WinStreakRewards1Text ; 0x0de9
textpointer GRChallengeMachineStaff50WinStreakRewards2Text ; 0x0dea
textpointer GRCupClerkCup1ActiveText ; 0x0deb
textpointer GRCupClerkCup2ActiveText ; 0x0dec
textpointer GRCupClerkCup3ActiveText ; 0x0ded
textpointer GRCupClerkCup1PlayerWonText ; 0x0dee
textpointer GRCupClerkCup2PlayerWonText ; 0x0def
textpointer GRCupClerkCup3PlayerWonText ; 0x0df0
textpointer GRCupClerkPlayerLostText ; 0x0df1
textpointer GRCupClerkEnterPromptText ; 0x0df2
textpointer GRCupClerkEnterAcceptedText ; 0x0df3
textpointer GRCupClerkEnterDeclinedText ; 0x0df4
textpointer GRCupClerkRightNoEntryText ; 0x0df5
textpointer GRChallengeMachineStaffUnderConstructionInitialText ; 0x0df6
textpointer GRChallengeMachineStaffUnderConstructionRepeatText ; 0x0df7
textpointer GRChallengeMachineStaffWelcomeText ; 0x0df8
textpointer GRChallengeMachineStaffWelcome50WinStreakDoneText ; 0x0df9
textpointer CupHostGRCup1IntroText ; 0x0dfa
textpointer CupHostGRCup1Round1ChallengerText ; 0x0dfb
textpointer CupHostGRCup1Round1DuelStartText ; 0x0dfc
textpointer CupHostGRCup2IntroText ; 0x0dfd
textpointer CupHostGRCup2Round1ChallengerText ; 0x0dfe
textpointer CupHostGRCup3IntroText ; 0x0dff
textpointer CupHostGRCup3Round1ChallengerText ; 0x0e00
textpointer CupHostGRCup3Round1DuelStartText ; 0x0e01
textpointer CupHostGRCup1Or2Round1PlayerWonText ; 0x0e02
textpointer CupHostGRCup1Or2Round1PlayerWonOpponentEliminatedText ; 0x0e03
textpointer CupHostGRCup1Or2Round1NextChallengerText ; 0x0e04
textpointer CupHostGRCup3Round1PlayerWonText ; 0x0e05
textpointer CupHostGRCup3Round1PlayerWonOpponentEliminatedText ; 0x0e06
textpointer CupHostGRCup3Round1NextChallengerText ; 0x0e07
textpointer CupHostGRCup1Or2Round1PlayerLostText ; 0x0e08
textpointer CupHostGRCup1Or2Round1PlayerLostEliminatedText ; 0x0e09
textpointer CupHostGRCup3Round1PlayerLostText ; 0x0e0a
textpointer CupHostGRCup3Round1PlayerLostEliminatedText ; 0x0e0b
textpointer CupHostGRCupRound2ChallengerText ; 0x0e0c
textpointer CupHostGRCupRound2The4PrizesMatchText ; 0x0e0d
textpointer CupHostGRCupAreYourDecksReadyText ; 0x0e0e
textpointer CupHostGRCupMakeYourPreparationsText ; 0x0e0f
textpointer CupHostGRCupRound2DuelStartText ; 0x0e10
textpointer CupHostGRCup1Round2PlayerWonText ; 0x0e11
textpointer CupHostGRCupRound2Or3PlayerWonOpponentEliminatedText ; 0x0e12
textpointer CupHostGRCup1Or2Round2NextChallengerText ; 0x0e13
textpointer CupHostGRCup2Round2PlayerWonText ; 0x0e14
textpointer CupHostGRCup3Round2PlayerWonText ; 0x0e15
textpointer CupHostGRCup3Round2NextChallengerText ; 0x0e16
textpointer CupHostGRCup1Or2Round2PlayerLostText ; 0x0e17
textpointer CupHostGRCup1Or2Round2PlayerLostEliminatedText ; 0x0e18
textpointer CupHostGRCup3Round2PlayerLostText ; 0x0e19
textpointer CupHostGRCup3Round2PlayerLostEliminatedText ; 0x0e1a
textpointer CupHostGRCupRound3ChallengerText ; 0x0e1b
textpointer CupHostGRCupRound3DuelStartText ; 0x0e1c
textpointer CupHostGRCup1Or2Round3PlayerWonText ; 0x0e1d
textpointer CupHostGRCup1Or2Round3PlayerChampionText ; 0x0e1e
textpointer CupHostGRCup3Round3PlayerWonText ; 0x0e1f
textpointer CupHostGRCup3Round3PlayerChampionText ; 0x0e20
textpointer CupHostGRCup1Or2Round3PlayerLostText ; 0x0e21
textpointer CupHostGRCup1Or2Round3PlayerLostEliminatedText ; 0x0e22
textpointer CupHostGRCup3Round3PlayerLostText ; 0x0e23
textpointer CupHostGRCup3Round3PlayerLostEliminatedText ; 0x0e24
textpointer CupHostGRCup1ChampionPrizeText ; 0x0e25
textpointer CupHostGRCup2ChampionPrizeText ; 0x0e26
textpointer CupHostGRCup3ChampionPrizeText ; 0x0e27
textpointer CupHostGRCupPlayer10TimesChampionText ; 0x0e28
textpointer CupHostGRCupPlayer10TimesChampionContinueText ; 0x0e29
textpointer CupHostGRCupPlayerChampionCongratsText ; 0x0e2a
textpointer GRChallengeHallEntranceClerkGRCup1InactiveText ; 0x0e2b
textpointer GRChallengeHallEntranceClerkGRCup1ActiveText ; 0x0e2c
textpointer GRChallengeHallEntranceClerkGRCup2ActiveText ; 0x0e2d
textpointer GRChallengeHallEntranceClerkGRCup2InactiveText ; 0x0e2e
textpointer GRChallengeHallEntranceClerkGRCup3InactiveText ; 0x0e2f
textpointer GRChallengeHallEntranceClerkGRCup3ActiveText ; 0x0e30
textpointer GRChallengeHallEntranceClerkGRCupPlayedText ; 0x0e31
textpointer Text0e32 ; 0x0e32
textpointer Text0e33 ; 0x0e33
textpointer Text0e34 ; 0x0e34
@@ -3648,8 +3648,8 @@ TextOffsets::
textpointer Text0e37 ; 0x0e37
textpointer Text0e38 ; 0x0e38
textpointer Text0e39 ; 0x0e39
textpointer Text0e3a ; 0x0e3a
textpointer Text0e3b ; 0x0e3b
textpointer GRChallengeHallLobbyCupHostStandbyText ; 0x0e3a
textpointer GRChallengeHallLobbyCupHostStandbyGRCup3Text ; 0x0e3b
textpointer Text0e3c ; 0x0e3c
textpointer Text0e3d ; 0x0e3d
textpointer Text0e3e ; 0x0e3e
@@ -3852,7 +3852,7 @@ TextOffsets::
textpointer Text0f03 ; 0x0f03
textpointer Text0f04 ; 0x0f04
textpointer Text0f05 ; 0x0f05
textpointer Text0f06 ; 0x0f06
textpointer ChallengeMachineWinStreakRecordCorruptedAndResetText ; 0x0f06
textpointer Text0f07 ; 0x0f07
textpointer Text0f08 ; 0x0f08
textpointer Text0f09 ; 0x0f09

9
src/wram.asm
View File

@@ -2319,10 +2319,17 @@ wFilteredListPtr:: ; d575
; TODO: is this really union?
UNION
wNumChallengeCupOpponents:: ; d577
ds $1
wChallengeCupIndex:: ; d578
ds $1
NEXTU
wRemainingIntroCards:: ; d577
ds $1
wd578:: ; d578
ds $1
wd579:: ; d579

20
tools/constants.py
View File

@@ -2996,18 +2996,18 @@ vars = [
"VAR_25",
"VAR_26",
"VAR_27",
"VAR_28",
"VAR_TCG_CHALLENGE_CUP_STATE",
"VAR_TCG_CHALLENGE_CUP_PRIZE_INDEX",
"VAR_2A",
"VAR_2B",
"VAR_2C",
"VAR_2D",
"VAR_2E",
"VAR_2F",
"VAR_30",
"VAR_TIMES_WON_TCG_CHALLENGE_CUP",
"VAR_TCG_CHALLENGE_CUP_RESULT",
"VAR_CHALLENGECUP_CURRENT_ROUND",
"VAR_CHALLENGECUP_ROUND1_OPPONENT_DECK_ID",
"VAR_CHALLENGECUP_ROUND2_OPPONENT_DECK_ID",
"VAR_CHALLENGECUP_ROUND3_OPPONENT_DECK_ID",
"VAR_GR_CHALLENGE_CUP_STATE",
"VAR_GR_CHALLENGE_CUP_PRIZE_INDEX",
"VAR_32",
"VAR_33",
"VAR_TIMES_WON_GR_CHALLENGE_CUP",
"VAR_GR_CHALLENGE_CUP_RESULT",
"VAR_34",
"VAR_35",
"VAR_36",