Comment some bank 0 functions, and add wram labels for Predef.

12 files changed, 18 insertions, 18 deletions

diff --git a/engine/battle/4.asm b/engine/battle/4.asm
index b19b3b49..7a8e42af 100755
--- a/engine/battle/4.asm
+++ b/engine/battle/4.asm
@@ -16,12 +16,12 @@ Func_128ea: ; 128ea (4:68ea)
 	ret
 
 Func_128ef: ; 128ef (4:68ef)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	ld a, $1
 	jr asm_128fb
 
 Func_128f6: ; 128f6 (4:68f6)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	ld a, $2
 asm_128fb: ; 128fb (4:68fb)
 	ld [wListMenuID], a ; $cf94
diff --git a/engine/battle/9.asm b/engine/battle/9.asm
index 79624d34..a2f846a2 100755
--- a/engine/battle/9.asm
+++ b/engine/battle/9.asm
@@ -1,5 +1,5 @@
 Func_27d6b: ; 27d6b (9:7d6b)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	push hl
 	call GetMonHeader
 	pop hl
@@ -26,7 +26,7 @@ asm_27d8c: ; 27d8c (9:7d8c)
 	jp FillMemory
 
 Func_27d98: ; 27d98 (9:7d98)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	push hl
 	ld a, [W_PLAYERMOVETYPE] ; $cfd5
 asm_27d9f: ; 27d9f (9:7d9f)
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index aaa65bbb..8f4cbcd5 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -2509,7 +2509,7 @@ Func_79aae: ; 79aae (1e:5aae)
 	jr asm_79acb
 
 Func_79aba: ; 79aba (1e:5aba)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	ld a, [$cd6c]
 	and a
 	jr nz, .asm_79ac8
@@ -2790,7 +2790,7 @@ AnimationShakeEnemyHUD: ; 79d77 (1e:5d77)
 	jp Func_79e0d
 
 Func_79dda: ; 79dda (1e:5dda)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	ld a, c
 	ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
 	ld a, b
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index 3b1cbedd..bcba5592 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -919,7 +919,7 @@ Func_5aaf: ; 5aaf (1:5aaf)
 	ret
 
 Func_5ab0:
-	call Load16BitRegisters
+	call GetPredefRegisters
 
 Func_5ab3: ; 5ab3 (1:5ab3)
 	push hl
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm
index 0892d8de..a709f438 100755
--- a/engine/evos_moves.asm
+++ b/engine/evos_moves.asm
@@ -372,7 +372,7 @@ Func_3af5b: ; 3af5b (e:6f5b)
 ; move slots are being filled up sequentially and shifted if all slots are full
 ; [$cee9]: (?)
 WriteMonMoves: ; 3afb8 (e:6fb8)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	push hl
 	push de
 	push bc
diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm
index 8ba52247..79416f8a 100755
--- a/engine/hp_bar.asm
+++ b/engine/hp_bar.asm
@@ -1,5 +1,5 @@
 UpdateHPBar_LoadRegisters: ; f9dc (3:79dc)
-	call Load16BitRegisters
+	call GetPredefRegisters
 
 ; calculates bc * 48 / de, the number of pixels the HP bar has
 ; the result is always at least 1
@@ -72,7 +72,7 @@ UpdateHPBar: ; fa1d (3:7a1d)
 	ld a, $1
 .HPdecrease
 	ld [wHPBarDelta], a
-	call Load16BitRegisters
+	call GetPredefRegisters
 	ld a, [wHPBarNewHP]
 	ld e, a
 	ld a, [wHPBarNewHP+1]
diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm
index 4ec2a23f..551f2a08 100755
--- a/engine/items/itemfinder.asm
+++ b/engine/items/itemfinder.asm
@@ -4,7 +4,7 @@ HiddenItemNear: ; 7481f (1d:481f)
 .asm_74824
 	ld de, $0003
 	ld a, [W_CURMAP]
-	call IsInArrayCummulativeCount
+	call IsInRestOfArray
 	ret nc ; return if current map has no hidden items
 	push bc
 	push hl
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index ea6f7de7..1c4b1740 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -1,6 +1,6 @@
 AskForMonNickname: ; 64eb (1:64eb)
 	call SaveScreenTilesToBuffer1
-	call Load16BitRegisters
+	call GetPredefRegisters
 	push hl
 	ld a, [W_ISINBATTLE] ; $d057
 	dec a
diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm
index a671c553..e53cfd07 100755
--- a/engine/oak_speech.asm
+++ b/engine/oak_speech.asm
@@ -211,7 +211,7 @@ MovePicLeft: ; 6288 (1:6288)
 	jr .next
 
 Predef3B: ; 62a1 (1:62a1)
-	call Load16BitRegisters
+	call GetPredefRegisters
 IntroPredef3B: ; 62a4 (1:62a4)
 ; bank of sprite given in b
 	push bc
diff --git a/engine/palettes.asm b/engine/palettes.asm
index 71f01a97..ab8e7076 100755
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -1,5 +1,5 @@
 Func_71ddf: ; 71ddf (1c:5ddf)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	ld a, b
 	cp $ff
 	jr nz, .asm_71dea
diff --git a/engine/predefs12.asm b/engine/predefs12.asm
index ac305c04..2818545c 100755
--- a/engine/predefs12.asm
+++ b/engine/predefs12.asm
@@ -1,5 +1,5 @@
 Func_480eb: ; 480eb (12:40eb)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	ld a, [rBGP] ; $ff47
 	or b
 	ld [rBGP], a ; $ff47
@@ -11,7 +11,7 @@ Func_480eb: ; 480eb (12:40eb)
 	ret
 
 Func_480ff: ; 480ff (12:40ff)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	ld a, $1
 	ld [$d0a0], a
 	xor a
@@ -35,7 +35,7 @@ Func_48119: ; 48119 (12:4119)
 	jp DelayFrames
 
 Func_48125: ; 48125 (12:4125)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	xor a
 .asm_48129
 	ld [$ff97], a
diff --git a/engine/predefs17_2.asm b/engine/predefs17_2.asm
index a1c4ff30..c2cbefc2 100755
--- a/engine/predefs17_2.asm
+++ b/engine/predefs17_2.asm
@@ -1,6 +1,6 @@
 ; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in $d11e
 SetPartyMonTypes: ; 5db5e (17:5b5e)
-	call Load16BitRegisters
+	call GetPredefRegisters
 	ld bc, W_PARTYMON1_TYPE1 - W_PARTYMON1DATA ; $5
 	add hl, bc
 	ld a, [$d11e]