From 3d44a334949f387304144dbb331a4b6f74fbdb79 Mon Sep 17 00:00:00 2001
From: 2Tie <foxman95@ymail.com>
Date: Sun, 24 Jun 2018 16:43:11 -0600
Subject: all the non-dummy map scripts until Silent Hill are disassebled. five
 left!

---
 home/map.asm          |  2 +-
 home/map_objects.asm  |  3 ++-
 home/talk_to_npc.asm  | 16 ++++++++--------
 home/unknown_388f.asm |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'home')

diff --git a/home/map.asm b/home/map.asm
index a13a2d4..e295894 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -470,7 +470,7 @@ Function2407:: ; 00:2407
 	ld [wPlayerFacing], a
 	ld a, $0
 	ld d, $0
-	call Function19c0
+	call SetObjectFacing
 	ret
 
 MapSetup_Connection:: ; 2439
diff --git a/home/map_objects.asm b/home/map_objects.asm
index 079897a..faa4bb9 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -663,7 +663,8 @@ Function19b5::
 	res 7, [hl]
 	ret
 
-Function19c0::
+SetObjectFacing:: ; 19C0
+	; a is NPC number, d is direction
 	push de
 	call CheckObjectVisibility
 	pop de
diff --git a/home/talk_to_npc.asm b/home/talk_to_npc.asm
index 4b2261b..9edee7d 100644
--- a/home/talk_to_npc.asm
+++ b/home/talk_to_npc.asm
@@ -6,9 +6,9 @@ else
 SECTION "Unknown 3025", ROM0 [$2fe9]
 endc
 
-Function3025::
+MapDefaultText::
 	ld hl, .Text
-	call StartTextboxWithDebug
+	call OpenTextbox
 	ret
 
 .Text: ; 00:302c
@@ -157,8 +157,8 @@ GetFacingPersonText:: ; 00:3103
 	scf
 	ret
 
-StartTextboxWithDebug:: ; 00:3111
-	; Identical to StartTextbox except it prints debug numbers if in debug mode.
+OpenTextbox:: ; 00:3111
+	; Opens a textbox and waits for input
 	push hl
 	call PrepareTextbox
 	ld a, [wDebugFlags]
@@ -168,7 +168,7 @@ StartTextboxWithDebug:: ; 00:3111
 	call TextboxIdle 
 	ret
 
-StartTextbox:: ; 00:3122
+OpenTextboxNoInput:: ; 00:3122
 	push hl 
 	call PrepareTextbox 
 	pop hl
@@ -211,7 +211,7 @@ PrepareTextbox:: ; 00:314E
 	call Bankswitch
 	ret
 
-TextboxCleanup ; 00:3171
+TextboxCleanup: ; 00:3171
 	callab ReanchorBGMap_NoOAMUpdate
 	call UpdateSprites
 	xor a
@@ -224,7 +224,7 @@ TextboxCleanup ; 00:3171
 	call InitToolgearBuffer
 	ret
 
-Function318f ; 00:318f
+Function318f: ; 00:318f
 	callab Function140ea
 	call Function0d02
 	ret
@@ -340,7 +340,7 @@ GetInlineMapObject:: ; 00:31EB
 	and a
 	ret
 	
-CheckBPressedDebug ; 3233
+CheckBPressedDebug: ; 3233
 	; If in debug mode, returns a check on the B button.
 	ld a, [wDebugFlags]
 	bit DEBUG_FIELD_F, a
diff --git a/home/unknown_388f.asm b/home/unknown_388f.asm
index 447f6cf..1182506 100644
--- a/home/unknown_388f.asm
+++ b/home/unknown_388f.asm
@@ -92,7 +92,7 @@ Function3920::
 	ld hl, wJoypadFlags
 	res 4, [hl]
 	ld hl, .text
-	call StartTextboxWithDebug
+	call OpenTextbox
 	call RotateFourPalettesLeft
 	jp Init
 
-- 
cgit v1.2.3