Consistent Music/SFX label names and more Home disasm

11 files changed, 62 insertions, 46 deletions

diff --git a/.gitignore b/.gitignore
index e48d627..f7006b3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,5 @@
 *.1bpp
 *.2bpp
 
-# disasm output
+# *disasm.py output file
 *disasm_output.asm
\ No newline at end of file
diff --git a/src/audio/music1.asm b/src/audio/music1.asm
index 16f6a9a..2db31c7 100755
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -1,14 +1,14 @@
-SetupSound_Ext:: ; f4000 (3d:4000)
+_SetupSound:: ; f4000 (3d:4000)
 	jp Music1_Init
 
-SoundTimerHandler_Ext:: ; f4003 (3d:4003)
+SoundTimerHandler:: ; f4003 (3d:4003)
 	jp Music1_Update
 
-Func_f4006:: ; f4006 (3d:4006)
+_PlaySong:: ; f4006 (3d:4006)
 	jp Music1_PlaySong
 
-Func_f4009:: ; f4009 (3d:4009)
-	jp Func_f402d
+_PlaySFX:: ; f4009 (3d:4009)
+	jp Music1_PlaySFX
 
 Func_f400c:: ; f400c (3d:400c)
 	jp Func_f404e
@@ -41,7 +41,7 @@ Music1_PlaySong: ; f4021 (3d:4021)
 	pop hl
 	ret
 
-Func_f402d: ; f402d (3d:402d)
+Music1_PlaySFX: ; f402d (3d:402d)
 	push bc
 	push hl
 	ld b, $0
@@ -165,7 +165,7 @@ Music1_Init: ; f407d (3d:407d)
 Music1_Update: ; f40e9 (3d:40e9)
 	call Music1_EmptyFunc
 	call Music1_CheckForNewSound
-	ld hl, Func_fc003
+	ld hl, SFX_UpdateSFX
 	call Bankswitch3dTo3f
 	ld a, [wCurSongBank]
 	ldh [hBankROM], a
@@ -200,7 +200,7 @@ Music1_CheckForNewSound: ; f411c (3d:411c)
 	rla
 	jr c, .noNewSound
 	ld a, [wCurSfxID]
-	ld hl, Func_fc000
+	ld hl, SFX_PlaySFX
 	call Bankswitch3dTo3f
 	ld a, [wCurSfxID]
 	or $80
diff --git a/src/audio/music1_headers.asm b/src/audio/music1_headers.asm
index 3344365..f5008fe 100755
--- a/src/audio/music1_headers.asm
+++ b/src/audio/music1_headers.asm
@@ -1,4 +1,4 @@
-NumberOfSongs1: ; 4fee5 (3d:4ee5)
+NumberOfSongs1: ; f4ee5 (3d:4ee5)
 	db $1f
 
 SongBanks1: ; f4ee6 (3d:4ee6)
diff --git a/src/audio/music2.asm b/src/audio/music2.asm
index 3af0181..ddae2bb 100755
--- a/src/audio/music2.asm
+++ b/src/audio/music2.asm
@@ -8,7 +8,7 @@ Func_f8006: ; f8006 (3e:4006)
 	jp Music2_PlaySong
 
 Func_f8009: ; f8009 (3e:4009)
-	jp Func_f802d
+	jp Music2_PlaySFX
 
 Func_f800c: ; f800c (3e:400c)
 	jp Func_f804e
@@ -41,7 +41,7 @@ Music2_PlaySong: ; f8021 (3e:4021)
 	pop hl
 	ret
 
-Func_f802d: ; f802d (3e:402d)
+Music2_PlaySFX: ; f802d (3e:402d)
 	push bc
 	push hl
 	ld b, $0
@@ -165,7 +165,7 @@ Music2_Init: ; f807d (3e:407d)
 Music2_Update: ; f80e9 (3e:40e9)
 	call Music2_EmptyFunc
 	call Music2_CheckForNewSound
-	ld hl, Func_fc003
+	ld hl, SFX_UpdateSFX
 	call Bankswitch3dTo3f
 	ld a, [wCurSongBank]
 	ldh [hBankROM], a
@@ -200,7 +200,7 @@ Music2_CheckForNewSound: ; f811c (3e:411c)
 	rla
 	jr c, .noNewSound
 	ld a, [wCurSfxID]
-	ld hl, Func_fc000
+	ld hl, SFX_PlaySFX
 	call Bankswitch3dTo3f
 	ld a, [wCurSfxID]
 	or $80
diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm
index cfd34eb..6b3e2bc 100755
--- a/src/audio/sfx.asm
+++ b/src/audio/sfx.asm
@@ -1,10 +1,10 @@
-Func_fc000: ; fc000 (3f:4000)
-	jp SFX_PlaySfx
+SFX_PlaySFX: ; fc000 (3f:4000)
+	jp SFX_Play
 
-Func_fc003: ; fc003 (3f:4003)
-	jp Func_fc059
+SFX_UpdateSFX: ; fc003 (3f:4003)
+	jp SFX_Update
 
-SFX_PlaySfx: ; fc006 (3f:4006)
+SFX_Play: ; fc006 (3f:4006)
 	ld hl, NumberOfSFX
 	cp [hl]
 	jr nc, .invalidID
@@ -59,7 +59,7 @@ SFX_PlaySfx: ; fc006 (3f:4006)
 .invalidID
 	ret
 
-Func_fc059: ; fc059 (3f:4059)
+SFX_Update: ; fc059 (3f:4059)
 	ld a, [wdd8c]
 	or a
 	jr nz, .asm_fc063
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index 35ad954..845d7c0 100755
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -1515,7 +1515,7 @@ _TossCoin: ; 71ad (1:71ad)
 
 .asm_7292
 	ld a, d
-	call Func_3796
+	call PlaySFX
 	ld a, [wcd9c]
 	dec a
 	jr z, .asm_72b9
diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm
index c42f2a5..8752ad5 100755
--- a/src/engine/bank2.asm
+++ b/src/engine/bank2.asm
@@ -471,7 +471,7 @@ Func_9065: ; 9065 (2:5065)
 	ld a, [wcfe3]
 	or a
 	jr z, .asm_90ca
-	call Func_3796
+	call PlaySFX
 .asm_90ca
 	ld hl, $cea3
 	ld a, [hl]
@@ -515,7 +515,7 @@ Func_90fb: ; 90fb (2:50fb)
 .asm_9103
 	ld a, $3
 .asm_9105
-	call Func_3796
+	call PlaySFX
 	pop af
 	ret
 
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index 4c3feab..aff3057 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -65,7 +65,7 @@ LoadMap: ; c000 (3:4000)
 	bit 4, [hl]
 	jr z, .asm_c0b6
 	ld a, $c
-	call Func_3796
+	call PlaySFX
 	jp .asm_c037
 .asm_c0b6
 	farcall Func_10ab4
@@ -2769,7 +2769,7 @@ Func_d40f: ; d40f (3:540f)
 
 Func_d416: ; d416 (3:5416)
 	ld a, c
-	call Func_3796
+	call PlaySFX
 	jp IncreaseOWScriptPointerBy2
 
 Func_d41d: ; d41d (3:541d)
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index c4c8962..ea53cb4 100755
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -373,7 +373,7 @@ Func_10e71: ; 10e71 (4:4e71)
 	and A_BUTTON
 	jr z, .asm_10e96
 	ld a, $2
-	call Func_3796
+	call PlaySFX
 	call Func_11016
 	call Func_11024
 	jr .asm_10e96
@@ -399,7 +399,7 @@ Func_10e97: ; 10e97 (4:4e97)
 	ld [wd32e], a
 	call Func_10f2e
 	ld a, $1
-	call Func_3796
+	call PlaySFX
 .asm_10eb9
 	pop bc
 	pop hl
@@ -549,7 +549,7 @@ Func_11016: ; 11016 (4:5016)
 
 Func_11024: ; 11024 (4:5024)
 	ld a, $57
-	call Func_3796
+	call PlaySFX
 	ld a, [wd336]
 	ld [wd4cf], a
 	ld c, $f
diff --git a/src/engine/bank7.asm b/src/engine/bank7.asm
index 6e91991..af60340 100755
--- a/src/engine/bank7.asm
+++ b/src/engine/bank7.asm
@@ -406,7 +406,7 @@ Func_1d078: ; 1d078 (7:5078)
 	and A_BUTTON | START
 	jr z, .asm_1d095
 	ld a, $2
-	call Func_3796
+	call PlaySFX
 	farcall Func_10ab4
 
 .asm_1d0c7
diff --git a/src/engine/home.asm b/src/engine/home.asm
index fad3156..b649ca2 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -56,7 +56,7 @@ Start: ; 0150 (0:0150)
 	call SetupVRAM
 	call SetupLCD
 	call SetupPalettes
-	call SetupSound_T
+	call SetupSound
 	call SetupTimer
 	call ResetSerial
 	call CopyDMAFunction
