Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 68 insertions, 68 deletions

diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm
index 25e36cae..ae4a328b 100644
--- a/engine/debug/debug_menu.asm
+++ b/engine/debug/debug_menu.asm
@@ -55,7 +55,7 @@ IF DEF(_DEBUG)
 	jp z, TestBattle
 
 	; DEBUG
-	ld hl, wd732
+	ld hl, wStatusFlags6
 	set BIT_DEBUG_MODE, [hl]
 	ld hl, StartNewGameDebug
 	ret
@@ -78,7 +78,7 @@ TestBattle: ; unreferenced except in _DEBUG
 	ld a, 1 << BIT_EARTHBADGE
 	ld [wObtainedBadges], a
 
-	ld hl, wFlags_D733
+	ld hl, wStatusFlags7
 	set BIT_TEST_BATTLE, [hl]
 
 	ld hl, wNumBagItems
@@ -88,7 +88,7 @@ TestBattle: ; unreferenced except in _DEBUG
 	cp -1
 	jr z, .done
 	inc de
-	ld [wcf91], a
+	ld [wCurItem], a
 	ld a, [de]
 	inc de
 	ld [wItemQuantity], a
@@ -186,7 +186,7 @@ Func_fe812:
 	; fallthrough
 Func_fe81a:
 	ld [de], a
-	ld [wd11e], a
+	ld [wTempByteValue], a
 	push bc
 	push hl
 	push de
@@ -201,7 +201,7 @@ Func_fe81a:
 	ld de, Text_fed9c
 	call PlaceString
 	pop hl
-	ld a, [wd11e]
+	ld a, [wNamedObjectIndex]
 	and a
 	jr nz, .asm_fe845
 	ld de, Text_feda2
@@ -424,17 +424,17 @@ Func_fe97f:
 	ld [wIsInBattle], a
 .asm_fe990
 	ld a, b
-	ld [wcf91], a
+	ld [wCurPartySpecies], a
 	ld a, [hl]
 	ld b, a
 	inc de
 	ld a, [de]
 	and a
 	jr z, .asm_fe9ab
-	ld [wCurEnemyLVL], a
+	ld [wCurEnemyLevel], a
 	xor a
 	ld [wMonDataLocation], a
-	ld a, [wcf91]
+	ld a, [wCurPartySpecies]
 	and a
 	jr z, .asm_fe9ab
 	call AddPartyMon
@@ -487,9 +487,9 @@ Func_fe97f:
 	dec a
 	jr z, .asm_fea40
 	ld a, [wTrainerClass]
-	ld [wd11e], a
+	ld [wTempByteValue], a
 	ld b, a
-	ld de, wd11e
+	ld de, wTempByteValue
 	hlcoord 1, 8
 	push bc
 	lb bc, LEADING_ZEROES | 1, 3
@@ -507,7 +507,7 @@ Func_fe97f:
 	ld a, b
 	and a
 	jr z, .asm_fea65
-	ld de, wd11e
+	ld de, wTempByteValue
 	ld [de], a
 	hlcoord 1, 8
 	push bc
@@ -523,7 +523,7 @@ Func_fe97f:
 .asm_fea65
 	ld a, [wEnemyMonLevel]
 	ld c, a
-	ld de, wd11e
+	ld de, wTempByteValue
 	ld [de], a
 	hlcoord 16, 8
 	push bc
@@ -626,13 +626,13 @@ Func_feb13:
 	; fallthrough
 Func_feb35:
 	ld a, b
-	ld [wd11e], a
-	ld de, wd11e
+	ld [wTempByteValue], a
+	ld de, wTempByteValue
 	hlcoord 1, 8
 	push bc
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
-	ld a, [wd11e]
+	ld a, [wTempByteValue]
 	ld [wTrainerClass], a
 	call GetTrainerName
 	hlcoord 5, 8
@@ -649,8 +649,8 @@ Func_feb35:
 	; fallthrough
 Func_feb64:
 	ld a, b
-	ld [wd11e], a
-	ld de, wd11e
+	ld [wTempByteValue], a
+	ld de, wTempByteValue
 	hlcoord 1, 8
 	push bc
 	lb bc, LEADING_ZEROES | 1, 3
@@ -725,7 +725,7 @@ Func_febe6:
 Func_febee:
 	hlcoord 16, 8
 	ld a, c
-	ld de, wCurEnemyLVL
+	ld de, wCurEnemyLevel
 	ld [de], a
 	push bc
 	lb bc, LEADING_ZEROES | 1, 3
@@ -761,11 +761,11 @@ Func_fec10:
 	ld [wTrainerNo], a
 .asm_fec28
 	ld a, c
