Mobile and more battle anims

6 files changed, 29 insertions, 20 deletions

diff --git a/engine/battle_start.asm b/engine/battle_start.asm
index bae6be09c..49f8099ba 100644
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
@@ -40,8 +40,8 @@ Predef_StartBattle: ; 8c20f
 	call DelayFrame
 	xor a
 	ld [hFFC6], a
-	ld [hFFC7], a
-	ld [hFFC8], a
+	ld [hLYOverrideStart], a
+	ld [hLYOverrideEnd], a
 	ld [hSCY], a
 
 	ld a, $1
@@ -305,9 +305,9 @@ StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
 	ld a, $43
 	ld [hFFC6], a
 	xor a
-	ld [hFFC7], a
+	ld [hLYOverrideStart], a
 	ld a, $90
-	ld [hFFC8], a
+	ld [hLYOverrideEnd], a
 	xor a
 	ld [wcf64], a
 	ld [wcf65], a
diff --git a/engine/color.asm b/engine/color.asm
index faf102867..74d194176 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -138,6 +138,7 @@ Function8b07:
 ; Unreferenced
 	call CheckCGB
 	ret z
+; CGB only
 	ld hl, .BGPal
 	ld de, UnknBGPals
 	ld bc, 1 palettes
@@ -534,9 +535,9 @@ CopyPalettes:
 GetPredefPal:
 	ld l, a
 	ld h, $0
-rept 3 ; multiply by 8
 	add hl, hl
-endr
+	add hl, hl
+	add hl, hl
 	ld bc, Palettes_9df6
 	add hl, bc
 	ret
@@ -924,9 +925,10 @@ PushSGBPals:
 	jr nz, .loop
 	ret
 
-Function9853:
+InitSGBBorder:
 	call CheckCGB
 	ret nz
+; SGB/DMG only
 	di
 	ld a, [wcfbe]
 	push af
@@ -936,7 +938,7 @@ Function9853:
 	ld [rJOYP], a
 	ld [hSGB], a
 	call Function994a
-	jr nc, .asm_988a
+	jr nc, .skip
 	ld a, $1
 	ld [hSGB], a
 	call Function98eb
@@ -949,15 +951,16 @@ Function9853:
 	ld hl, PalPacket_9d66
 	call PushSGBPals
 
-.asm_988a
+.skip
 	pop af
 	ld [wcfbe], a
 	ei
 	ret
 
-Function9890::
+InitCGBPals::
 	call CheckCGB
 	ret z
+; CGB only
 	ld a, $1
 	ld [rVBK], a
 	ld hl, VTiles0
@@ -1123,7 +1126,7 @@ Function99ab:
 
 Function99b4:
 	call DisableLCD
-	ld a, $e4
+	ld a, %11100100
 	ld [rBGP], a
 	ld hl, Palettes_9df6
 	ld de, VTiles1
@@ -1198,25 +1201,27 @@ Function9a24:
 
 CopyData: ; 0x9a52
 ; copy bc bytes of data from hl to de
+.loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	dec bc
 	ld a, c
 	or b
-	jr nz, CopyData
+	jr nz, .loop
 	ret
 ; 0x9a5b
 
 ClearBytes: ; 0x9a5b
 ; clear bc bytes of data starting from de
+.loop
 	xor a
 	ld [de], a
 	inc de
 	dec bc
 	ld a, c
 	or b
-	jr nz, ClearBytes
+	jr nz, .loop
 	ret
 ; 0x9a64
 
diff --git a/engine/link.asm b/engine/link.asm
index 788ee22a2..6826d0993 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -431,10 +431,12 @@ Gen2ToGen2LinkComms: ; 28177
 	ld bc, NAME_LENGTH
 	call CopyBytes
 	call ReturnToMapFromSubmenu
-	ld a, [wc2d7]
+
+	; LET'S DO THIS
+	ld a, [wDisableTextAcceleration]
 	push af
-	ld a, $1
-	ld [wc2d7], a
+	ld a, 1
+	ld [wDisableTextAcceleration], a
 	ld a, [rIE]
 	push af
 	ld a, [rIF]
@@ -446,7 +448,9 @@ Gen2ToGen2LinkComms: ; 28177
 	ld [rIE], a
 	pop af
 	ld [rIF], a
+
 	predef StartBattle
+
 	ld a, [rIF]
 	ld h, a
 	xor a
@@ -456,7 +460,7 @@ Gen2ToGen2LinkComms: ; 28177
 	ld a, h
 	ld [rIF], a
 	pop af
-	ld [wc2d7], a
+	ld [wDisableTextAcceleration], a
 	pop af
 	ld [Options], a
 	callba LoadPokemonData
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index bad1682c7..b00f1a875 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -4,7 +4,7 @@ INCBIN "gfx/unknown/049c0c.2bpp"
 
 MainMenu: ; 49cdc
 	xor a
-	ld [wc2d7], a
+	ld [wDisableTextAcceleration], a
 	call Function49ed0
 	ld b, SCGB_08
 	call GetSGBLayout
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index 952c12ac1..047f66533 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -289,7 +289,7 @@ MapSetupCommands: ; 15440
 
 DontScrollText: ; 154ca
 	xor a
-	ld [wc2d7], a
+	ld [wDisableTextAcceleration], a
 	ret
 ; 154cf
 
diff --git a/engine/predef.asm b/engine/predef.asm
index f52127311..b028cd9ac 100644
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -78,7 +78,7 @@ PredefPointers:: ; 856b
 	add_predef GetUnownLetter
 	add_predef LoadPoisonBGPals
 	add_predef Predef2F
-	add_predef Function9853 ; $30
+	add_predef InitSGBBorder ; $30
 	add_predef Predef_LoadSGBLayout
 	add_predef _Area
 	add_predef CheckContestMon