@@ -134,9 +134,9 @@ TimerHandler: ; 01e6 (0:01e6)
 	set 1, [hl]
 	ldh a, [hBankROM]
 	push af
-	ld a, BANK(SoundTimerHandler_Ext)
+	ld a, BANK(SoundTimerHandler)
 	call BankswitchHome
-	call SoundTimerHandler_Ext
+	call SoundTimerHandler
 	pop af
 	call BankswitchHome
 	; clear in-timer flag
@@ -5065,7 +5065,7 @@ Func_26c0: ; 26c0 (0:26c0)
 .asm_26ca
 	ld a, $3
 .asm_26cc
-	call Func_3796
+	call PlaySFX
 	pop af
 	ret
 
@@ -5073,7 +5073,7 @@ HandleMenuInput: ; 26d1 (0:26d1)
 	ld a, [wcd99]
 	or a
 	jr z, HandleTextBoxInput
-	call Func_3796
+	call PlaySFX
 ;	fallthrough
 HandleTextBoxInput: ; 26da (0:26da)
 	ld hl, wCursorBlinkCounter
@@ -5150,7 +5150,7 @@ Func_271a: ; 271a (0:271a)
 .asm_2748
 	push af
 	ld a, $1
-	call Func_3796
+	call PlaySFX
 	call .asm_2772
 	pop af
 	ld [wCurMenuItem], a
@@ -5334,26 +5334,42 @@ WideTextBoxPromptCursorData: ; 2ac8 (0:2ac8)
 	db $1d ; tile behind cursor
 	db $0, $0 ; ???, ???
 
-	INCROM $2ad0, $2af0
+Func_2ad0: ; 2ad0 (0:2ad0)
+	call DrawWideTextBox_PrintText
+	lb de, 6, 16 ; x, y
+	ld a, d
+	ld [wcd98], a
+	lb bc, $0f, $00 ; cursor tile, tile behind cursor
+	call SetCursorParametersForTextBox
+	ld a, 1
+	ld [wCurMenuItem], a
+	call EnableLCD
+	jp HandleYesOrNoMenu.init_menu
+; 0x2aeb
+
+Func_2aeb: ; 2aeb (0:2aeb)
+	ld a, $01
+	ld [wcd9a], a
+;	fallthrough
 
 ; handle a yes / no menu with custom text provided in hl
 ; returns carry if "no" selected
 YesOrNoMenuWithText: ; 2af0 (0:2af0)
 	call DrawWideTextBox_PrintText
-
+;	fallthrough
 YesOrNoMenu: ; 2af3 (0:2af3)
 	lb de, 7, 16 ; x, y
 	call PrintYesOrNoItems
 	lb de, 6, 16 ; x, y
-	jr handleYesOrNoMenu
+	jr HandleYesOrNoMenu
 
 YesOrNoMenuWithText_LeftAligned: ; 2afe (0:2afe)
 	call DrawNarrowTextBox_PrintText
 	lb de, 3, 16 ; x, y
 	call PrintYesOrNoItems
 	lb de, 2, 16 ; x, y
-
-handleYesOrNoMenu
+;	fallthrough
+HandleYesOrNoMenu:
 	ld a, d
 	ld [wcd98], a
 	lb bc, $0f, $00 ; cursor tile, tile behind cursor
@@ -5372,7 +5388,7 @@ handleYesOrNoMenu
 	and D_RIGHT | D_LEFT
 	jr z, .wait_button_loop
 	ld a, $1
-	call Func_3796
+	call PlaySFX
 	call EraseCursor
 .init_menu
 	ld a, [wcd98]
@@ -7207,14 +7223,14 @@ HandleEnergyBurn: ; 375d (0:375d)
 	ret
 ; 0x377f
 
-SetupSound_T: ; 377f (0:377f)
-	farcall SetupSound_Ext
+SetupSound: ; 377f (0:377f)
+	farcall _SetupSound
 	ret
 
 Func_3784: ; 3784 (0:3784)
 	xor a
 PlaySong: ; 3785 (0:3785)
-	farcall Func_f4006
+	farcall _PlaySong
 	ret
 
 Func_378a: ; 378a (0:378a)
@@ -7227,8 +7243,8 @@ Func_378f: ; 378f (0:378f)
 
 Func_3794: ; 3794 (0:3794)
 	ld a, $04
-Func_3796: ; 3796 (0:3796)
-	farcall Func_f4009
+PlaySFX: ; 3796 (0:3796)
+	farcall _PlaySFX
 	ret
 
 Func_379b: ; 379b (0:379b)