-	ld [wCurEnemyLVL], a
+	ld [wCurEnemyLevel], a
 	ld a, b
 	ld [wCurOpponent], a
 	xor a
-	ld [wd72d], a
+	ld [wStatusFlags3], a
 	predef InitOpponent
 	xor a
 	ld [wNumRunAttempts], a
@@ -817,7 +817,7 @@ Func_fec9b:
 	ld a, [de]
 	cp -1
 	jp z, Func_fed01
-	ld [wd11e], a
+	ld [wTempByteValue], a
 	push hl
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
@@ -838,7 +838,7 @@ Func_fec9b:
 	ld d, h
 	ld e, l
 	ld a, [de]
-	ld [wCurEnemyLVL], a
+	ld [wCurEnemyLevel], a
 	pop hl
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
@@ -849,7 +849,7 @@ Func_fec9b:
 	jr nc, .asm_fecee
 	inc d
 .asm_fecee
-	ld a, [wCurEnemyLVL]
+	ld a, [wCurEnemyLevel]
 	ld [de], a
 	pop hl
 	ld a, [wWhichPokemon]
@@ -935,8 +935,8 @@ Func_fedfe:
 	ld [hl], a
 	inc a
 	ldh [hJoy7], a
-	ld [wcf91], a
-	ld [wCurEnemyLVL], a
+	ld [wCurPartySpecies], a
+	ld [wCurEnemyLevel], a
 	; fallthrough
 Func_fee23:
 	hlcoord 0, 3
@@ -957,7 +957,7 @@ Func_fee23:
 	jr .asm_fee30
 
 Func_fee49:
-	ld hl, wcf91
+	ld hl, wCurPartySpecies
 	inc [hl]
 	ld a, [hl]
 	cp NUM_POKEMON + 1
@@ -966,7 +966,7 @@ Func_fee49:
 	jr Func_fee23
 
 Func_fee56:
-	ld hl, wcf91
+	ld hl, wCurPartySpecies
 	dec [hl]
 	jr nz, Func_fee23
 	ld [hl], DEX_MEW
@@ -977,19 +977,19 @@ Func_fee60:
 	lb bc, 2, 9
 	call ClearScreenArea
 	hlcoord 1, 1
-	ld de, wcf91
+	ld de, wCurPartySpecies
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
 	inc hl
 	push hl
-	ld a, [wcf91]
-	ld [wd11e], a
+	ld a, [wCurPartySpecies]
+	ld [wPokedexNum], a
 	callfar PokedexToIndex
 	call GetMonName
 	pop hl
 	call PlaceString
-	ld a, [wd11e]
-	ld [wd0b5], a
+	ld a, [wPokedexNum]
+	ld [wCurSpecies], a
 	call GetMonHeader
 	ret
 
@@ -1005,7 +1005,7 @@ Func_fee96:
 .asm_feeab
 	call DelayFrame
 	call JoypadLowSensitivity
-	ld hl, wCurEnemyLVL
+	ld hl, wCurEnemyLevel
 	ldh a, [hJoy5]
 	bit BIT_A_BUTTON, a
 	jp nz, Func_feed1
@@ -1035,7 +1035,7 @@ Func_feedb:
 
 Func_feee2:
 	hlcoord 1, 3
-	ld de, wCurEnemyLVL
+	ld de, wCurEnemyLevel
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
 	ret
@@ -1044,9 +1044,9 @@ Func_feeef:
 	hlcoord 1, 4
 	lb bc, 8, 11
 	call ClearScreenArea
-	ld a, [wcf91]
+	ld a, [wCurPartySpecies]
 	push af
-	ld [wd11e], a
+	ld [wPokedexNum], a
 	ld hl, BaseStats + 15
 	dec a
 	ld bc, BASE_DATA_SIZE
@@ -1056,8 +1056,8 @@ Func_feeef:
 	ld a, BANK(BaseStats)
 	call FarCopyData
 	callfar PokedexToIndex
-	ld a, [wd11e]
-	ld [wcf91], a
+	ld a, [wPokedexNum]
+	ld [wCurPartySpecies], a
 	xor a
 	ld [wChangeMonPicEnemyTurnSpecies], a
 	ld de, wMoves
@@ -1073,8 +1073,8 @@ Func_feeef:
 	push de
 	push bc
 	push hl
-	ld [wd11e], a
-	ld de, wd11e
+	ld [wTempByteValue], a
+	ld de, wTempByteValue
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
 	inc hl
@@ -1089,7 +1089,7 @@ Func_feeef:
 	jr nz, .asm_fef36
 .asm_fef5b
 	pop af
-	ld [wcf91], a
+	ld [wCurPartySpecies], a
 	ret
 
 Func_fef60:
