Break up engine/sprites.asm; address yenatch's comments

8 files changed, 17 insertions, 17 deletions

diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm
index 76a2eac44..c5ab4bb57 100755
--- a/misc/battle_tower_5c.asm
+++ b/misc/battle_tower_5c.asm
@@ -663,7 +663,7 @@ Function1704e1: ; 1704e1
 	call FadeToMenu
 	call Bank5c_ClearJumptableRAM
 	call .JumptableLoop
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ret
 ; 1704f1
 
diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm
index a3d3f0389..3c3e18237 100755
--- a/misc/fixed_words.asm
+++ b/misc/fixed_words.asm
@@ -306,7 +306,7 @@ Function11c1ca: ; 11c1ca
 	call Decompress
 	call EnableLCD
 	callba ReloadMapPart
-	callba Function8cf53
+	callba ClearSpriteAnims
 	callba LoadPokemonData
 	callba Pokedex_ABCMode
 	ld a, [rSVBK]
@@ -367,7 +367,7 @@ Function11c283: ; 11c283
 	jr .loop
 
 .exit
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call ClearSprites
 	ret
 ; 11c2ac
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 211fabea5..9e807978a 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -1674,7 +1674,7 @@ Function100a53: ; 100a53
 	ld a, $ff
 	ld [wOtherPlayerLinkAction], a
 .waiting
-	call LinkCommunicationsSendReceive
+	call LinkTransfer
 	call DelayFrame
 	ld a, [wOtherPlayerLinkAction]
 	inc a
@@ -1683,14 +1683,14 @@ Function100a53: ; 100a53
 	ld b, 10
 .receive
 	call DelayFrame
-	call LinkCommunicationsSendReceive
+	call LinkTransfer
 	dec b
 	jr nz, .receive
 
 	ld b, 10
 .acknowledge
 	call DelayFrame
-	call LinkCommunicationsSignalDataReceived
+	call LinkDataReceived
 	dec b
 	jr nz, .acknowledge
 
diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm
index c2d7171e0..d559b9419 100644
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -151,7 +151,7 @@ Function1080b7: ; 1080b7
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call DelayFrame
 	ld de, TradeBallGFX
 	ld hl, VTiles0
@@ -204,7 +204,7 @@ Function108157: ; 108157
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	xor a
 	ld hl, wc300
 	ld [hli], a
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 40e4cac16..2c759e9a6 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -7712,7 +7712,7 @@ Function117699: ; 117699 (45:7699)
 	call ClearSprites
 	callba Function171c87
 	callba ReloadMapPart
-	callba Function8cf53
+	callba ClearSpriteAnims
 	ret
 
 Function1176ee: ; 1176ee (45:76ee)
@@ -7725,7 +7725,7 @@ Function1176ee: ; 1176ee (45:76ee)
 	callba ReloadMapPart
 	jr Function1176ee
 .asm_117709
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call ClearBGPalettes
 	call ClearScreen
 	call ClearSprites
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 8d479d7b1..22f62353d 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -5846,9 +5846,9 @@ UnknownText_0x11ac1f: ; 0x11ac1f
 Function11ac3e: ; 11ac3e
 	call SpeechTextBox
 	call FadeToMenu
-	callab ClearSpriteAnims
+	callab ClearSpriteAnims2
 	call Function11ac51
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ret
 ; 11ac51
 
@@ -7703,7 +7703,7 @@ Function11b7e5: ; 11b7e5
 	ld [de], a
 
 .asm_11b872
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	call RestartMapMusic
 	ret
 ; 11b879
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 8eedea0fd..6ebd6455e 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -413,7 +413,7 @@ Function1719ed: ; 1719ed (5c:59ed)
 	call ClearSprites
 	callba Function171d2b
 	callba ReloadMapPart
-	callba Function8cf53
+	callba ClearSpriteAnims
 	ret
 
 Function171a11: ; 171a11 (5c:5a11)
@@ -426,7 +426,7 @@ Function171a11: ; 171a11 (5c:5a11)
 	callba ReloadMapPart
 	jr Function171a11
 .asm_171a2c
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call ClearSprites
 	ret
 
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index 26bf5f28e..2326bcc0a 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -326,7 +326,7 @@ Function17d0f3: ; 17d0f3
 	ld [de], a
 
 .asm_17d180
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	call RestartMapMusic
 	ret
 ; 17d187
@@ -564,7 +564,7 @@ Function17d2ce: ; 17d2ce
 	ld [MusicFadeIDHi], a
 	call PlayMusic
 	call ReturnToMapFromSubmenu
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ret
 ; 17d314