Merge pull request #342 from PikalaxALT/master

More label interpretations

audio/music/clair.asm

@@ -207,9 +207,9 @@ Music_Clair_branch_1fb77: ; 1fb77
 	octave 3
 	note A#, 16
 	note __, 4
-	forceoctave $c
+	pitchoffset 0, CC
 	callchannel Music_Clair_branch_1fba6
-	forceoctave $0
+	pitchoffset 0, C_
 	octave 5
 	note F#, 2
 	note __, 4
@@ -254,7 +254,7 @@ Music_Clair_branch_1fba6: ; 1fba6
 
 Music_Clair_Ch3: ; 1fbb9
 	notetype $c, $14
-	forceoctave $c
+	pitchoffset 0, CC
 	octave 3
 	note C#, 2
 	note __, 4

audio/music/credits.asm

@@ -142,12 +142,12 @@ Music_Credits_Ch1: ; 1f328
 	note E_, 7
 	octave 3
 	note __, 1
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Music_Credits_branch_1f483
 	callchannel Music_Credits_branch_1f4ed
 	callchannel Music_Credits_branch_1f4f8
 	callchannel Music_Credits_branch_1f559
-	forceoctave $0
+	pitchoffset 0, C_
 	octave 3
 	note A_, 12
 	notetype $8, $a7
@@ -664,11 +664,11 @@ Music_Credits_Ch2: ; 1f58d
 	note A_, 4
 	note G_, 4
 	notetype $6, $c7
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Music_Credits_branch_1f6cb
 	callchannel Music_Credits_branch_1f73f
 	callchannel Music_Credits_branch_1f748
-	forceoctave $0
+	pitchoffset 0, C_
 	octave 5
 	note C#, 1
 	note D_, 11
@@ -1139,15 +1139,15 @@ Music_Credits_Ch3: ; 1f772
 	note F_, 1
 	note F#, 7
 	note G_, 8
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Music_Credits_branch_1f8aa
 	callchannel Music_Credits_branch_1f8db
-	forceoctave $12
+	pitchoffset 1, D_
 	callchannel Music_Credits_branch_1f8e7
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Music_Credits_branch_1f934
 	callchannel Music_Credits_branch_1f94b
-	forceoctave $0
+	pitchoffset 0, C_
 	octave 6
 	note C#, 2
 	octave 5

audio/music/evolution.asm

@@ -13,13 +13,13 @@ Music_Evolution_Ch1: ; f06ed
 	dutycycle $2
 	notetype $c, $92
 	octave 3
-	unknownmusic0xe0 $0, 4, A_
+	slidepitchto 1, 4, A_
 	note C_, 1
-	unknownmusic0xe0 $0, 4, A_
+	slidepitchto 1, 4, A_
 	note G_, 1
-	unknownmusic0xe0 $0, 4, A_
+	slidepitchto 1, 4, A_
 	note C_, 1
-	unknownmusic0xe0 $0, 4, A_
+	slidepitchto 1, 4, A_
 	note G_, 1
 	note __, 4
 	dutycycle $3

audio/music/goldenrodcity.asm

@@ -275,9 +275,8 @@ Music_GoldenrodCity_Ch3: ; eb584
 	vibrato $8, $23
 	notetype $c, $25
 Music_GoldenrodCity_branch_eb58c: ; eb58c
-rept 2
 	callchannel Music_GoldenrodCity_branch_eb5aa
-endr
+	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5d2
 	note __, 3
 	octave 3

audio/music/healpokemon.asm

@@ -11,16 +11,16 @@ Music_HealPokemon_Ch1: ; f06a0
 	tone $0001
 	notetype $c, $81
 	note __, 2
-	unknownmusic0xe0 $0, 4, __
+	slidepitchto 1, 4, __
 	note B_, 2
-	unknownmusic0xe0 $0, 5, E_
+	slidepitchto 1, 5, E_
 	note B_, 2
-	unknownmusic0xe0 $0, 4, E_
+	slidepitchto 1, 4, E_
 	note E_, 2
 	note __, 4
-	unknownmusic0xe0 $0, 3, __
+	slidepitchto 1, 3, __
 	note E_, 4
