Color fns, some more address decoding in link/mobile

8 files changed, 59 insertions, 62 deletions

diff --git a/misc/mobile_12_2.asm b/misc/mobile_12_2.asm
index 454c936b3..b5495193f 100755
--- a/misc/mobile_12_2.asm
+++ b/misc/mobile_12_2.asm
@@ -191,7 +191,7 @@ Function4a94e: ; 4a94e
 	xor a
 	ld [wd018], a
 	ld [wd019], a
-	ld b, SCGB_14
+	ld b, SCGB_PACKPALS
 	call GetSGBLayout
 	call SetPalettes
 	call Function4aa22
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index ade57cabb..92fdc50ed 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -1,6 +1,3 @@
-
-SECTION "bank40", ROMX, BANK[$40]
-
 Function100000: ; 100000
 ; d: 1 or 2
 ; e: bank
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index 0f84cbf3c..d86146a0d 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -1083,17 +1083,17 @@ GFX_106514:
 INCBIN "gfx/unknown/106514.2bpp"
 
 
-Function106594:: ; 106594
-	ld de, GFX_1065ad
+LoadOverworldFont:: ; 106594
+	ld de, .bgfont
 	ld hl, VTiles1
-	lb bc, BANK(GFX_1065ad), $80
+	lb bc, BANK(.bgfont), $80
 	call Get2bpp
-	ld de, GFX_1065ad + $800
+	ld de, .bgfont + $80 tiles
 	ld hl, VTiles2 tile $7f
-	lb bc, BANK(GFX_1065ad), 1
+	lb bc, BANK(.bgfont), 1
 	call Get2bpp
 	ret
 ; 1065ad
 
-GFX_1065ad:
+.bgfont:
 INCBIN "gfx/unknown/1065ad.2bpp"
diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm
index 24144721f..41e31281c 100644
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -1,6 +1,3 @@
-
-SECTION "bank42", ROMX, BANK[$42]
-
 Function108000: ; 108000
 	ld a, $80
 	ld [wcf65], a
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 9afa520fb..de5cccb31 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -5955,7 +5955,7 @@ Function1163c0: ; 1163c0
 	call ByteFill
 	call DelayFrame
 	callba Function14146
-	ld b, SCGB_09
+	ld b, SCGB_MAPPALS
 	call GetSGBLayout
 	ld a, [rSVBK]
 	push af
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index ebfd9c759..c1e7d9004 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -3348,7 +3348,7 @@ Function1197dc:
 Function119800: ; 119800
 	ld a, $fd
 	ld [$c6d0], a
-	ld [wc702], a
+	ld [wOTTrademonSpecies], a
 	ld a, [wcd81]
 	ld [wc74e], a
 	ld a, [wJumptableIndex]
@@ -7594,26 +7594,32 @@ Function11b6b4: ; 11b6b4
 	ld [wc708], a
 	ld a, [wcd31]
 	ld [wc709], a
-	ld a, $8
-	ld [BGMapBuffer], a
-	ld a, $c7
+
+	ld a, $c708 % $100
+	ld [wcd20], a
+	ld a, $c708 / $100
 	ld [wcd21], a
-	ld a, $d
-	ld [CreditsTimer], a
-	ld a, $c6
+
+	ld a, $c60d % $100 ; Partymon Struct
+	ld [wcd22], a
+	ld a, $c60d / $100
 	ld [wcd23], a
-	ld a, $3d
+
+	ld a, $c63d % $100 ; OT
 	ld [wcd24], a
-	ld a, $c6
+	ld a, $c63d / $100
 	ld [wcd25], a
-	ld a, $42
+
+	ld a, $c642 % $100 ; Nickname
 	ld [wcd26], a
-	ld a, $c6
+	ld a, $c642 / $100
 	ld [wcd27], a
-	ld a, $47
+
+	ld a, $c647 % $100 ; ???
 	ld [wcd28], a
-	ld a, $c6
+	ld a, $c647 / $100
 	ld [wcd29], a
+
 	ld a, $46
 	ld [$c628], a
 	ld de, $c63d
@@ -7693,22 +7699,22 @@ Function11b6b4: ; 11b6b4
 	ld a, [hl]
 	cp MIN_LEVEL
 	ld a, MIN_LEVEL
