Split base stats

battle/effect_commands.asm

@@ -136,7 +136,7 @@ BattleCommand_CheckTurn: ; 34084
 	ld [wKickCounter], a
 	ld [AlreadyDisobeyed], a
 	ld [AlreadyFailed], a
-	ld [wc73e], a
+	ld [wSomeoneIsRampaging], a
 
 	ld a, 10 ; 1.0
 	ld [TypeModifier], a
@@ -2114,10 +2114,10 @@ BattleCommand_LowerSub: ; 34eee
 	ret
 
 .rollout_rampage
-	ld a, [wc73e]
+	ld a, [wSomeoneIsRampaging]
 	and a
 	ld a, 0
-	ld [wc73e], a
+	ld [wSomeoneIsRampaging], a
 	ret
 
 ; 34f57
@@ -6600,7 +6600,7 @@ BattleCommand_Rampage: ; 36751
 	inc a
 	ld [de], a
 	ld a, 1
-	ld [wc73e], a
+	ld [wSomeoneIsRampaging], a
 	ret
 
 ; 36778

battle/effects/rollout.asm

@@ -36,17 +36,17 @@ BattleCommand_RolloutPower: ; 37734
 	ld hl, PlayerRolloutCount
 	ld a, [hBattleTurn]
 	and a
-	jr z, .asm_37747
+	jr z, .got_rollout_count
 	ld hl, EnemyRolloutCount
 
-.asm_37747
+.got_rollout_count
 	ld a, [hl]
 	and a
-	jr nz, .asm_37750
+	jr nz, .skip_set_rampage
 	ld a, 1
-	ld [wc73e], a
+	ld [wSomeoneIsRampaging], a
 
-.asm_37750
+.skip_set_rampage
 	ld a, [AttackMissed]
 	and a
 	jr z, .hit
@@ -61,38 +61,39 @@ BattleCommand_RolloutPower: ; 37734
 	ld a, [hl]
 	ld b, a
 	cp MAX_ROLLOUT_COUNT
-	jr c, .asm_3776e
+	jr c, .not_done_with_rollout
 
 	ld a, BATTLE_VARS_SUBSTATUS1
 	call GetBattleVarAddr
 	res SUBSTATUS_ROLLOUT, [hl]
-	jr .asm_37775
+	jr .done_with_substatus_flag
 
-.asm_3776e
+.not_done_with_rollout
 	ld a, BATTLE_VARS_SUBSTATUS1
 	call GetBattleVarAddr
 	set SUBSTATUS_ROLLOUT, [hl]
 
-.asm_37775
+.done_with_substatus_flag
 	ld a, BATTLE_VARS_SUBSTATUS2
 	call GetBattleVar
 	bit SUBSTATUS_CURLED, a
-	jr z, .asm_3777f
+	jr z, .not_curled
 	inc b
-.asm_3777f
+.not_curled
+.loop
 	dec b
-	jr z, .asm_37790
+	jr z, .done_damage
 
 	ld hl, CurDamage + 1
 	sla [hl]
 	dec hl
 	rl [hl]
-	jr nc, .asm_3777f
+	jr nc, .loop
 
 	ld a, $ff
 	ld [hli], a
 	ld [hl], a
 
-.asm_37790
+.done_damage
 	ret
 ; 37791