Replace a few predefs

4 files changed, 16 insertions, 21 deletions

diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc
index de14d19..0b980b5 100644
--- a/data/predef_pointers.inc
+++ b/data/predef_pointers.inc
@@ -11,7 +11,7 @@ PredefPointers:: ; 1:62d3
 ; Please be a peach and nuke the hell out of these:
 ; WE NEED LABELS!
 ; Thank youu~
-	add_predef Function6445
+	add_predef Function6445 ; 0
 	add_predef Function5d27
 	add_predef Function6713
 	add_predef Function66b1
@@ -19,7 +19,7 @@ PredefPointers:: ; 1:62d3
 	add_predef Functionce10
 	add_predef Functioncd6f
 	add_predef Functioncde3
-	add_predef Functioncde3_2
+	add_predef Functioncde3_2 ; 8
 	add_predef Functioncde3_3
 	add_predef Functioncdf9
 	add_predef Functionce10_2
@@ -28,7 +28,7 @@ GiveItemPredef::
 	dbw 3, GiveItem
 	add_predef Functionce3c
 	add_predef Functionda28
-	add_predef Functiond886
+	add_predef Functiond886 ; 10
 	add_predef Functionda4f
 	add_predef Functiondac8
 	add_predef Functiondcfc
@@ -36,15 +36,15 @@ GiveItemPredef::
 	add_predef Functiondd5c
 	add_predef Functionde79
 	add_predef Functionce7c
-	add_predef Functiondf7d
+	add_predef Functiondf7d ; 18
 	add_predef Functiondf91
 	add_predef Function1128f
 	add_predef Function112c1
-	add_predef Function28c98
+	add_predef LinkTextboxAtHL
 	add_predef Function2d663
 	add_predef Function3d5ce
 	add_predef Function3f019
-	add_predef Function3f068
+	add_predef Function3f068 ; 20
 	add_predef Function3f04a
 	add_predef Function3d08c
 	add_predef Function3d67c
@@ -52,7 +52,7 @@ GiveItemPredef::
 	add_predef Function3ef19
 	add_predef Function3e874
 	add_predef Function3e91e
-	add_predef Function3e963
+	add_predef Function3e963 ; 28
 	add_predef Function421f8
 	add_predef Function42252
 	add_predef Function41fa1
@@ -60,7 +60,7 @@ GiveItemPredef::
 	add_predef Function28d6e
 	add_predef Function40ac7
 	add_predef Function40000
-	add_predef Function40b5c
+	add_predef Function40b5c ; 30
 	add_predef Function50000
 	add_predef Function50bfe
 	add_predef Function50bcd
@@ -68,7 +68,7 @@ GiveItemPredef::
 	add_predef Function508c4
 	add_predef Function50771
 	add_predef Function50774
-	add_predef Function5081f
+	add_predef Function5081f ; 38
 	add_predef Function506d4
 	add_predef Function5069e
 	add_predef Function502b5
@@ -76,7 +76,7 @@ GiveItemPredef::
 	add_predef Function50248
 	add_predef Function500c6
 	add_predef Function500a0
-	add_predef Function50073
+	add_predef Function50073 ; 40
 	add_predef Function50ed9
 	add_predef Functioncb6ff
 	add_predef Functioncb710
@@ -84,7 +84,7 @@ GiveItemPredef::
 	add_predef Function145b8
 	add_predef Function146dc
 	add_predef Function145de
-	add_predef ExecuteBGEffects
+	add_predef ExecuteBGEffects ; 48
 	add_predef Function1457a
 	add_predef Function143e0
 	add_predef CheckSGB
@@ -92,10 +92,10 @@ GiveItemPredef::
 	add_predef Function8786
 	add_predef Function8c4be
 	add_predef Function8c9c6
-	add_predef Function8c940
+	add_predef Function8c940 ; 50
 	add_predef Functioncc001
 	add_predef Functioncc000
 	add_predef Functioncc000_2
 	add_predef Functionfdb66
 	add_predef Function1240b
-	dbw $ff, InexplicablyEmptyFunction
+	dbw $ff, InexplicablyEmptyFunction ; 56
diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm
index bfe9d7e..a9f712e 100644
--- a/engine/link/place_waiting_text.asm
+++ b/engine/link/place_waiting_text.asm
@@ -13,10 +13,7 @@ PlaceWaitingText:: ; 1:4000
 	jr .textbox_done
 
 .link_textbox
-	; TODO
-	; predef Predef_LinkTextbox
-	ld a, $1c
-	call Predef
+	predef LinkTextboxAtHL
 .textbox_done
 	hlcoord 4, 11
 	ld de, .Waiting
diff --git a/home/init.asm b/home/init.asm
index 5df55b8..17971c7 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -104,9 +104,7 @@ Init: ; 052f
 
 	call DisableAudio
 	call _2007
-	; predef ???
-	ld a, $4B ; TODO: add predefs so the line above can be uncommented
-	call Predef
+	predef CheckSGB
 	ld a, $1F
 	ld [rIE], a
 	ld a, HIGH($9C00)
diff --git a/shim.sym b/shim.sym
index ee23de1..be3aae4 100644
--- a/shim.sym
+++ b/shim.sym
@@ -124,7 +124,7 @@
 ; word Unknown (2 bytes)
 05:470E UnknownMapBufferPointers
 
-0A:4C98 Function28c98
+0A:4C98 LinkTextboxAtHL
 0A:4D6E Function28d6e
 0A:4DA4 Function28da4