More home disasm and misc

8 files changed, 69 insertions, 22 deletions

diff --git a/src/audio/music1.asm b/src/audio/music1.asm
index 11394a3..16f6a9a 100755
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -1890,5 +1890,5 @@ INCLUDE "audio/music/boosterpack.asm"
 INCLUDE "audio/music/medal.asm"
 
 rept $138
-db $ff
+	db $ff
 endr
diff --git a/src/audio/music2.asm b/src/audio/music2.asm
index fd67ae2..3af0181 100755
--- a/src/audio/music2.asm
+++ b/src/audio/music2.asm
@@ -1884,5 +1884,5 @@ INCLUDE "audio/music/hallofhonor.asm"
 INCLUDE "audio/music/credits.asm"
 
 rept $109
-db $ff
+	db $ff
 endr
diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm
index a94596d..cfd34eb 100755
--- a/src/audio/sfx.asm
+++ b/src/audio/sfx.asm
@@ -595,5 +595,5 @@ INCLUDE "audio/sfx/sfx_5e.asm"
 INCLUDE "audio/sfx/sfx_5f.asm"
 
 rept $c1
-db $ff
+	db $ff
 endr
diff --git a/src/data/cards.asm b/src/data/cards.asm
index a316554..d8dc226 100755
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -10222,5 +10222,5 @@ RecycleCard: ; 33fd3 (c:7fd3)
 	dw NONE ; description (cont)
 
 rept $1f
-db $ff
+	db $ff
 endr
diff --git a/src/engine/home.asm b/src/engine/home.asm
index b70afec..d2ed134 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -2796,7 +2796,8 @@ _GetCardInDeckPosition: ; 1362 (0:1362)
 	ld a, [hl]
 	pop de
 	ret
-
+

+; load data of card in position a to wLoadedCard1
 LoadDeckCardToBuffer1: ; 1376 (0:1376)
 	push hl
 	push de
@@ -2812,7 +2813,8 @@ LoadDeckCardToBuffer1: ; 1376 (0:1376)
 	pop de
 	pop hl
 	ret
-
+

+; load data of card in position a to wLoadedCard2
 LoadDeckCardToBuffer2: ; 138c (0:138c)
 	push hl
 	push de
@@ -3309,8 +3311,27 @@ CheckSelfConfusionDamage: ; 18d7 (0:18d7)
 	ret
 ; 0x18f9
 
-	INCROM $18f9, $195c
-
+	INCROM $18f9, $1944
+

+; this loads HP and Stage (1 byte each) of card with id at $ff9f into wLoadedMoveEffectCommands

+Func_1944: ; 1944 (0:1944)

+	ld a, [$ff9f]

+	call LoadDeckCardToBuffer1

+	ld hl, wLoadedCard1HP

+	ld de, wLoadedMoveEffectCommands

+	ld a, [hli]

+	ld [de], a

+	inc de

+	ld a, [hl]

+	ld [de], a

+	ret

+; 0x1955

+

+Func_1955: ; 1955 (0:1955)

+	push af

+	ld a, $7a

+	ld [wLoadedMoveAnimation], a

+	pop af
 ; this function appears to apply several damage modifiers
 Func_195c: ; 195c (0:195c)
 	ld hl, wDamage
@@ -5178,8 +5199,9 @@ Func_29f5: ; 29f5 (0:29f5)
 	ret
 ; 0x29fa
 
-	INCROM $29fa, $2a00
-
+Func_29fa: ; 29fa (0:29fa)

+	ld bc, $0f00

+	call Func_2a1a
 Func_2a00: ; 2a00 (0:2a00)
 	call DoFrame
 	call HandleTextBoxInput
@@ -5200,17 +5222,17 @@ Func_2a1a: ; 2a1a (0:2a1a)
 	xor a
 	ld hl, wCurMenuItem
 	ld [hli], a
-	ld [hl], d
+	ld [hl], d ; wCursorXPosition
 	inc hl
-	ld [hl], e
+	ld [hl], e ; wCursorYPosition
 	inc hl
-	ld [hl], $0
+	ld [hl], $0 ; wYDisplacementBetweenMenuItems
 	inc hl
