From e34bac40d603802195bfffad6ff58d75321af15d Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Mon, 12 Feb 2024 13:09:18 +0100
Subject: [PATCH] Game menu: WORLD MAP -> WORLD (#17)

---
 docs/develop/index.md      |  2 +-
 engine/menus/game_menu.asm | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/develop/index.md b/docs/develop/index.md
index cb4bb3084..a4ba04f7b 100755
--- a/docs/develop/index.md
+++ b/docs/develop/index.md
@@ -129,7 +129,7 @@
 
 ### Overworld workflow
 
-1) ``OverworldLoop`` is called from ``GameMenu_WorldMap`` with either ``hMapEntryMethod`` = ``MAPSETUP_ENTERLEVEL`` or ``hMapEntryMethod`` = ``MAPSETUP_CONTINUE``.
+1) ``OverworldLoop`` is called from ``GameMenu_World`` with either ``hMapEntryMethod`` = ``MAPSETUP_ENTERLEVEL`` or ``hMapEntryMethod`` = ``MAPSETUP_CONTINUE``.
 2) ``StartMap`` resets ``wCurTurn`` and ``wCurSpace`` if ``MAPSETUP_ENTERLEVEL``. ``StartMap`` sets ``hCurBoardEvent`` to ``BOARDEVENT_DISPLAY_MENU``. ``wEnabledPlayerEvents`` is cleared. ``wMapStatus`` is set to ``MAPSTATUS_HANDLE`` causing ``HandleMap`` to be called.
 3) ``MapEvents`` (from ``HandleMap``) calls ``PlayerEvents``. ``CheckBoardEvent`` queues ``BoardMenuScript`` which is executed by ``ScriptEvents``.
 4) ``BoardMenuScript.Upkeep`` saves the game, clears ``wTurnData[]``, increases ``wCurTurn``, and loads current space to ``wCurSpaceStruct[]``.
diff --git a/engine/menus/game_menu.asm b/engine/menus/game_menu.asm
index 6363b53a6..923a6d5d1 100755
--- a/engine/menus/game_menu.asm
+++ b/engine/menus/game_menu.asm
@@ -1,6 +1,6 @@
 	; GameMenu.String and GameMenu.Jumptable indexes
 	const_def
-	const GAMEMENU_WORLD_MAP
+	const GAMEMENU_WORLD
 	const GAMEMENU_SHOP
 
 GameMenu:
@@ -55,17 +55,17 @@ GameMenu_KeepMusic:
 
 .Strings:
 ; entries correspond to GAMEMENUITEM_* constants
-	db "WORLD MAP@"
+	db "WORLD@"
 	db "SHOP@"
 
 .Jumptable:
 ; entries correspond to GAMEMENUITEM_* constants
-	dw GameMenu_WorldMap
+	dw GameMenu_World
 	dw GameMenu_Shop
 
 GameMenuItems:
 	db 2
-	db GAMEMENU_WORLD_MAP
+	db GAMEMENU_WORLD
 	db GAMEMENU_SHOP
 	db -1
 
@@ -92,12 +92,12 @@ GameMenuJoypadLoop:
 	scf
 	ret
 
-GameMenu_WorldMap:
+GameMenu_World:
 ; the following 500ms fading delay applies:
 ; - from post-level screen to level selection menu
 ; - from overworld to level selection menu
-; - from selecting "WORLD MAP" in game menu to level selection menu (save outside ow)
-; - from selecting "WORLD MAP" in game menu to overworld (save in ow)
+; - from selecting "WORLD" in game menu to level selection menu (save outside ow)
+; - from selecting "WORLD" in game menu to overworld (save in ow)
 	ld a, 8
 	ld [wMusicFade], a
 	ld a, LOW(MUSIC_NONE)
@@ -165,7 +165,7 @@ GameMenu_WorldMap:
 	set LSMEVENT_SHOW_UNLOCKED_LEVELS, [hl]
 .save_and_return
 	farcall AutoSaveGameOutsideOverworld
-	jp GameMenu_WorldMap
+	jp GameMenu_World
 
 GameMenu_Shop:
 	ret