Fix merge conflicts

misc/crystal_misc.asm

@@ -51,7 +51,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8)
 	call Function17abcf
 	callba Function49409
 	callba Function49420
-	call Function32f9
+	call SetPalettes
 	call DelayFrame
 	ret
 
@@ -430,7 +430,7 @@ Function17a91e: ; 17a91e (5e:691e)
 	ret
 
 .asm_17a92c
-	call Function1d6e
+	call LoadMenuDataHeader_0x1d75
 	call Function17a99e
 	ld hl, $d088
 	set 7, [hl]

misc/mobile_22.asm

@@ -655,7 +655,7 @@ Function894ca: ; 894ca (22:54ca)
 	call Function895c7
 	call Function8949c
 	call Function8a60d
-	call Function32f9
+	call SetPalettes
 	pop bc
 	ret
 
@@ -1307,7 +1307,7 @@ Function89844: ; 89844
 	call Function897af
 	push bc
 	call Function3200
-	call Function32f9
+	call SetPalettes
 	pop bc
 	ret
 ; 89856
@@ -1816,9 +1816,9 @@ Function89b28: ; 89b28 (22:5b28)
 	call Function891de
 	call WhiteBGMap
 	call Function893e2
-	call Function1d7d
+	call Call_ExitMenu
 	call Function891ab
-	call Function32f9
+	call SetPalettes
 	ret
 
 Function89b3b: ; 89b3b (22:5b3b)
@@ -2167,7 +2167,7 @@ Function89d0d: ; 89d0d (22:5d0d)
 	call CopyBytes
 	pop af
 	ld [rSVBK], a ; $ff00+$70
-	call Function32f9
+	call SetPalettes
 	callba Function845db
 	call Function89240
 	ld c, $18
@@ -2373,7 +2373,7 @@ Function89e6f: ; 89e6f (22:5e6f)
 	hlcoord 10, 4, AttrMap
 	call Function8a5a3
 	call Function891ab
-	call Function32f9
+	call SetPalettes
 	jp Function89e36
 
 Function89e9a: ; 89e9a (22:5e9a)
@@ -2410,7 +2410,7 @@ Function89eb9: ; 89eb9 (22:5eb9)
 	hlcoord 10, 4, AttrMap
 	call Function8a5a3
 	call Function891ab
-	call Function32f9
+	call SetPalettes
 	jp Function89e36
 
 Function89ee1: ; 89ee1 (22:5ee1)
@@ -2591,7 +2591,7 @@ Function89fce: ; 89fce (22:5fce)
 	hlcoord 10, 4, AttrMap
 	call Function8a5a3
 	call Function89448
-	call Function32f9
+	call SetPalettes
 	call Function891ab
 	jp Function89e36
 
@@ -2927,7 +2927,7 @@ UnknownText_0x8a23c: ; 0x8a23c
 ; 0x8a241
 
 Function8a241: ; 8a241 (22:6241)
-	call Function1d6e
+	call LoadMenuDataHeader_0x1d75
 	call Function891fe
 	call Function8a262
 	jr nc, .asm_8a254
@@ -2938,7 +2938,7 @@ Function8a241: ; 8a241 (22:6241)
 .asm_8a254
 	call Function891de
 	call WhiteBGMap
-	call Function1d7d
+	call Call_ExitMenu
 	call Function891de
 	and a
 	ret
@@ -2965,7 +2965,7 @@ Function8a262: ; 8a262 (22:6262)
 	call Function8b36c
 	call Function8b493
 	call Function891ab
-	call Function32f9
+	call SetPalettes
 	call Function8b5e7
 	ret
 
@@ -3063,7 +3063,7 @@ Function8a31c: ; 8a31c (22:631c)
 	call Function8a4d3
 	call Function8a4fc
 	call Function891ab
-	call Function32f9
+	call SetPalettes
 	call Function8a383
 	jr c, .asm_8a370
 	jr z, .asm_8a34e
@@ -3455,7 +3455,7 @@ Palette_8a624: ; 8a624
 ; 8a62c
 
 Function8a62c: ; 8a62c (22:662c)
-	call Function1d6e
+	call LoadMenuDataHeader_0x1d75
 	call Function891fe
 	xor a
 	call Function8b94a
@@ -3885,7 +3885,7 @@ Function8a999: ; 8a999 (22:6999)
 	jr c, .asm_8a9bb
 	push bc
 	push de
-	call Function1d6e
+	call LoadMenuDataHeader_0x1d75
 	pop de
 	dec e
 	ld a, e