-	ld [hl], $1
+	ld [hl], $1 ; wNumMenuItems
 	inc hl
-	ld [hl], b
+	ld [hl], b ; wCursorTileNumber
 	inc hl
-	ld [hl], c
+	ld [hl], c ; wTileBehindCursor
 	ld [wCursorBlinkCounter], a
 	ret
 ; 0x2a30
@@ -8000,5 +8022,5 @@ Bankswitch3d: ; 3fe0 (0:3fe0)
 	ret
 
 rept $a
-db $ff
+	db $ff
 endr
diff --git a/src/gfx.asm b/src/gfx.asm
index 7dc7dd0..7ee87f7 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -15,7 +15,7 @@ INCBIN "gfx/duel/duel1.t5.2bpp",$1698,$318
 INCBIN "gfx/duel/duel2.2bpp"
 
 rept $2b68
-db $ff
+	db $ff
 endr
 
 SECTION "Empty Bank 1F", ROMX
@@ -215,7 +215,7 @@ Unnamed5Gfx: ; 93fda (24:7fda)
 	INCBIN "gfx/unnamed/5.2bpp"
 
 rept $4
-db $ff
+	db $ff
 endr
 
 SECTION "Gfx 7", ROMX
@@ -424,7 +424,7 @@ Unnamed9Gfx: ; 9ffda (27:7fda)
 	INCBIN "gfx/unnamed/9.2bpp"
 
 rept $4
-db $ff
+	db $ff
 endr
 
 SECTION "Gfx 10", ROMX
@@ -1820,7 +1820,7 @@ RecycleCardGfx:: ; ef388 (3b:7388)
 	INCBIN "gfx/cards/recycle.pal"
 
 rept $970
-db $ff
+	db $ff
 endr
 
 SECTION "Empty Bank 3C", ROMX
diff --git a/src/text/text13.asm b/src/text/text13.asm
index dea889e..6dec01b 100644
--- a/src/text/text13.asm
+++ b/src/text/text13.asm
@@ -185,5 +185,5 @@ RecycleDescription: ; 6495e (19:495e)
 	done
 
 rept $3655
-db $ff
+	db $ff
 endr
diff --git a/src/wram.asm b/src/wram.asm
index 74b5ce8..bfa2cfb 100755
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -7,6 +7,7 @@ SECTION "WRAM Temp Card Collection", WRAM0
 
 wTempCardCollection:: ; c000
 	ds $100
+
 	ds $100
 
 SECTION "WRAM Duel Variables", WRAM0
@@ -26,6 +27,7 @@ wPlayerDuelVariables:: ; c200
 ;	$1X - bench (where X is bench position from 1 to 5)
 wPlayerCardLocations:: ; c200
 	ds DECK_SIZE
+
 	ds $6
 
 ; Which cards are in player's hand, as numbers 0 to 59
@@ -50,6 +52,7 @@ wPlayerArenaCard:: ; c2bb
 ; Which cards are in player's bench, as numbers 0 to 59
 wPlayerBench:: ; c2bc
 	ds BENCH_SIZE
+
 	ds $7
 
 wPlayerArenaCardHP:: ; c2c8
@@ -64,6 +67,7 @@ wPlayerBench4CardHP:: ; c2cc
 	ds $1
 wPlayerBench5CardHP:: ; c2cd
 	ds $1
+
 	ds $19
 
 wPlayerArenaCardSubstatus1:: ; c2e7
@@ -107,12 +111,14 @@ wPlayerDuelistType:: ; c2f1
 ; if under the effects of amnesia, which move (0 or 1) can't be used
 wPlayerArenaCardDisabledMoveIndex:: ; c2f2
 	ds $1
+
 	ds $d
 
 wOpponentDuelVariables:: ; c300
 
 wOpponentCardLocations:: ; c300
 	ds DECK_SIZE
+
 	ds $6
 
 wOpponentHand:: ; c342
@@ -129,6 +135,7 @@ wOpponentArenaCard:: ; c3bb
 
 wOpponentBench:: ; c3bc
 	ds BENCH_SIZE
+
 	ds $7
 
 wOpponentArenaCardHP:: ; c3c8
