From 484647328ee2f73288940774f26396819f513988 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 1 Dec 2020 20:23:41 -0500 Subject: Still a WIP in disassembling --- src/engine/bank01.asm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) (limited to 'src/engine') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 1c003e2..1ee7282 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8142,7 +8142,59 @@ _TossCoin: ; 71ad (1:71ad) ret ; 0x72ff - INCROM $72ff, $7354 +Func_72ff: ; 72ff (1:72ff) + ldh [hff96], a + ld a, [wDuelType] + cp $01 + ret nz + ldh a, [hff96] + call SerialSendByte + call Func_7344 + ret +; 0x7310 + +Func_7310: ; 7310 (1:7310) + ldh [hff96], a + ld a, [wDuelType] + cp $01 + jr z, .asm_7338 +.asm_7319 + call DoFrame + call CheckAnyAnimationPlaying + jr c, .asm_7319 + ldh a, [hff96] + ret + ldh [hff96], a + ld a, [wDuelType] + cp $01 + jr z, .asm_7338 + ld a, $1e +.asm_732f + call DoFrame + dec a + jr nz, .asm_732f + ldh a, [hff96] + ret +.asm_7338 + call DoFrame + call SerialRecvByte + jr c, .asm_7338 + call Func_7344 + ret +; 0x7344 + +Func_7344: ; 7344 (1:7344) + push af + ld a, [wSerialFlags] + or a + jr nz, .asm_734d + pop af + ret +.asm_734d + call Func_3b31 + call DuelTransmissionError + ret +; 0x7354 BuildVersion: ; 7354 (1:7354) db "VER 12/20 09:36", TX_END -- cgit v1.2.3 From 34c989de1288fbd2ccdaa6caa8ace5f1a18a643b Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 1 Dec 2020 20:41:14 -0500 Subject: Still a WIP --- src/engine/bank01.asm | 107 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 1ee7282..9d5808f 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8166,7 +8166,7 @@ Func_7310: ; 7310 (1:7310) ret ldh [hff96], a ld a, [wDuelType] - cp $01 + cp CONFUSED jr z, .asm_7338 ld a, $1e .asm_732f @@ -8199,7 +8199,110 @@ Func_7344: ; 7344 (1:7344) BuildVersion: ; 7354 (1:7354) db "VER 12/20 09:36", TX_END - INCROM $7364, $7415 +Func_7364: ; 7364 (1:7364) + xor a + ld [wTileMapFill], a + call ZeroObjectPositionsAndToggleOAMCopy + call EmptyScreen + call LoadSymbolsFont + ld de, $389f + call SetupText + call DrawWideTextBox + call EnableLCD + xor a + ld [wOpponentDeckID], a + call Func_73d8 +.asm_7384 + call DoFrame + ldh a, [hDPadHeld] + or a + jr z, .asm_7384 + ld b, a + and $09 + jr nz, .asm_73cd + bit 1, b + jr nz, .asm_73cb + ld a, [wOpponentDeckID] + bit 4, b + jr z, .asm_73a2 + inc a + cp $35 + jr c, .asm_73a2 + xor a +.asm_73a2 + bit 5, b + jr z, .asm_73ae + or a + jr nz, .asm_73ad + ld a, $34 + jr .asm_73ae +.asm_73ad + dec a +.asm_73ae + bit 6, b + jr z, .asm_73b9 + add $0a + cp $35 + jr c, .asm_73b9 + xor a +.asm_73b9 + bit 7, b + jr z, .asm_73c3 + sub $0a + jr nc, .asm_73c3 + ld a, $34 +.asm_73c3 + ld [wOpponentDeckID], a + call Func_73d8 + jr .asm_7384 +.asm_73cb + scf + ret +.asm_73cd + ld a, [wOpponentDeckID] + ld [wcc19], a + call Func_3ae8 + or a + ret +; 0x73d8 + +Func_73d8: ; 73d8 (1:73d8) + ld a, [wOpponentDeckID] + ld [wcc19], a + call Func_3ae8 + jr c, .asm_73ec + xor a + ld [wOpponentPortrait], a + ld hl, wOpponentName + ld [hli], a + ld [hl], a +.asm_73ec + ld hl, $7408 + call PlaceTextItems + call DrawDuelistPortraitsAndNames + ld a, [wOpponentDeckID] + ld bc, $510 + call WriteTwoByteNumberInTxSymbolFormat + ld a, [wcc18] + ld bc, $f0a + call WriteTwoByteNumberInTxSymbolFormat + ret +; 0x7408 + +Func_7408: ; 7408 (1:7408) + ld a, [bc] + nop + adc c + nop + ld a, [bc] + ld a, [bc] + adc e + nop + inc bc + ld c, $8a + nop + debug_ret +; 0x7415 Func_7415: ; 7415 (1:7415) xor a -- cgit v1.2.3 From 29b3f7ffe3400eb4e4c70045d2239cc0de0f312e Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Wed, 2 Dec 2020 18:17:14 -0500 Subject: Replaced -bash1 with DUELTYPE_LINK --- src/engine/bank01.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 9d5808f..d0e57fc 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8145,7 +8145,7 @@ _TossCoin: ; 71ad (1:71ad) Func_72ff: ; 72ff (1:72ff) ldh [hff96], a ld a, [wDuelType] - cp $01 + cp DUELTYPE_LINK ret nz ldh a, [hff96] call SerialSendByte -- cgit v1.2.3 From 3aa0f86bb581f3289be567a63289551494ba3f9a Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Wed, 2 Dec 2020 18:24:48 -0500 Subject: CONFUSED gets replaced with something more appropriate --- src/engine/bank01.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index d0e57fc..251cc6c 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8166,7 +8166,7 @@ Func_7310: ; 7310 (1:7310) ret ldh [hff96], a ld a, [wDuelType] - cp CONFUSED + cp DUELTYPE_LINK jr z, .asm_7338 ld a, $1e .asm_732f -- cgit v1.2.3 From a8f619e006bbedaf6c7ccd25c1c949f073f5958e Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Wed, 2 Dec 2020 18:36:22 -0500 Subject: Got rid of unnecessary routine --- src/engine/bank01.asm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 251cc6c..03b86d8 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8289,20 +8289,7 @@ Func_73d8: ; 73d8 (1:73d8) ret ; 0x7408 -Func_7408: ; 7408 (1:7408) - ld a, [bc] - nop - adc c - nop - ld a, [bc] - ld a, [bc] - adc e - nop - inc bc - ld c, $8a - nop - debug_ret -; 0x7415 + INCROM $7408, $7415 Func_7415: ; 7415 (1:7415) xor a -- cgit v1.2.3 From 57ca3334247ef444e411911793be242e3bebba29 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Sat, 5 Dec 2020 23:42:33 -0500 Subject: More fixing --- src/engine/bank01.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 03b86d8..ed424f1 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8156,7 +8156,7 @@ Func_72ff: ; 72ff (1:72ff) Func_7310: ; 7310 (1:7310) ldh [hff96], a ld a, [wDuelType] - cp $01 + cp DUELTYPE_LINK jr z, .asm_7338 .asm_7319 call DoFrame @@ -8205,7 +8205,7 @@ Func_7364: ; 7364 (1:7364) call ZeroObjectPositionsAndToggleOAMCopy call EmptyScreen call LoadSymbolsFont - ld de, $389f + lb de, $38, $9f call SetupText call DrawWideTextBox call EnableLCD @@ -8250,7 +8250,7 @@ Func_7364: ; 7364 (1:7364) jr z, .asm_73c3 sub $0a jr nc, .asm_73c3 - ld a, $34 + ld a, FLAMETHROWER_DECK .asm_73c3 ld [wOpponentDeckID], a call Func_73d8 @@ -8281,10 +8281,10 @@ Func_73d8: ; 73d8 (1:73d8) call PlaceTextItems call DrawDuelistPortraitsAndNames ld a, [wOpponentDeckID] - ld bc, $510 + lb bc, 5, 16 call WriteTwoByteNumberInTxSymbolFormat ld a, [wcc18] - ld bc, $f0a + lb bc, 15, 10 call WriteTwoByteNumberInTxSymbolFormat ret ; 0x7408 -- cgit v1.2.3 From 342ba196ba6efb71c03622e625a54038154a6064 Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Mon, 7 Dec 2020 17:45:21 -0500 Subject: A bit more improvements --- src/engine/bank01.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index ed424f1..833b064 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8250,7 +8250,7 @@ Func_7364: ; 7364 (1:7364) jr z, .asm_73c3 sub $0a jr nc, .asm_73c3 - ld a, FLAMETHROWER_DECK + ld a, FLAMETHROWER_DECK_ID .asm_73c3 ld [wOpponentDeckID], a call Func_73d8 -- cgit v1.2.3 From b217f4509508a5c16540fa00f1ec458c8984846a Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Mon, 7 Dec 2020 17:56:31 -0500 Subject: Replaced hex values with constants --- src/engine/bank01.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 833b064..53f5851 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8168,7 +8168,7 @@ Func_7310: ; 7310 (1:7310) ld a, [wDuelType] cp DUELTYPE_LINK jr z, .asm_7338 - ld a, $1e + ld a, 30 .asm_732f call DoFrame dec a @@ -8218,39 +8218,39 @@ Func_7364: ; 7364 (1:7364) or a jr z, .asm_7384 ld b, a - and $09 + and A_BUTTON | START jr nz, .asm_73cd - bit 1, b + bit B_BUTTON_F, b jr nz, .asm_73cb ld a, [wOpponentDeckID] - bit 4, b + bit D_RIGHT_F, b jr z, .asm_73a2 inc a - cp $35 + cp DECK_IDS_END jr c, .asm_73a2 xor a .asm_73a2 - bit 5, b + bit D_LEFT_F, b jr z, .asm_73ae or a jr nz, .asm_73ad - ld a, $34 + ld a, IMAKUNI_DECK_ID jr .asm_73ae .asm_73ad dec a .asm_73ae - bit 6, b + bit D_UP_F, b jr z, .asm_73b9 add $0a cp $35 jr c, .asm_73b9 xor a .asm_73b9 - bit 7, b + bit D_DOWN_F, b jr z, .asm_73c3 sub $0a jr nc, .asm_73c3 - ld a, FLAMETHROWER_DECK_ID + ld a, FLAMETHROWER_DECK .asm_73c3 ld [wOpponentDeckID], a call Func_73d8 -- cgit v1.2.3 From dec84633711c8f3a1f5c8d815fb41dfcc58a809e Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 8 Dec 2020 14:35:10 -0500 Subject: Changed hex value to IMAKUNI_DECK_ID --- src/engine/bank01.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 53f5851..c18629f 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8226,7 +8226,7 @@ Func_7364: ; 7364 (1:7364) bit D_RIGHT_F, b jr z, .asm_73a2 inc a - cp DECK_IDS_END + cp $35 jr c, .asm_73a2 xor a .asm_73a2 @@ -8250,7 +8250,7 @@ Func_7364: ; 7364 (1:7364) jr z, .asm_73c3 sub $0a jr nc, .asm_73c3 - ld a, FLAMETHROWER_DECK + ld a, IMAKUNI_DECK_ID .asm_73c3 ld [wOpponentDeckID], a call Func_73d8 -- cgit v1.2.3