-	unknownmusic0xe0 $0, 4, __
+	slidepitchto 1, 4, __
 	note B_, 4
 	endchannel
 ; f06c4

audio/music/johtowildbattle.asm

@@ -492,9 +492,8 @@ Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
 	note G_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f5fdb
 	note F#, 4
-rept 2
 	callchannel Music_JohtoWildBattle_branch_f6055
-endr
+	callchannel Music_JohtoWildBattle_branch_f6055
 Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
 	note D_, 2
 	note G_, 2

audio/music/kantotrainerbattle.asm

@@ -9,7 +9,7 @@ Music_KantoTrainerBattle: ; ec9fa
 Music_KantoTrainerBattle_Ch1: ; eca04
 	tempo 114
 	volume $77
-	forceoctave $1b
+	pitchoffset 1, B_
 	notetype $c, $b3
 	vibrato $12, $24
 	dutycycle $1
@@ -467,7 +467,7 @@ Music_KantoTrainerBattle_branch_eca88: ; eca88
 ; ecbea
 
 Music_KantoTrainerBattle_Ch2: ; ecbea
-	forceoctave $1b
+	pitchoffset 1, B_
 	vibrato $6, $36
 	dutycycle $1
 	notetype $c, $d1
@@ -920,7 +920,7 @@ Music_KantoTrainerBattle_branch_ecc41: ; ecc41
 ; ecdd2
 
 Music_KantoTrainerBattle_Ch3: ; ecdd2
-	forceoctave $1b
+	pitchoffset 1, B_
 	vibrato $12, $23
 	notetype $c, $15
 	octave 2

audio/music/kantowildbattle.asm

@@ -325,25 +325,21 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
 	note F_, 1
 	note F#, 1
 	notetype $6, $b7
-rept 2
 	callchannel Music_KantoWildBattle_branch_ed307
-endr
-	forceoctave $1
-rept 2
 	callchannel Music_KantoWildBattle_branch_ed307
-endr
+	pitchoffset 0, C#
-	forceoctave $0
+	callchannel Music_KantoWildBattle_branch_ed307
+	callchannel Music_KantoWildBattle_branch_ed307
+	pitchoffset 0, C_
 rept 4
 	callchannel Music_KantoWildBattle_branch_ed307
 endr
-	forceoctave $1
+	pitchoffset 0, C#
-rept 2
+	callchannel Music_KantoWildBattle_branch_ed307
+	callchannel Music_KantoWildBattle_branch_ed307
+	pitchoffset 0, C_
 	callchannel Music_KantoWildBattle_branch_ed307
-endr
-	forceoctave $0
-rept 2
 	callchannel Music_KantoWildBattle_branch_ed307
-endr
 	note __, 16
 	octave 3
 	note A#, 16
@@ -388,9 +384,9 @@ endr
 	note G#, 1
 	notetype $6, $b7
 	callchannel Music_KantoWildBattle_branch_ed31b
-	forceoctave $1
+	pitchoffset 0, C#
 	callchannel Music_KantoWildBattle_branch_ed31b
-	forceoctave $0
+	pitchoffset 0, C_
 	callchannel Music_KantoWildBattle_branch_ed340
 	octave 2
 	note C_, 2
@@ -454,9 +450,9 @@ endr
 	callchannel Music_KantoWildBattle_branch_ed354
 	callchannel Music_KantoWildBattle_branch_ed340
 	callchannel Music_KantoWildBattle_branch_ed354
-	forceoctave $1
+	pitchoffset 0, C#
 	callchannel Music_KantoWildBattle_branch_ed340
-	forceoctave $0
+	pitchoffset 0, C_
 	note C#, 2
 	note __, 2
 	octave 3

audio/music/lookofficer.asm

@@ -73,9 +73,9 @@ Music_LookOfficer_branch_ed882: ; ed882
 	note E_, 2
 	note G#, 2
 	loopchannel 2, Music_LookOfficer_branch_ed882
-	forceoctave $1
+	pitchoffset 0, C#
 	callchannel Music_LookOfficer_branch_ed89e
-	forceoctave $0
+	pitchoffset 0, C_
 	callchannel Music_LookOfficer_branch_ed89e
 	loopchannel 0, Music_LookOfficer_branch_ed882
 ; ed89e