@@ -143,6 +150,7 @@ wOpponentBench4CardHP:: ; c3cc
 	ds $1
 wOpponentBench5CardHP:: ; c3cd
 	ds $1
+
 	ds $19
 
 wOpponentArenaCardSubstatus1:: ; c3e7
@@ -183,6 +191,7 @@ wOpponentDuelistType:: ; c3f1
 
 wOpponentArenaCardDisabledMoveIndex:: ; c3f2
 	ds $1
+
 	ds $d
 
 wPlayerDeck:: ; c400
@@ -190,6 +199,7 @@ wPlayerDeck:: ; c400
 
 wOpponentDeck:: ; c480
 	ds $80
+
 	ds $10
 
 ; this holds a list of cards (e.g. in hand or in bench) or the attack list of a pokemon card
@@ -252,6 +262,7 @@ wIE:: ; cab7
 
 wVBlankCtr:: ; cab8
 	ds $1
+
 	ds $1
 
 ; bit0: is in vblank interrupt?
@@ -321,6 +332,7 @@ wcad4:: ; cad4
 
 wcad5:: ; cad5
 	ds $1
+
 	ds $8
 
 wcade:: ; cade
@@ -331,6 +343,7 @@ wcae2:: ; cae2
 
 wBufPalette:: ; caf0
 	ds $80
+
 	ds $4
 
 SECTION "WRAM Serial transfer bytes", WRAM0
@@ -349,6 +362,7 @@ wSerialCounter2:: ; cb77
 
 wSerialTimeoutCounter:: ; cb78
 	ds $1
+
 	ds $4
 
 wSerialSendSave:: ; cb7d
@@ -380,6 +394,7 @@ wSerialRecvIndex:: ; cba4
 
 wSerialRecvBuf:: ; cba5 - cbc4
 	ds $20
+
 	ds $1
 
 SECTION "WRAM Duels", WRAM0
@@ -395,6 +410,7 @@ wCurrentDuelMenuItem:: ; cbc6
 ; For Trainer cards, $d or $e (two pages for trainer card descriptions)
 wCardPageNumber:: ; cbc7
 	ds $1
+
 	ds $1
 
 wcbc9:: ; cbc9
@@ -402,6 +418,7 @@ wcbc9:: ; cbc9
 
 wBenchSelectedPokemon:: ; cbcb
 	ds $1
+
 	ds $2
 
 wAttachedEnergiesAccum:: ; cbce
@@ -471,6 +488,7 @@ wcc0d:: ; cc0d
 ; beginning of DeckPointers
 wOpponentDeckId:: ; cc0e
 	ds $1
+
 	ds $1
 
 wcc10:: ; cc10
@@ -484,6 +502,7 @@ wcc12:: ; cc12
 
 wIsPracticeDuel:: ; cc13
 	ds $1
+
 	ds $1
 
 wcc15:: ; cc15
@@ -601,6 +620,7 @@ SECTION "WRAM Engine 2", WRAM0
 ; For example the value 4 seems to be used a lot during duels.
 wFrameType:: ; ccf3
 	ds $1
+
 	ds $10
 
 wcd04:: ; cd04
@@ -629,6 +649,7 @@ wcd0b:: ; cd0b
 
 wUppercaseFlag:: ; cd0d
 	ds $1
+
 	ds $1
 
 ; Handles timing of (horizontal or vertical) arrow blinking while waiting for user input.
@@ -655,6 +676,7 @@ wCursorTileNumber:: ; cd15
 
 wTileBehindCursor:: ; cd16
 	ds $1
+
 	ds $81
 
 wcd98:: ; cd98
@@ -909,10 +931,12 @@ wPCPackSelection:: ; d11d
 ; 7th bit of each pack corresponds to whether or not it's been read
 wPCPacks:: ; d11e
 	ds $c
+
 	ds $3
 
 wPCLastDirectionPressed:: ; d12d
 	ds $1
+
 	ds $3
 
 wd131:: ; d131
@@ -1217,6 +1241,7 @@ wBoosterDataEnergyFunctionPointer:: ; d687
 
 wBoosterDataTypeChanceData:: ; d689
 	ds $9
+
 	ds $6ee
 
 SECTION "WRAM Music", WRAMX