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

engine/specials.asm

@@ -21,22 +21,22 @@ DummySpecial_c224: ; c224
 ; c225
 
 SetPlayerPalette: ; c225
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	ld d, a
 	farcall _SetPlayerPalette
 	ret
 ; c230
 
 GameCornerPrizeMonCheckDex: ; c230
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	dec a
 	call CheckCaughtMon
 	ret nz
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	dec a
 	call SetSeenAndCaughtMon
 	call FadeToMenu
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	ld [wd265], a
 	farcall NewPokedexEntry
 	call ExitAllMenus
@@ -44,35 +44,35 @@ GameCornerPrizeMonCheckDex: ; c230
 ; c252
 
 UnusedSetSeenMon: ; c252
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	dec a
 	call SetSeenMon
 	ret
 ; c25a
 
 FindPartyMonGreaterThanThatLevel: ; c25a
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	ld b, a
 	farcall _FindPartyMonGreaterThanThatLevel
 	jr z, FoundNone
 	jr FoundOne
 
 FindPartyMonAtLeastThatHappy: ; c268
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	ld b, a
 	farcall _FindPartyMonAtLeastThatHappy
 	jr z, FoundNone
 	jr FoundOne
 
 FindPartyMonThatSpecies: ; c276
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	ld b, a
 	farcall _FindPartyMonThatSpecies
 	jr z, FoundNone
 	jr FoundOne
 
 FindPartyMonThatSpeciesYourTrainerID: ; c284
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	ld b, a
 	farcall _FindPartyMonThatSpeciesYourTrainerID
 	jr z, FoundNone
@@ -80,21 +80,21 @@ FindPartyMonThatSpeciesYourTrainerID: ; c284
 
 FoundOne: ; c292
 	ld a, TRUE
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 
 FoundNone: ; c298
 	xor a
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 ; c29d
 
 NameRival: ; 0xc29d
 	ld b, $2 ; rival
-	ld de, RivalName
+	ld de, wRivalName
 	farcall _NamingScreen
 	; default to "SILVER"
-	ld hl, RivalName
+	ld hl, wRivalName
 	ld de, DefaultRivalName
 	call InitName
 	ret
@@ -131,10 +131,10 @@ DisplayLinkRecord: ; c2da
 
 PlayersHousePC: ; c2e7
 	xor a
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	farcall _PlayersHousePC
 	ld a, c
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 ; c2f6
 
@@ -147,7 +147,7 @@ CheckMysteryGift: ; c2f6
 	inc a
 
 .no
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	call CloseSRAM
 	ret
 ; c309
@@ -156,28 +156,28 @@ GetMysteryGiftItem: ; c309
 	ld a, BANK(sMysteryGiftItem)
 	call GetSRAMBank
 	ld a, [sMysteryGiftItem]
-	ld [CurItem], a
+	ld [wCurItem], a
 	ld a, 1
 	ld [wItemQuantityChangeBuffer], a
-	ld hl, NumItems
+	ld hl, wNumItems
 	call ReceiveItem
 	jr nc, .no_room
 	xor a
 	ld [sMysteryGiftItem], a
 	call CloseSRAM
-	ld a, [CurItem]
+	ld a, [wCurItem]
 	ld [wd265], a
 	call GetItemName
 	ld hl, .ReceiveItemText
 	call PrintText
 	ld a, TRUE
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 
 .no_room
 	call CloseSRAM
 	xor a
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 ; c345
 
@@ -190,12 +190,12 @@ GetMysteryGiftItem: ; c309
 BugContestJudging: ; c34a
 	farcall _BugContestJudging
 	ld a, b
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 ; c355
 
 MapRadio: ; c355
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	ld e, a
 	farcall PlayRadio
 	ret
@@ -205,7 +205,7 @@ UnownPuzzle: ; c360
 	call FadeToMenu
 	farcall _UnownPuzzle
 	ld a, [wSolvedUnownPuzzle]
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	call ExitAllMenus
 	ret
 ; c373
@@ -253,13 +253,13 @@ StartGameCornerGame: ; c39a
 ; c3ae
 
 CheckCoinsAndCoinCase: ; c3ae
-	ld hl, Coins
+	ld hl, wCoins
 	ld a, [hli]
 	or [hl]
 	jr z, .no_coins
 	ld a, COIN_CASE
-	ld [CurItem], a
-	ld hl, NumItems
+	ld [wCurItem], a
+	ld hl, wNumItems
 	call CheckItem
 	jr nc, .no_coin_case
 	and a
@@ -299,23 +299,23 @@ ClearBGPalettesBufferScreen: ; c3db
 ScriptReturnCarry: ; c3e2
 	jr c, .carry
 	xor a
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 .carry
 	ld a, 1
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 ; c3ef
 
 UnusedCheckUnusedTwoDayTimer: ; c3ef
 	farcall CheckUnusedTwoDayTimer
 	ld a, [wUnusedTwoDayTimer]
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 ; c3fc
 
 ActivateFishingSwarm: ; c3fc
-	ld a, [ScriptVar]
+	ld a, [wScriptVar]
 	ld [wFishingSwarmFlag], a
 	ret
 ; c403
@@ -365,16 +365,16 @@ SnorlaxAwake: ; 0xc43d
 ; next to Snorlax.
 
 ; outputs:
-; ScriptVar is 1 if the conditions are met, otherwise 0.
+; wScriptVar is 1 if the conditions are met, otherwise 0.
 
 ; check background music
 	ld a, [wMapMusic]
 	cp MUSIC_POKE_FLUTE_CHANNEL
 	jr nz, .nope
 
-	ld a, [XCoord]
+	ld a, [wXCoord]
 	ld b, a
-	ld a, [YCoord]
+	ld a, [wYCoord]
 	ld c, a
 
 	ld hl, .ProximityCoords
@@ -398,7 +398,7 @@ SnorlaxAwake: ; 0xc43d
 .nope
 	xor a
 .done
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 
 .ProximityCoords:
@@ -412,7 +412,7 @@ SnorlaxAwake: ; 0xc43d
 
 
 PlayCurMonCry: ; c472
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	jp PlayMonCry
 ; c478
 
@@ -435,17 +435,17 @@ GameboyCheck: ; c478
 .cgb
 	ld a, GBCHECK_CGB
 .done
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ret
 
 
 FadeOutMusic: ; c48f
 	ld a, LOW(MUSIC_NONE)
-	ld [MusicFadeID], a
+	ld [wMusicFadeID], a
 	ld a, HIGH(MUSIC_NONE)
-	ld [MusicFadeID + 1], a
+	ld [wMusicFadeID + 1], a
 	ld a, $2
-	ld [MusicFade], a
+	ld [wMusicFade], a
 	ret
 ; c49f
 
@@ -467,5 +467,5 @@ TrainerHouse: ; 0xc4b9
 	ld a, BANK(sMysteryGiftTrainerHouseFlag)
 	call GetSRAMBank
 	ld a, [sMysteryGiftTrainerHouseFlag]
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	jp CloseSRAM