misc

engine/battle/animations.asm

@@ -796,9 +796,9 @@ DoBallShakeSpecialEffects: ; 78f96 (1e:4f96)
 	dec a
 	ret nz
 ; if it's the end of the ball shaking subanimation, check if more shakes are left and restart the subanimation
-	ld a,[wWhichTrade] ; number of shakes
+	ld a,[wNumShakes] ; number of shakes
 	dec a ; decrement number of shakes
-	ld [wWhichTrade],a
+	ld [wNumShakes],a
 	ret z
 ; if there are shakes left, restart the subanimation
 	ld a,[W_SUBANIMSUBENTRYADDR]
@@ -1998,11 +1998,11 @@ AnimationWavyScreen: ; 79666 (1e:5666)
 	ret
 
 Func_796ae: ; 796ae (1e:56ae)
-	ld a, [$ff41]
+	ld a, [rSTAT]
 	and $3
 	jr nz, Func_796ae
 	ld a, [hl]
-	ld [$ff43], a
+	ld [rSCX], a
 	inc hl
 	ld a, [hl]
 	cp d
@@ -2895,7 +2895,7 @@ TossBallAnimation: ; 79e16 (1e:5e16)
 	; store these for later
 	ld a,b
 	and a,$F
-	ld [wWhichTrade],a
+	ld [wNumShakes],a
 
 	ld hl,.PokeBallAnimations
 	; choose which toss animation to use

engine/battle/core.asm

@@ -6298,7 +6298,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01)
 	dec de
 	dec de
 	xor a
-	ld [wHPBarMaxHP], a
+	ld [wLearningMovesFromDayCare], a
 	predef WriteMonMoves ; get moves based on current level
 .loadMovePPs
 	ld hl, wEnemyMonMoves

engine/battle/experience.asm

@@ -254,7 +254,7 @@ GainExperience: ; 5524f (15:524f)
 	ld a, [wd0b5]
 	ld [wd11e], a
 	predef LearnMoveFromLevelUp
-	ld hl, wccd3
+	ld hl, wCanEvolveFlags
 	ld a, [wWhichPokemon]
 	ld c, a
 	ld b, $1

engine/battle/init_battle_variables.asm

@@ -19,7 +19,7 @@ InitBattleVariables: ; 525af (14:65af)
 	ld hl, wcf1d
 	ld [hli], a
 	ld [hl], a
-	ld hl, wccd3
+	ld hl, wCanEvolveFlags
 	ld b, $3c
 .loop
 	ld [hli], a