audio/music/lookrocket.asm

@@ -8,7 +8,7 @@ Music_LookRocket: ; f74a2
 Music_LookRocket_Ch1: ; f74ae
 	tempo 123
 	volume $77
-	forceoctave $2
+	pitchoffset 0, D_
 	stereopanning $f
 	dutycycle $3
 	vibrato $5, $64
@@ -94,7 +94,7 @@ Music_RocketTheme_branch_f750c: ; f750c
 ; f7514
 
 Music_LookRocket_Ch2: ; f7514
-	forceoctave $2
+	pitchoffset 0, D_
 	vibrato $4, $64
 	dutycycle $3
 	notetype $c, $b7
@@ -216,7 +216,7 @@ Music_RocketTheme_branch_f758a: ; f758a
 ; f7597
 
 Music_LookRocket_Ch3: ; f7597
-	forceoctave $2
+	pitchoffset 0, D_
 	vibrato $4, $22
 	notetype $c, $14
 	stereopanning $f0

audio/music/postcredits.asm

@@ -8,7 +8,7 @@ Music_PostCredits: ; cfd9e
 Music_PostCredits_Ch1: ; cfda5
 	tempo 271
 	volume $77
-	forceoctave $3
+	pitchoffset 0, D#
 	dutycycle $2
 	notetype $c, $93
 	note __, 8
@@ -133,7 +133,7 @@ Music_PostCredits_branch_cfdb2: ; cfdb2
 ; cfe48
 
 Music_PostCredits_Ch2: ; cfe48
-	forceoctave $3
+	pitchoffset 0, D#
 	dutycycle $2
 	notetype $c, $a3
 	octave 5

audio/music/profoak.asm

@@ -34,10 +34,10 @@ Music_ProfOak_branch_f4e22: ; f4e22
 	callchannel Music_ProfOak_branch_f4e58
 	callchannel Music_ProfOak_branch_f4e6c
 	callchannel Music_ProfOak_branch_f4e6c
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Music_ProfOak_branch_f4e58
 	callchannel Music_ProfOak_branch_f4e58
-	forceoctave $0
+	pitchoffset 0, C_
 	callchannel Music_ProfOak_branch_f4e6c
 	callchannel Music_ProfOak_branch_f4e6c
 	loopchannel 0, Music_ProfOak_branch_f4e22
@@ -241,10 +241,10 @@ Music_ProfOak_branch_f4f1d: ; f4f1d
 	callchannel Music_ProfOak_branch_f4f5a
 	callchannel Music_ProfOak_branch_f4f69
 	callchannel Music_ProfOak_branch_f4f69
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Music_ProfOak_branch_f4f5a
 	callchannel Music_ProfOak_branch_f4f5a
-	forceoctave $0
+	pitchoffset 0, C_
 	callchannel Music_ProfOak_branch_f4f69
 	callchannel Music_ProfOak_branch_f4f69
 	loopchannel 0, Music_ProfOak_branch_f4f1d

audio/music/ssaqua.asm

@@ -276,9 +276,9 @@ Music_SSAqua_branch_eaed5: ; eaed5
 	octave 4
 	note C#, 1
 	note E_, 1
-	forceoctave $c
+	pitchoffset 0, CC
 	callchannel Music_SSAqua_branch_eafe0
-	forceoctave $0
+	pitchoffset 0, C_
 	octave 3
 	note B_, 1
 	note __, 1

audio/music/surf.asm

@@ -425,7 +425,7 @@ Music_Surf_branch_f5333: ; f5333
 	note B_, 16
 	octave 4
 	note C#, 8
-	forceoctave $c
+	pitchoffset 0, CC
 	dutycycle $3
 	callchannel Music_Surf_branch_f53d6
 	intensity $b8
@@ -436,7 +436,7 @@ Music_Surf_branch_f5333: ; f5333
 	intensity $b8
 	dutycycle $1
 	callchannel Music_Surf_branch_f5404
-	forceoctave $0
+	pitchoffset 0, C_
 	notetype $c, $b8
 	octave 4
 	note B_, 12

audio/music/wildpokemonvictory.asm

