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, 15 insertions, 15 deletions

diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm
index 65c3f3e60..5ae7c1511 100755
--- a/engine/battle/move_effects/transform.asm
+++ b/engine/battle/move_effects/transform.asm
@@ -11,7 +11,7 @@ BattleCommand_Transform: ; 371cd
 	jp nz, BattleEffect_ButItFailed
 	xor a
 	ld [wNumHits], a
-	ld [FXAnimID + 1], a
+	ld [wFXAnimID + 1], a
 	ld a, $1
 	ld [wKickCounter], a
 	ld a, BATTLE_VARS_SUBSTATUS4
@@ -28,15 +28,15 @@ BattleCommand_Transform: ; 371cd
 	call GetBattleVarAddr
 	set SUBSTATUS_TRANSFORMED, [hl]
 	call ResetActorDisable
-	ld hl, BattleMonSpecies
-	ld de, EnemyMonSpecies
+	ld hl, wBattleMonSpecies
+	ld de, wEnemyMonSpecies
 	ld a, [hBattleTurn]
 	and a
 	jr nz, .got_mon_species
-	ld hl, EnemyMonSpecies
-	ld de, BattleMonSpecies
+	ld hl, wEnemyMonSpecies
+	ld de, wBattleMonSpecies
 	xor a
-	ld [CurMoveNum], a
+	ld [wCurMoveNum], a
 .got_mon_species
 	push hl
 	ld a, [hli]
@@ -64,7 +64,7 @@ BattleCommand_Transform: ; 371cd
 	ld [de], a
 	inc de
 ; move pointer to stats
-	ld bc, BattleMonStats - BattleMonPP
+	ld bc, wBattleMonStats - wBattleMonPP
 	add hl, bc
 	push hl
 	ld h, d
@@ -73,16 +73,16 @@ BattleCommand_Transform: ; 371cd
 	ld d, h
 	ld e, l
 	pop hl
-	ld bc, BattleMonStructEnd - BattleMonStats
+	ld bc, wBattleMonStructEnd - wBattleMonStats
 	call CopyBytes
 ; init the power points
-	ld bc, BattleMonMoves - BattleMonStructEnd
+	ld bc, wBattleMonMoves - wBattleMonStructEnd
 	add hl, bc
 	push de
 	ld d, h
 	ld e, l
 	pop hl
-	ld bc, BattleMonPP - BattleMonStructEnd
+	ld bc, wBattleMonPP - wBattleMonStructEnd
 	add hl, bc
 	ld b, NUM_MOVES
 .pp_loop
@@ -102,12 +102,12 @@ BattleCommand_Transform: ; 371cd
 	ld a, [hl]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
-	ld hl, EnemyStats
-	ld de, PlayerStats
+	ld hl, wEnemyStats
+	ld de, wPlayerStats
 	ld bc, 2 * 5
 	call BattleSideCopy
-	ld hl, EnemyStatLevels
-	ld de, PlayerStatLevels
+	ld hl, wEnemyStatLevels
+	ld de, wPlayerStatLevels
 	ld bc, 8
 	call BattleSideCopy
 	call _CheckBattleScene
@@ -129,7 +129,7 @@ BattleCommand_Transform: ; 371cd
 .after_anim
 	xor a
 	ld [wNumHits], a
-	ld [FXAnimID + 1], a
+	ld [wFXAnimID + 1], a
 	ld a, $2
 	ld [wKickCounter], a
 	pop af