Add copy_name.asm

10 files changed, 50 insertions, 35 deletions

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 656d2ef5..77fd516b 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -1,12 +1,18 @@
 ; InputType: ; c2c7
 AUTO_INPUT EQU $ff
 
-; MonType: ; cf5f
-PARTYMON   EQU 0
-OTPARTYMON EQU 1
-BOXMON     EQU 2
-TEMPMON   EQU 3
-WILDMON    EQU 4
+; wDebugFlags:: ; c2cc
+	const_def
+	const DEBUG_BATTLE_F
+	const DEBUG_FIELD_F
+
+; wMonType:: ; cf5f
+	const_def
+	const PARTYMON   ; 0
+	const OTPARTYMON ; 1
+	const BOXMON     ; 2
+	const TEMPMON    ; 3
+	const WILDMON    ; 4
 
 ; wOptions: ; cfcc
 FAST_TEXT      EQU 0
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index c4967028..16ba1044 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -25,7 +25,7 @@ FieldMoveGetPartyNick: ; c74b (3:474b)
 	ld [wMonType], a
 	ld a, [wCurPartyMon]
 	call GetNick
-	call Function317b
+	call CopyName1
 	ld de, wStringBuffer2
 	ld hl, wStringBuffer3
 	call CopyName2
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index 0bd56b1a..08242ad1 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -248,7 +248,7 @@ MainMenu_Options:
 
 MainMenu_NewGame:
 	xor a
-	ld [wMonStatusFlags], a
+	ld [wDebugFlags], a
 	call Function5c3a
 	call Function5bf7
 	call OakSpeech
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index bbfea25e..70e62498 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -1057,7 +1057,7 @@ GiveEgg: ; df92 (3:5f92)
 	ld hl, wPartyMon1Happiness
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
-	ld a, [wMonStatusFlags]
+	ld a, [wDebugFlags]
 	bit 1, a
 	ld a, $1
 	jr nz, .asm_e028
diff --git a/engine/pack.asm b/engine/pack.asm
index 27db7cd2..959c6e19 100755
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1404,7 +1404,7 @@ Function10e38: ; 10e38 (4:4e38)
 	ld a, [wd002]
 	ld [wd151], a
 	call GetItemName
-	call Function317b
+	call CopyName1
 	ret
 
 Pack_ClearTilemap:
diff --git a/home.asm b/home.asm
index 74b1d522..14401088 100644
--- a/home.asm
+++ b/home.asm
@@ -49,7 +49,7 @@ INCLUDE "home/flag.asm"
 
 Unreferenced_CheckBPressedDebug::
 ; Used in debug ROMs to walk through walls and avoid encounters.
-	ld a, [wMonStatusFlags]
+	ld a, [wDebugFlags]
 	bit 1, a
 	ret z
 	
@@ -68,8 +68,8 @@ xor_a_dec_a::
 
 Unreferenced_CheckFieldDebug::
 	push hl
-	ld hl, wMonStatusFlags
-	bit 1, [hl]
+	ld hl, wDebugFlags
+	bit DEBUG_FIELD_F, [hl]
 	pop hl
 	ret
 	
@@ -154,33 +154,29 @@ _de_::
 INCLUDE "home/clear_sprites.asm"
 INCLUDE "home/copy2.asm"
 INCLUDE "home/copy_tilemap.asm"
-
-Function317b:: ; 317b (0:317b)
-	ld hl, wStringBuffer2
-CopyName2::
-	ld a, [de]
-	inc de
-	ld [hli], a
-	cp "@"
-	jr nz, CopyName2
-	ret
+INCLUDE "home/copy_name.asm"
 
 IsInArray::
-	ld b, $0
+; Find value a for every de bytes in array hl.
+; Return index in b and carry if found.
+
+	ld b, 0
 	ld c, a
-.asm_3189
+.loop
 	ld a, [hl]
-	cp $ff
-	jr z, .asm_3195
+	cp -1
+	jr z, .NotInArray
 	cp c
-	jr z, .asm_3197
+	jr z, .InArray
 	inc b
 	add hl, de
-	jr .asm_3189
-.asm_3195
+	jr .loop
+
+.NotInArray:
 	and a
 	ret
-.asm_3197
+
+.InArray:
 	scf
 	ret
 
diff --git a/home/copy_name.asm b/home/copy_name.asm
new file mode 100755
index 00000000..59c8cf6c
--- /dev/null
+++ b/home/copy_name.asm
@@ -0,0 +1,13 @@
+CopyName1::
+; Copies the name from de to wStringBuffer2
+	ld hl, wStringBuffer2
+
+CopyName2::
+; Copies the name from de to hl
+.loop
+	ld a, [de]
+	inc de
+	ld [hli], a
+	cp "@"
+	jr nz, .loop
+	ret
diff --git a/home/menu.asm b/home/menu.asm
index 91272113..ed5660af 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -99,7 +99,7 @@ CopyNameFromMenu::
 	call GetNthString
 	ld d, h
 	ld e, l
-	call Function317b
+	call CopyName1
 	pop bc
 	pop hl
 	ret
diff --git a/items/item_effects.asm b/items/item_effects.asm
index 7689720b..3d17cc63 100755
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -2,7 +2,7 @@ DoItemEffect_:: ; e7a6 (3:67a6)
 	ld a, [wd002]
 	ld [wd151], a
 	call GetItemName
-	call Function317b
+	call CopyName1
 	ld a, $1
 	ld [wFieldMoveSucceeded], a
 	ld a, [wd002]
@@ -2184,7 +2184,7 @@ PPUp: ; f606 (3:7606)
 	ld a, [hl]
 	ld [wd151], a
 	call GetMoveName
-	call Function317b
+	call CopyName1
 	pop hl
 	ld a, [wceed]
 	cp PP_UP
diff --git a/wram.asm b/wram.asm
index da92cfb8..b6162a30 100644
--- a/wram.asm
+++ b/wram.asm
@@ -129,7 +129,7 @@ wAutoInputAddress:: dw ; c2c7
 wAutoInputBank::    db ; c2c9
 wAutoInputLength::  db ; c2ca
 
-wMonStatusFlags:: ds 1 ; c1cb
+wDebugFlags:: ds 1 ; c1cb
 wGameLogicPaused:: ds 1 ; c1cc
 wSpriteUpdatesEnabled:: db
 wc1ce:: ds 1 ; c1ce