@@ -29,14 +29,14 @@ Music_WildPokemonVictory_branch_f4538: ; f4538
 	intensity $78
 	octave 3
 	note G_, 4
-	forceoctave $1
+	pitchoffset 0, C#
 	callchannel Music_WildPokemonVictory_branch_f455c
 	note F#, 2
 	note F#, 2
 	note F#, 4
 	callchannel Music_WildPokemonVictory_branch_f455c
 	note G#, 4
-	forceoctave $0
+	pitchoffset 0, C_
 	intensity $78
 	octave 3
 	note F#, 4
@@ -97,7 +97,7 @@ Music_WildPokemonVictory_branch_f4587: ; f4587
 	note E_, 1
 	note G_, 1
 	note A#, 1
-	forceoctave $1
+	pitchoffset 0, C#
 	callchannel Music_WildPokemonVictory_branch_f45b5
 	octave 4
 	note B_, 2
@@ -106,7 +106,7 @@ Music_WildPokemonVictory_branch_f4587: ; f4587
 	callchannel Music_WildPokemonVictory_branch_f45b5
 	octave 4
 	note B_, 4
-	forceoctave $0
+	pitchoffset 0, C_
 	intensity $81
 	octave 3
 	note B_, 1
@@ -156,7 +156,7 @@ Music_WildPokemonVictory_branch_f45cf: ; f45cf
 	note E_, 2
 	note __, 2
 	note C_, 4
-	forceoctave $1
+	pitchoffset 0, C#
 	callchannel Music_WildPokemonVictory_branch_f45f4
 	note D#, 2
 	note C#, 2
@@ -166,7 +166,7 @@ Music_WildPokemonVictory_branch_f45cf: ; f45cf
 	callchannel Music_WildPokemonVictory_branch_f45f4
 	note E_, 2
 	note __, 2
-	forceoctave $0
+	pitchoffset 0, C_
 	octave 2
 	note B_, 4
 	loopchannel 0, Music_WildPokemonVictory_branch_f45cf

audio/sfx.asm

@@ -1957,9 +1957,9 @@ Sfx_GetBadge_Ch5: ; f1189
 	note F_, 3
 	callchannel Sfx_GetBadge_branch_f11aa
 	note A#, 3
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Sfx_GetBadge_branch_f11aa
-	forceoctave $0
+	pitchoffset 0, C_
 	intensity $a7
 	note A_, 16
 	note __, 6
@@ -2322,7 +2322,7 @@ Sfx_Aeroblast: ; f1334
 ; f133a
 
 Sfx_Aeroblast_Ch5: ; f133a
-	unknownmusic0xde $f2
+	sound_duty 2, 0, 3, 3
 	soundinput $f5
 	sound C_, 13, $f8, $0580
 	soundinput $8
@@ -4762,7 +4762,7 @@ Sfx_Supersonic_branch_f21ef: ; f21ef
 ; f21fc
 
 Sfx_Supersonic_Ch6: ; f21fc
-	unknownmusic0xde $b3
+	sound_duty 3, 0, 3, 2
 	sound __, 16, $2f, $07c8
 Sfx_Supersonic_branch_f2202: ; f2202
 	sound __, 16, $cf, $07c7
@@ -4790,7 +4790,7 @@ Sfx_Leer_branch_f221a: ; f221a
 
 Sfx_Leer_Ch6: ; f2229
 Sfx_Leer_branch_f2229: ; f2229
-	unknownmusic0xde $b3
+	sound_duty 3, 0, 3, 2
 	sound __,  1, $e1, $07c1
 	sound __,  1, $e1, $0701
 	loopchannel 12, Sfx_Leer_branch_f2229
@@ -4807,7 +4807,7 @@ Sfx_Leer_branch_f2238: ; f2238
 
 Sfx_Ember_Ch5: ; f2243
 Sfx_Ember_branch_f2243: ; f2243
-	unknownmusic0xde $c9
+	sound_duty 1, 2, 0, 3
 	sound __, 12, $f3, $0120
 	sound __, 10, $d3, $0150
 	loopchannel 5, Sfx_Ember_branch_f2243
