Update OpenGlossaryScreen

2 files changed, 16 insertions, 16 deletions

diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm
index f7b742b..e918ff6 100644
--- a/src/engine/bank02.asm
+++ b/src/engine/bank02.asm
@@ -41,7 +41,7 @@ DuelCheckMenu_InPlayArea: ; 8039 (2:4039)
 
 ; opens the Glossary submenu
 DuelCheckMenu_Glossary: ; 8042 (2:4042)
-	farcall Func_184c8
+	farcall OpenGlossaryScreen
 	ret
 
 ; opens the Your Play Area submenu
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index f635b3c..5dbc9f8 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -730,10 +730,10 @@ ZeroObjectPositionsAndToggleOAMCopy_Bank6 ; 184bf (6:44bf)
 	ld [wVBlankOAMCopyToggle], a
 	ret
 
-Func_184c8: ; 184c8 (6:44c8)
+OpenGlossaryScreen: ; 184c8 (6:44c8)
 	xor a
 	ld [wGlossaryPageNo], a
-	call Func_1852b
+	call .display_menu
 
 	xor a
 	ld [wInPlayAreaCurPosition], a
@@ -760,7 +760,7 @@ Func_184c8: ; 184c8 (6:44c8)
 	cp -1 ; b button
 	jr nz, .check_button
 
-	farcall $2, $4aa1
+	farcall Func_8aa1
 	ret
 
 .check_button
@@ -771,8 +771,8 @@ Func_184c8: ; 184c8 (6:44c8)
 	cp $09 ; $09: next page or prev page
 	jr z, .change_page
 
-	call Func_18598
-	call Func_1852b
+	call .print_description
+	call .display_menu
 	xor a
 	ld [wCheckMenuCursorBlinkCounter], a
 	jr .next
@@ -784,11 +784,11 @@ Func_184c8: ; 184c8 (6:44c8)
 	ld a, [wGlossaryPageNo]
 	xor $01 ; swap page
 	ld [wGlossaryPageNo], a
-	call Func_1855a
+	call .print_menu
 	jr .next
 
 ; display glossary menu.
-Func_1852b: ; 1852b (6:452b)
+.display_menu ; 1852b (6:452b)
 	xor a
 	ld [wTileMapFill], a
 	call ZeroObjectPositions
@@ -797,19 +797,19 @@ Func_1852b: ; 1852b (6:452b)
 	call DoFrame
 	call EmptyScreen
 	call Set_OBJ_8x8
-	farcall $2, $4992
+	farcall LoadCursorTile
 
 	lb de, 5, 0
 	call InitTextPrinting
 	ldtx hl, PokemonCardGlossaryText
 	call ProcessTextFromID
-	call Func_1855a
+	call .print_menu
 	ldtx hl, ChooseWordAndPressAButtonText
 	call DrawWideTextBox_PrintText
 	ret
 
 ; print texts in glossary menu.
-Func_1855a: ; 1855a (6:455a)
+.print_menu ; 1855a (6:455a)
 	ld hl, wDefaultText
 
 	ld a, TX_SYMBOL
@@ -854,7 +854,7 @@ Func_1855a: ; 1855a (6:455a)
 	ret
 
 ; display glossary description.
-Func_18598: ; 18598 (6:4598)
+.print_description ; 18598 (6:4598)
 	push af
 	xor a
 	ld [wTileMapFill], a
@@ -871,11 +871,11 @@ Func_18598: ; 18598 (6:4598)
 	or a
 	jr nz, .back_page
 
-	ld hl, GlossaryData_1
+	ld hl, GlossaryData1
 	jr .front_page
 
 .back_page
-	ld hl, GlossaryData_2
+	ld hl, GlossaryData2
 .front_page
 	pop af
 	; hl += (a + (a << 2)).
@@ -930,7 +930,7 @@ glossary_entry: MACRO
 	tx \3
 ENDM
 
-GlossaryData_1:
+GlossaryData1:
 	glossary_entry 7, Text02fa, Text030c
 	glossary_entry 5, Text02fb, Text030d
 	glossary_entry 7, Text02fc, Text030e
@@ -941,7 +941,7 @@ GlossaryData_1:
 	glossary_entry 7, Text0301, Text0313
 	glossary_entry 5, Text0302, Text0314
 
-GlossaryData_2:
+GlossaryData2:
 	glossary_entry 5, Text0303, Text0315
 	glossary_entry 5, Text0304, Text0316
 	glossary_entry 5, Text0305, Text0317