@@ -4141,7 +4141,7 @@ Function8ab77: ; 8ab77 (22:6b77)
 
 Function8ab93: ; 8ab93 (22:6b93)
 	call WhiteBGMap
-	call Function1d6e
+	call LoadMenuDataHeader_0x1d75
 	callba Function105688
 	call ClearSprites
 	call Function891fe

misc/mobile_22_2.asm

@@ -581,7 +581,7 @@ Function8b677: ; 8b677
 	call Function8b6ed
 	call EnableLCD
 	call Function891ab
-	call Function32f9
+	call SetPalettes
 	ret
 ; 8b690
 

misc/mobile_40.asm

@@ -1615,6 +1615,7 @@ Function100a09: ; 100a09
 	ld a, [wLinkMode]
 	cp $4
 	jr nz, .asm_100a2a
+
 	call Function100a87
 	call Function100da5
 	callba Function3ee27
@@ -1941,15 +1942,15 @@ endr
 	ret
 
 .asm_100c63
-	ld hl, BattleText_0x80c5b
+	ld hl, BattleText_TheMoveIsDisabled
 	jr .asm_100c6b
 
 .asm_100c68
-	ld hl, BattleText_0x80c39
+	ld hl, BattleText_TheresNoPPLeftForThisMove
 
 .asm_100c6b
 	call StdBattleTextBox
-	call Function30b4
+	call Call_LoadTempTileMapToTileMap
 	jp Function100bc2
 ; 100c74
 
@@ -3015,7 +3016,7 @@ Function10138b: ; 10138b
 
 Function1013aa: ; 1013aa
 	call WhiteBGMap
-	call Function1d7d
+	call Call_ExitMenu
 	call Function2bae
 	callba Function106464
 	call UpdateSprites
@@ -4482,7 +4483,7 @@ Unknown_101d8d: ; 101d8d
 
 Function101d95: ; 101d95
 	call Function101ee2
-	call Function1d6e
+	call LoadMenuDataHeader_0x1d75
 	ld e, $e
 	call Function101ee4
 	ld hl, wcd29
@@ -6255,7 +6256,7 @@ Jumptable_1029cb: ; 1029cb
 ; 1029cf
 
 Function1029cf: ; 1029cf
-	call Function1d6e
+	call LoadMenuDataHeader_0x1d75
 	hlcoord 10, 7
 	ld b, $3
 	ld c, $8
@@ -6793,7 +6794,7 @@ Function102dec: ; 102dec
 	ld a, $5
 	call FarCopyWRAM
 	callba Function49742
-	call Function32f9
+	call SetPalettes
 	call DelayFrame
 	ret
 ; 102e07

misc/mobile_45.asm

@@ -5789,7 +5789,7 @@ Function116294: ; 116294
 	ld de, Unkn1Pals + 8 * 7
 	ld bc, $0008
 	call CopyBytes
-	call Function32f9
+	call SetPalettes
 	pop af
 	ld [rSVBK], a
 	ld a, $30
@@ -5810,7 +5810,7 @@ Function1162cb: ; 1162cb
 	ld de, wd050
 	ld bc, $0030
 	call CopyBytes
-	call Function32f9
+	call SetPalettes
 	pop af
 	ld [rSVBK], a
 	ret
@@ -5917,7 +5917,7 @@ Function11636e: ; 11636e
 	call CopyBytes
 	pop af
 	ld [rSVBK], a
-	call Function32f9
+	call SetPalettes
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -5967,7 +5967,7 @@ Function1163c0: ; 1163c0
 	call CopyBytes
 	pop af
 	ld [rSVBK], a
-	call Function32f9
+	call SetPalettes
 	call DelayFrame
 	ld a, $90
 	ld [hWY], a
@@ -14155,7 +14155,7 @@ Function11a9c0: ; 11a9c0
 Function11a9ce: ; 11a9ce
 	call WhiteBGMap
 	call Function2bae
-	call Function1d7d
+	call Call_ExitMenu
 	callba Function106462
 	callba Function106464
 	call Functiond90
@@ -14937,7 +14937,7 @@ Function11b082: ; 11b082
 	call Function11b099
 	call Function11b295
 	call Function11b275
-	call Function32f9
+	call SetPalettes
 	jp Function11ad8a
 ; 11b099
 
@@ -15686,7 +15686,7 @@ Function11b483: ; 11b483
 	pop de
 	push de
 	ld b, $1
-	predef Functione167
+	predef CalcPkmnStats
 	pop de
 	ld h, d
 	ld l, e
@@ -16102,7 +16102,7 @@ Function11b6b4: ; 11b6b4
 	ld hl, $c616 + 1
 	ld de, $c62c + 5
 	ld b, $1