@@ -4829,7 +4829,7 @@ Sfx_Ember_branch_f225a: ; f225a
 
 Sfx_Bubblebeam_Ch5: ; f226e
 Sfx_Bubblebeam_branch_f226e: ; f226e
-	unknownmusic0xde $39
+	sound_duty 1, 2, 3, 0
 	sound __,  5, $f4, $0600
 	sound __,  4, $c4, $0500
 	sound __,  6, $b5, $0600
@@ -4841,7 +4841,7 @@ Sfx_Bubblebeam_branch_f226e: ; f226e
 
 Sfx_Bubblebeam_Ch6: ; f2289
 Sfx_Bubblebeam_branch_f2289: ; f2289
-	unknownmusic0xde $8d
+	sound_duty 1, 3, 0, 2
 	sound __,  6, $e4, $05e0
 	sound __,  5, $b4, $04e0
 	sound __,  7, $a5, $05e8
@@ -4862,7 +4862,7 @@ Sfx_Bubblebeam_branch_f22a0: ; f22a0
 
 Sfx_HydroPump_Ch5: ; f22b1
 Sfx_HydroPump_branch_f22b1: ; f22b1
-	unknownmusic0xde $d2
+	sound_duty 2, 0, 1, 3
 	sound __,  4, $81, $0300
 	sound __,  4, $c1, $0400
 	sound __,  4, $f1, $0500
@@ -4887,7 +4887,7 @@ Sfx_HydroPump_branch_f22d0: ; f22d0
 
 Sfx_Surf_Ch5: ; f22e7
 Sfx_Surf_branch_f22e7: ; f22e7
-	unknownmusic0xde $39
+	sound_duty 1, 2, 3, 0
 	sound __, 16, $f4, $0500
 	sound __, 16, $c4, $0400
 	sound __, 16, $e2, $05c0
@@ -4897,7 +4897,7 @@ Sfx_Surf_branch_f22e7: ; f22e7
 
 Sfx_Surf_Ch6: ; f22fa
 Sfx_Surf_branch_f22fa: ; f22fa
-	unknownmusic0xde $8d
+	sound_duty 1, 3, 0, 2
 	sound __,  8, $e4, $0430
 	sound __, 16, $b4, $0330
 	sound __, 16, $a2, $0438
@@ -4917,7 +4917,7 @@ Sfx_Surf_branch_f230d: ; f230d
 
 Sfx_Psybeam_Ch5: ; f231e
 Sfx_Psybeam_branch_f231e: ; f231e
-	unknownmusic0xde $a1
+	sound_duty 1, 0, 2, 2
 	sound __, 11, $f1, $0640
 	sound __, 11, $f3, $0680
 	sound __, 11, $f2, $0620
@@ -4928,7 +4928,7 @@ Sfx_Psybeam_branch_f231e: ; f231e
 
 Sfx_Psybeam_Ch6: ; f2335
 Sfx_Psybeam_branch_f2335: ; f2335
-	unknownmusic0xde $b3
+	sound_duty 3, 0, 3, 2
 	sound __, 11, $f3, $0571
 	sound __,  8, $e3, $0531
 	sound __, 11, $f1, $0551
@@ -4958,7 +4958,7 @@ Sfx_Charge_branch_f2357: ; f2357
 
 Sfx_Charge_Ch6: ; f236e
 Sfx_Charge_branch_f236e: ; f236e
-	unknownmusic0xde $b3
+	sound_duty 3, 0, 3, 2
 	sound __,  3, $e1, $0302
 	sound __,  4, $e1, $07f2
 	sound __,  5, $e1, $0602
@@ -4979,7 +4979,7 @@ Sfx_Charge_branch_f2385: ; f2385
 
 Sfx_Thundershock_Ch5: ; f2396
 Sfx_Thundershock_branch_f2396: ; f2396
-	unknownmusic0xde $2b
+	sound_duty 3, 2, 2, 0
 	sound __,  4, $f1, $07f0
 	sound __,  5, $f2, $0200
 	loopchannel 8, Sfx_Thundershock_branch_f2396
@@ -4988,7 +4988,7 @@ Sfx_Thundershock_branch_f2396: ; f2396
 
 Sfx_Thundershock_Ch6: ; f23a5
 Sfx_Thundershock_branch_f23a5: ; f23a5
