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/events/battle_tower/load_trainer.asm

@@ -1,23 +1,23 @@
 Function_LoadOpponentTrainerAndPokemons: ; 1f8000
 	ld a, [rSVBK]
 	push af
-	ld a, BANK(BT_OTTrainer)
+	ld a, BANK(wBT_OTTrainer)
 	ld [rSVBK], a
 
-	; Fill BT_OTTrainer with zeros
+	; Fill wBT_OTTrainer with zeros
 	xor a
-	ld hl, BT_OTTrainer
-	ld bc, BT_OTTrainerEnd - BT_OTTrainer
+	ld hl, wBT_OTTrainer
+	ld bc, wBT_OTTrainerEnd - wBT_OTTrainer
 	call ByteFill
 
 	; Write $ff into the Item-Slots
 	ld a, $ff
-	ld [BT_OTPkmn1Item], a
-	ld [BT_OTPkmn2Item], a
-	ld [BT_OTPkmn3Item], a
+	ld [wBT_OTPkmn1Item], a
+	ld [wBT_OTPkmn2Item], a
+	ld [wBT_OTPkmn3Item], a
 
-	; Set BT_OTTrainer as start address to write the following data to
-	ld de, BT_OTTrainer
+	; Set wBT_OTTrainer as start address to write the following data to
+	ld de, wBT_OTTrainer
 
 	ld a, [hRandomAdd]
 	ld b, a
@@ -129,22 +129,22 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
 	ld b, a
 	ld a, [hld]
 	ld c, a
-	ld a, [BT_OTPkmn1]
+	ld a, [wBT_OTPkmn1]
 	cp b
 	jr z, .FindARandomBattleTowerPkmn
-	ld a, [BT_OTPkmn1Item]
+	ld a, [wBT_OTPkmn1Item]
 	cp c
 	jr z, .FindARandomBattleTowerPkmn
-	ld a, [BT_OTPkmn2]
+	ld a, [wBT_OTPkmn2]
 	cp b
 	jr z, .FindARandomBattleTowerPkmn
-	ld a, [BT_OTPkmn2Item]
+	ld a, [wBT_OTPkmn2Item]
 	cp c
 	jr z, .FindARandomBattleTowerPkmn
-	ld a, [BT_OTPkmn3]
+	ld a, [wBT_OTPkmn3]
 	cp b
 	jr z, .FindARandomBattleTowerPkmn
-	ld a, [BT_OTPkmn3Item]
+	ld a, [wBT_OTPkmn3Item]
 	cp c
 	jr z, .FindARandomBattleTowerPkmn
 	ld a, [sBTPkmnPrevTrainer1]
@@ -199,11 +199,11 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
 	ld [sBTPkmnPrevPrevTrainer2], a
 	ld a, [sBTPkmnPrevTrainer3]
 	ld [sBTPkmnPrevPrevTrainer3], a
-	ld a, [BT_OTPkmn1]
+	ld a, [wBT_OTPkmn1]
 	ld [sBTPkmnPrevTrainer1], a
-	ld a, [BT_OTPkmn2]
+	ld a, [wBT_OTPkmn2]
 	ld [sBTPkmnPrevTrainer2], a
-	ld a, [BT_OTPkmn3]
+	ld a, [wBT_OTPkmn3]
 	ld [sBTPkmnPrevTrainer3], a
 	call CloseSRAM
 	ret

engine/events/battle_tower/rules.asm

@@ -30,7 +30,7 @@ CheckForMobileBattleRules: ; 8b1e1
 ; 0x8b201
 
 _CheckForBattleTowerRules: ; 8b201
-	ld hl, StringBuffer2
+	ld hl, wStringBuffer2
 	ld [hl], "3"
 	inc hl
 	ld [hl], "@"
@@ -212,13 +212,13 @@ BattleTower_ExecuteJumptable: ; 8b25b
 ; 8b2bb
 
 BattleTower_CheckPartyLengthIs3: ; 8b2bb
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	cp BATTLETOWER_PARTY_LENGTH
 	ret
 ; 8b2c1
 
 BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
-	ld hl, PartyCount
+	ld hl, wPartyCount
 	ld a, [hli]
 	ld b, $0
 	ld c, a
@@ -231,7 +231,7 @@ BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
 .egg
 	dec c
 	jr nz, .loop
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	cp b
 	ret z
 	ld a, b
@@ -240,7 +240,7 @@ BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
 ; 8b2da
 
 Function_PartyCountEq3: ; 8b2da
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	cp BATTLETOWER_PARTY_LENGTH
 	ret z
 	scf
@@ -248,13 +248,13 @@ Function_PartyCountEq3: ; 8b2da
 ; 8b2e2
 
 Function_PartySpeciesAreUnique: ; 8b2e2
-	ld hl, PartyMon1Species
+	ld hl, wPartyMon1Species
 	call VerifyUniqueness
 	ret
 ; 8b2e9
 
 VerifyUniqueness: ; 8b2e9
-	ld de, PartyCount
+	ld de, wPartyCount
 	ld a, [de]
 	inc de
 	dec a
@@ -318,13 +318,13 @@ VerifyUniqueness: ; 8b2e9
 ; 8b32a
 
 Function_PartyItemsAreUnique: ; 8b32a
-	ld hl, PartyMon1Item
+	ld hl, wPartyMon1Item
 	call VerifyUniqueness
 	ret
 ; 8b331
 
 Function_HasPartyAnEgg: ; 8b331
-	ld hl, PartyCount
+	ld hl, wPartyCount
 	ld a, [hli]
 	ld c, a
 .loop

engine/events/battle_tower/trainer_text.asm

@@ -1,14 +1,14 @@
 BattleTowerText:: ; 11c000
-; Print text c for trainer [BT_OTTrainerClass]
+; Print text c for trainer [wBT_OTTrainerClass]
 ; 1: Intro text
 ; 2: Player lost
 ; 3: Player won
 	ld a, [rSVBK]
 	push af
-	ld a, BANK(BT_OTTrainerClass)
+	ld a, BANK(wBT_OTTrainerClass)
 	ld [rSVBK], a
 if DEF(_CRYSTAL11)
-	ld hl, BT_OTTrainerClass
+	ld hl, wBT_OTTrainerClass
 else
 ; BUG ALERT
 ; Instead of loading the Trainer Class, this routine
@@ -16,7 +16,7 @@ else
 ; uses it to get the gender of the trainer.
 ; As a consequence, the enemy trainer's dialog will
 ; always be sampled from the female array.
-	ld hl, BT_OTName + NAME_LENGTH_JAPANESE - 1
+	ld hl, wBT_OTName + NAME_LENGTH_JAPANESE - 1
 endc
 	ld a, [hl]
 	dec a
@@ -53,11 +53,11 @@ endc
 	ld b, 0
 	dec c
 	jr nz, .restore
-	ld [BT_TrainerTextIndex], a
+	ld [wBT_TrainerTextIndex], a
 	jr .okay2
 
 .restore
-	ld a, [BT_TrainerTextIndex]
+	ld a, [wBT_TrainerTextIndex]
 
 .okay2
 	push af