-	jr c, .asm_11b7c5
+	jr c, .replace_level
 	ld a, [hl]
 	cp MAX_LEVEL
-	jr c, .asm_11b7c6
+	jr c, .done_level
 	ld a, MAX_LEVEL
-.asm_11b7c5
+.replace_level
 	ld [hl], a
-.asm_11b7c6
+.done_level
 	ld [CurPartyLevel], a
 
-	ld hl, $c616 + 1
-	ld de, $c62c + 5
+	ld hl, $c617
+	ld de, $c631
 	ld b, $1
 	predef CalcPkmnStats
-	ld de, $c62c + 5
-	ld hl, $c62c + 3
+	ld de, $c631
+	ld hl, $c62f
 	ld a, [de]
 	ld [hli], a
 	inc de
@@ -7719,30 +7725,30 @@ Function11b6b4: ; 11b6b4
 ; 11b7e5
 
 Function11b7e5: ; 11b7e5
-	ld a, [$c608 + 5]
-	ld [wc702], a
+	ld a, [$c60d] ; species
+	ld [wOTTrademonSpecies], a
 	ld [CurPartySpecies], a
 	ld a, [wcd81]
 	ld [wc74e], a
-	ld hl, $c63d
-	ld de, wc724
-	ld bc, $0005
+	ld hl, $c63d ; OT
+	ld de, wOTTrademonOTName
+	ld bc, $5
 	call CopyBytes
-	ld a, $50
+	ld a, "@"
 	ld [de], a
-	ld a, [$c608 + 11]
-	ld [wEnemyWrapCount], a
-	ld a, [$c608 + 12]
-	ld [wPlayerCharging], a
-	ld hl, $c608 + 26
+	ld a, [$c613] ; id
+	ld [wOTTrademonID], a
+	ld a, [$c613 + 1]
+	ld [wOTTrademonID + 1], a
+	ld hl, $c622 ; dvs
 	ld a, [hli]
-	ld [wEnemyTrappingMove], a
+	ld [wOTTrademonDVs], a
 	ld a, [hl]
-	ld [wPlayerWrapCount], a
-	ld bc, $c608 + 5
+	ld [wOTTrademonDVs + 1], a
+	ld bc, $c60d ; pokemon_data_start
 	callba GetCaughtGender
 	ld a, c
-	ld [wEnemyCharging], a
+	ld [wOTTrademonCaughtData], a
 	call SpeechTextBox
 	call FadeToMenu
 	callba Function108016
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index 1385a3204..735297e8b 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -863,6 +863,3 @@ Unknown_16cfb9:
 	RGB 07, 07, 07
 
 ; 16cfc1
-
-GFX_16cfc1:
-INCBIN "gfx/unknown/16cfc1.2bpp"
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index 928a59410..2c1972c1a 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -274,29 +274,29 @@ CheckStringForErrors_IgnoreTerminator: ; 17d0b3
 
 Function17d0f3: ; 17d0f3
 	ld a, [$c608 + 5]
-	ld [wc702], a
+	ld [wOTTrademonSpecies], a
 	ld [CurPartySpecies], a
 	ld a, [wcd81]
 	ld [wc74e], a
 	ld hl, $c63d
-	ld de, wc724
-	ld bc, $0005
+	ld de, wOTTrademonOTName
+	ld bc, 5
 	call CopyBytes
-	ld a, $50
+	ld a, "@"
 	ld [de], a
 	ld a, [$c608 + 11]
-	ld [wEnemyWrapCount], a
+	ld [wOTTrademonID], a
 	ld a, [$c608 + 12]
-	ld [wPlayerCharging], a
+	ld [wOTTrademonID + 1], a
 	ld hl, $c608 + 26
 	ld a, [hli]
-	ld [wEnemyTrappingMove], a
+	ld [wOTTrademonDVs], a
 	ld a, [hl]
-	ld [wPlayerWrapCount], a
+	ld [wOTTrademonDVs + 1], a
 	ld bc, $c608 + 5
 	callba GetCaughtGender
 	ld a, c
-	ld [wEnemyCharging], a
+	ld [wOTTrademonCaughtData], a
 	call SpeechTextBox
 	call FadeToMenu
 	callba Function10804d