-	unknownmusic0xde $b3
+	sound_duty 3, 0, 3, 2
 	sound __,  5, $e2, $0202
 	sound __,  5, $e1, $07e2
 	loopchannel 9, Sfx_Thundershock_branch_f23a5
@@ -5092,7 +5092,7 @@ Sfx_Sharpen_Ch6: ; f2463
 ; f247a
 
 Sfx_EggBomb_Ch5: ; f247a
-	unknownmusic0xde $ed
+	sound_duty 1, 3, 2, 3
 	sound __,  9, $ff, $03f8
 	sound __, 16, $ff, $0400
 	sound __, 16, $f3, $0400
@@ -5100,7 +5100,7 @@ Sfx_EggBomb_Ch5: ; f247a
 ; f2489
 
 Sfx_EggBomb_Ch6: ; f2489
-	unknownmusic0xde $b4
+	sound_duty 0, 1, 3, 2
 	sound __,  9, $ef, $03c0
 	sound __, 16, $ef, $03c0
 	sound __, 16, $e3, $03c0
@@ -5168,7 +5168,7 @@ Sfx_HyperBeam_branch_f24f8: ; f24f8
 ; f2509
 
 Sfx_HyperBeam_Ch6: ; f2509
-	unknownmusic0xde $b3
+	sound_duty 3, 0, 3, 2
 	sound __,  3, $f1, $0781
 	sound __,  3, $f1, $0701
 	sound __,  3, $f1, $0791

audio/sfx_crystal.asm

@@ -169,7 +169,7 @@ Sfx_GameFreakPresents_Ch5: ; 179945
 	dutycycle $2
 	notetype $2, $b1
 	soundinput $ff
-	forceoctave $1a
+	pitchoffset 1, A#
 	octave 5
 	note C_, 2
 	note E_, 2
@@ -194,7 +194,7 @@ Sfx_Tingle: ; 179961
 Sfx_Tingle_Ch5: ; 179964
 	togglesfx
 	dutycycle $1
-	forceoctave $b
+	pitchoffset 0, B_
 	notetype $1, $b1
 Sfx_Tingle_branch_17996c: ; 17996c
 	octave 5
@@ -234,7 +234,7 @@ Sfx_4NoteDitty_Ch5: ; 17999b
 	togglesfx
 	dutycycle $2
 	notetype $2, $e8
-	forceoctave $2
+	pitchoffset 0, D_
 	octave 4
 	note C_, 2
 	intensity $48
@@ -279,7 +279,7 @@ Sfx_Twinkle: ; 1799cb
 Sfx_Twinkle_Ch5: ; 1799ce
 	togglesfx
 	dutycycle $0
-	forceoctave $2
+	pitchoffset 0, D_
 	notetype $2, $e1
 	octave 3
 	note G_, 2

battle/ai/items.asm

@@ -196,9 +196,9 @@ AI_TryItem: ; 38105
 	jr z, .has_item
 
 	dec de
-rept 3
 	inc hl
-endr
+	inc hl
+	inc hl
 	jr .loop
 
 .has_item
@@ -216,9 +216,8 @@ endr
 	pop de
 	pop hl
 
-rept 2
 	inc hl
-endr
+	inc hl
 	jr c, .loop
 
 .used_item
@@ -572,20 +571,20 @@ EnemyUsedFullHeal: ; 383a3 (e:43a3)
 
 EnemyUsedMaxPotion: ; 383ae (e:43ae)
 	ld a, MAX_POTION
-	ld [wd1f1], a
+	ld [CurEnemyItem], a
 	jr FullRestoreContinue
 
 EnemyUsedFullRestore: ; 383b5 (e:43b5)
 	call AI_HealStatus
 	ld a, FULL_RESTORE
-	ld [wd1f1], a
+	ld [CurEnemyItem], a
 	ld hl, EnemySubStatus3
 	res SUBSTATUS_CONFUSED, [hl]
 	xor a
 	ld [EnemyConfuseCount], a
 
 FullRestoreContinue: ; 383c6
-	ld de, wd1ec
+	ld de, wCurHPAnimOldHP
 	ld hl, EnemyMonHP + 1
 	ld a, [hld]
 	ld [de], a
