Merge branch 'master' of https://github.com/pret/pokecrystal

# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm

1 files changed, 12 insertions, 12 deletions

diff --git a/engine/scrolling_menu.asm b/engine/scrolling_menu.asm
index 6704942ec..3be3d839c 100755
--- a/engine/scrolling_menu.asm
+++ b/engine/scrolling_menu.asm
@@ -44,7 +44,7 @@ _ScrollingMenu:: ; 245cb
 ScrollingMenu_InitDisplay: ; 245f1
 	xor a
 	ld [hBGMapMode], a
-	ld hl, Options
+	ld hl, wOptions
 	ld a, [hl]
 	push af
 	set NO_TEXT_SCROLL, [hl]
@@ -52,7 +52,7 @@ ScrollingMenu_InitDisplay: ; 245f1
 	call ScrollingMenu_PlaceCursor
 	call ScrollingMenu_CheckCallFunction3
 	pop af
-	ld [Options], a
+	ld [wOptions], a
 	ret
 ; 24609
 
@@ -95,15 +95,15 @@ ScrollingMenuJoyAction: ; 24609
 	ld a, [wMenuCursorY]
 	dec a
 	call ScrollingMenu_GetListItemCoordAndFunctionArgs
-	ld a, [MenuSelection]
-	ld [CurItem], a
-	ld a, [MenuSelectionQuantity]
+	ld a, [wMenuSelection]
+	ld [wCurItem], a
+	ld a, [wMenuSelectionQuantity]
 	ld [wItemQuantityBuffer], a
 	call ScrollingMenu_GetCursorPosition
 	dec a
 	ld [wScrollingMenuCursorPosition], a
-	ld [CurItemQuantity], a
-	ld a, [MenuSelection]
+	ld [wCurItemQuantity], a
+	ld a, [wMenuSelection]
 	cp -1
 	jr z, .b_button
 	ld a, A_BUTTON
@@ -124,7 +124,7 @@ ScrollingMenuJoyAction: ; 24609
 	ld a, [wMenuCursorY]
 	dec a
 	call ScrollingMenu_GetListItemCoordAndFunctionArgs
-	ld a, [MenuSelection]
+	ld a, [wMenuSelection]
 	cp -1
 	jp z, xor_a_dec_a
 	call ScrollingMenu_GetCursorPosition
@@ -389,7 +389,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0
 	ld [wScrollingMenuCursorPosition], a
 	ld a, c
 	call ScrollingMenu_GetListItemCoordAndFunctionArgs
-	ld a, [MenuSelection]
+	ld a, [wMenuSelection]
 	cp -1
 	jr z, .cancel
 	push bc
@@ -531,12 +531,12 @@ ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5
 	add hl, de
 	ld a, [wMenuData_ItemsPointerBank]
 	call GetFarByte
-	ld [MenuSelection], a
-	ld [CurItem], a
+	ld [wMenuSelection], a
+	ld [wCurItem], a
 	inc hl
 	ld a, [wMenuData_ItemsPointerBank]
 	call GetFarByte
-	ld [MenuSelectionQuantity], a
+	ld [wMenuSelectionQuantity], a
 	pop hl
 	pop de
 	ret