-	predef Functione167
+	predef CalcPkmnStats
 	ld de, $c62c + 5
 	ld hl, $c62c + 3
 	ld a, [de]
@@ -16875,7 +16875,7 @@ Function11c1ca: ; 11c1ca
 	call ClearSprites
 	call ClearScreen
 	call Function11d323
-	call Function32f9
+	call SetPalettes
 	call DisableLCD
 	ld hl, GFX_11d67e
 	ld de, VTiles2
@@ -21659,7 +21659,7 @@ endr
 	cp $8
 	jr nz, .asm_16c969
 	callba Function96a4
-	call Function32f9
+	call SetPalettes
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -21762,7 +21762,7 @@ endr
 	cp $8
 	jr nz, .asm_16ca28
 	callba Function96a4
-	call Function32f9
+	call SetPalettes
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -22177,7 +22177,7 @@ Function16d42e: ; 16d42e
 ; 16d43b
 
 Function16d43b: ; 16d43b
-	call Function1d6e
+	call LoadMenuDataHeader_0x1d75
 	call WhiteBGMap
 	call ClearTileMap
 	call ClearSprites
@@ -22185,10 +22185,10 @@ Function16d43b: ; 16d43b
 	callba Function16d42e
 	ld b, $8
 	call GetSGBLayout
-	call Function32f9
+	call SetPalettes
 	call WaitBGMap
 	call JoyWaitAorB
-	call Function1d7d
+	call Call_ExitMenu
 	ret
 ; 16d465
 
@@ -22327,10 +22327,10 @@ Function16d6ca: ; 16d6ca
 ; 16d6ce
 
 Function16d6ce: ; 16d6ce
-	call Function1d6e
+	call LoadMenuDataHeader_0x1d75
 	call Function16d6e1
 	callba Function87d
-	call Function1d7d
+	call Call_ExitMenu
 	call Function3200
 	ret
 ; 16d6e1
@@ -23076,7 +23076,7 @@ endr
 	ld hl, $000a
 	add hl, bc
 	ld b, $1
-	predef Functione167
+	predef CalcPkmnStats
 	pop de
 	pop hl
 rept 2
@@ -23293,7 +23293,7 @@ Function170525: ; 170525
 
 
 Function170571:
-	call Function32f9
+	call SetPalettes
 	call Function1705b2
 
 
@@ -24906,7 +24906,7 @@ Function171ccd: ; 171ccd (5c:5ccd)
 	ld [hli], a
 	ld a, $7f
 	ld [hl], a
-	call Function32f9
+	call SetPalettes
 	pop af
 	ld [rSVBK], a ; $ff00+$70
 	ret
@@ -25068,7 +25068,7 @@ Function172eb9:
 	ld de, BGPals
 	ld bc, $40
 	call CopyBytes
-	call Function32f9
+	call SetPalettes
 	pop af
 	ld [rSVBK], a ; $ff00+$70
 	ret

misc/mobile_5f.asm

@@ -706,7 +706,7 @@ Function17d405:
 	ld de, Unkn1Pals
 	ld bc, $0040
 	call CopyBytes
-	call Function32f9
+	call SetPalettes
 	pop af
 	ld [rSVBK], a
 	ret
@@ -938,7 +938,7 @@ endr
 ; 17d5be
 
 Function17d5be: ; 17d5be
-	call Function32f9
+	call SetPalettes
 	call Function17e438
 
 Function17d5c4:
@@ -1508,7 +1508,7 @@ Function17d93a: ; 17d93a
 	ld a, [wc70c]
 	ld e, a
 	callba Function8bc6
-	call Function32f9
+	call SetPalettes
 	ld a, [wc708]
 	ld l, a
 	ld a, [wc709]
@@ -1544,7 +1544,7 @@ Function17d98b: ; 17d98b
 	ld a, [wc70b]
 	ld e, a
 	callba Function8bbd
-	call Function32f9
+	call SetPalettes
 	ld a, [wc708]
 	ld e, a
 	ld a, [wc709]
@@ -2465,7 +2465,7 @@ endr
 	ld e, l
 	push hl
 	ld b, $0
-	callba Functione167
+	callba CalcPkmnStats
 	ld a, [PartyCount]
 	dec a
 	ld hl, PartyMon1HP
@@ -4764,7 +4764,7 @@ Function17f5c3: ; 17f5c3
 Function17f5d2: ; 17f5d2
 	call Function17f5e4
 	callba Function104000
-	call Function32f9
+	call SetPalettes
 	ld a, $1
 	ld [wc303], a
 	ret