@@ -597,11 +596,11 @@ FullRestoreContinue: ; 383c6
 	ld a, [hld]
 	ld [de], a
 	inc de
-	ld [Buffer1], a
+	ld [wCurHPAnimMaxHP], a
 	ld [EnemyMonHP + 1], a
 	ld a, [hl]
 	ld [de], a
-	ld [Buffer2], a
+	ld [wCurHPAnimMaxHP + 1], a
 	ld [EnemyMonHP], a
 	jr EnemyPotionFinish
 ; 383e8 (e:43e8)
@@ -621,20 +620,20 @@ EnemyUsedHyperPotion: ; 383f4 (e:43f4)
 	ld b, 200
 
 EnemyPotionContinue: ; 383f8
-	ld [wd1f1], a
+	ld [CurEnemyItem], a
 	ld hl, EnemyMonHP + 1
 	ld a, [hl]
-	ld [wd1ec], a
+	ld [wCurHPAnimOldHP], a
 	add b
 	ld [hld], a
-	ld [wd1ee], a
+	ld [wCurHPAnimNewHP], a
 	ld a, [hl]
-	ld [wd1ec + 1], a
+	ld [wCurHPAnimOldHP + 1], a
-	ld [wd1ee + 1], a
+	ld [wCurHPAnimNewHP + 1], a
 	jr nc, .ok
 	inc a
 	ld [hl], a
-	ld [wd1ee + 1], a
+	ld [wCurHPAnimNewHP + 1], a
 .ok
 	inc hl
 	ld a, [hld]
@@ -642,22 +641,22 @@ EnemyPotionContinue: ; 383f8
 	ld de, EnemyMonMaxHP + 1
 	ld a, [de]
 	dec de
-	ld [Buffer1], a
+	ld [wCurHPAnimMaxHP], a
 	sub b
 	ld a, [hli]
 	ld b, a
 	ld a, [de]
-	ld [Buffer2], a
+	ld [wCurHPAnimMaxHP + 1], a
 	sbc b
 	jr nc, EnemyPotionFinish
 	inc de
 	ld a, [de]
 	dec de
 	ld [hld], a
-	ld [wd1ee], a
+	ld [wCurHPAnimNewHP], a
 	ld a, [de]
 	ld [hl], a
-	ld [wd1ef], a
+	ld [wCurHPAnimNewHP + 1], a
 
 EnemyPotionFinish: ; 38436
 	call PrintText_UsedItemOn
@@ -726,7 +725,7 @@ AI_Switch: ; 3846c
 
 .skiptext
 	ld a, 1
-	ld [wAISwitch], a
+	ld [wBattleHasJustStarted], a
 	callab NewEnemyMonStatus
 	callab ResetEnemyStatLevels
 	ld hl, PlayerSubStatus1
@@ -734,7 +733,7 @@ AI_Switch: ; 3846c
 	callba EnemySwitch
 	callba ResetBattleParticipants
 	xor a
-	ld [wAISwitch], a
+	ld [wBattleHasJustStarted], a
 	ld a, [wLinkMode]
 	and a
 	ret nz
@@ -844,7 +843,7 @@ EnemyUsedXSpecial: ; 38553
 ; a = ITEM_CONSTANT
 ; b = BATTLE_CONSTANT (ATTACK, DEFENSE, SPEED, SP_ATTACK, SP_DEFENSE, ACCURACY, EVASION)
 EnemyUsedXItem:
-	ld [wd1f1], a
+	ld [CurEnemyItem], a
 	push bc
 	call PrintText_UsedItemOn
 	pop bc
@@ -856,13 +855,13 @@ EnemyUsedXItem:
 ; Parameter
 ; a = ITEM_CONSTANT
 PrintText_UsedItemOn_AND_AIUpdateHUD: ; 38568
-	ld [wd1f1], a
+	ld [CurEnemyItem], a
 	call PrintText_UsedItemOn
 	jp AIUpdateHUD
 ; 38571
 
 PrintText_UsedItemOn: ; 38571
-	ld a, [wd1f1]
+	ld a, [CurEnemyItem]
 	ld [wd265], a
 	call GetItemName
 	ld hl, StringBuffer1