@@ -1183,11 +1183,11 @@ Func_fefc5:
 	pop hl
 	inc hl
 	ld a, [de]
-	ld de, wd11e
+	ld de, wTempByteValue
 	ld [de], a
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
-	ld a, [wd11e]
+	ld a, [wTempByteValue]
 	and a
 	jr z, .asm_ff002
 	call Func_ff006
@@ -1201,19 +1201,19 @@ Func_fefc5:
 	ret
 
 Func_ff006:
-	ld a, [wcf91]
+	ld a, [wCurPartySpecies]
 	push af
-	ld a, [wd11e]
+	ld a, [wPokedexNum]
 	push af
 	push hl
-	ld a, [wcf91]
-	ld [wd11e], a
+	ld a, [wCurPartySpecies]
+	ld [wPokedexNum], a
 	callfar PokedexToIndex
-	ld a, [wd11e]
-	ld [wcf91], a
+	ld a, [wPokedexNum]
+	ld [wCurPartySpecies], a
 	pop hl
 	pop af
-	ld [wd11e], a
+	ld [wPokedexNum], a
 	push hl
 	callfar Func_3b079
 	pop hl
@@ -1221,7 +1221,7 @@ Func_ff006:
 	ld [hl], "×"
 .asm_ff036
 	pop af
-	ld [wcf91], a
+	ld [wCurPartySpecies], a
 	ret
 
 Func_ff03b:
@@ -1306,7 +1306,7 @@ Func_ff09e:
 	pop hl
 	inc hl
 	ld a, [de]
-	ld de, wd11e
+	ld de, wTempByteValue
 	ld [de], a
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
@@ -1366,17 +1366,17 @@ Text_ff113:
 	next "とくしゅ@" ; special
 
 Func_ff12c:
-	ld a, [wCurEnemyLVL]
+	ld a, [wCurEnemyLevel]
 	ld [wEnemyMonLevel], a
-	ld a, [wcf91]
-	ld [wd11e], a
+	ld a, [wCurPartySpecies]
+	ld [wPokedexNum], a
 	callfar PokedexToIndex
-	ld a, [wd11e]
-	ld [wcf91], a
-	ld [wd0b5], a
+	ld a, [wPokedexNum]
+	ld [wCurPartySpecies], a
+	ld [wCurSpecies], a
 	call GetMonHeader
 	ld hl, wEnemyMon
-	ld a, [wcf91]
+	ld a, [wCurPartySpecies]
 	ld [hli], a
 	ld a, [wLoadedMonStats]
 	ld [hli], a
@@ -1436,7 +1436,7 @@ Func_ff1b9:
 	ld a, 1
 	ldh [hJoy7], a
 	ld a, 2
-	ld [wCurEnemyLVL], a
+	ld [wCurEnemyLevel], a
 	ld hl, Text_ff290
 	call PrintText
 	call YesNoChoice
@@ -1463,7 +1463,7 @@ Func_ff1e7:
 	ld [hl], "ル"
 	inc hl
 	inc hl
-	ld de, wCurEnemyLVL
+	ld de, wCurEnemyLevel
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
 	call DelayFrame
@@ -1478,20 +1478,20 @@ Func_ff1e7:
 	jr Func_ff1e7
 
 Func_ff21b:
-	ld a, [wCurEnemyLVL]
+	ld a, [wCurEnemyLevel]
 	inc a
 	cp MAX_LEVEL + 1
 	jr c, Func_ff231
 	ld a, 2
 	jr Func_ff231
 Func_ff227:
-	ld a, [wCurEnemyLVL]
+	ld a, [wCurEnemyLevel]
 	dec a
 	cp 2
 	jr nc, Func_ff231
 	ld a, MAX_LEVEL
 Func_ff231:
-	ld [wCurEnemyLVL], a
+	ld [wCurEnemyLevel], a
 	jr Func_ff1e7
 
 Func_ff236:
@@ -1511,16 +1511,16 @@ Func_ff236:
 	push bc
 	push de
 	ld a, c
-	ld [wd11e], a
+	ld [wPokedexNum], a
 	callfar PokedexToIndex
-	ld a, [wd11e]
+	ld a, [wPokedexNum]
 	ld [wEnemyMonSpecies2], a
-	ld [wcf91], a
+	ld [wCurPartySpecies], a
 	xor a
 	ld [wEnemyBattleStatus3], a
 	callfar LoadEnemyMonData
 	ld a, [wEnemyMonSpecies2]
-	ld [wcf91], a
+	ld [wCurPartySpecies], a
 	callfar SendNewMonToBox
 	pop de
 	pop bc