Add meaningful aliases for wd265

Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
This commit is contained in:
Rangi
2018-07-28 19:27:34 -04:00
parent 2ec900d96c
commit 9dec80b07e
83 changed files with 436 additions and 404 deletions

View File

@@ -261,7 +261,7 @@ CopyMobileEZChatToC608:
.get_name
ld a, e
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, wStringBuffer1
ld bc, MON_NAME_LENGTH - 1

View File

@@ -428,7 +428,7 @@ Function4aad3:
.loop
push bc
push hl
ld e, 0
ld e, MONICON_PARTYMENU
farcall LoadMenuMonIcon
ld a, [hObjectStructIndexBuffer]
inc a

View File

@@ -1549,7 +1549,7 @@ _LinkBattleSendReceiveAction:
.StageForSend:
ld a, [wBattlePlayerAction]
and a
and a ; BATTLEPLAYERACTION_USEMOVE?
jr nz, .switch
ld a, [wCurPlayerMove]
ld b, BATTLEACTION_E
@@ -6383,7 +6383,7 @@ Function102d48:
ld hl, wPartyCount
add hl, de
ld a, [hl]
ld [wd265], a
ld [wTempSpecies], a
cp EGG
jr z, .asm_102d6d
dec a
@@ -6396,7 +6396,7 @@ Function102d48:
ld [hl], BASE_HAPPINESS
.asm_102d6d
ld a, [wd265]
ld a, [wTempSpecies]
cp UNOWN
jr nz, .asm_102d98
ld a, [wcd4c]
@@ -6529,7 +6529,7 @@ Function102e4f:
ld a, [de]
cp $ff
ret z
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
push bc
push hl
push de
@@ -6557,7 +6557,7 @@ Function102ea8:
ld hl, wPartySpecies
add hl, bc
ld a, [hl]
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, wStringBuffer1
ld de, wStringBuffer2
@@ -6570,7 +6570,7 @@ Function102ea8:
ld hl, wOTPartySpecies
add hl, bc
ld a, [hl]
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, UnknownText_0x102ee2
call PrintTextBoxText
@@ -6639,7 +6639,7 @@ Function102f85:
ld hl, wOTPartySpecies
add hl, bc
ld a, [hl]
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
call Function102dc3
ld de, String_102fb2
@@ -7518,11 +7518,11 @@ UnknownText_0x10377b:
db "@"
Function103780:
ld a, [wd265]
ld a, [wChosenCableClubRoom]
push af
call Function10378c
pop af
ld [wd265], a
ld [wChosenCableClubRoom], a
ret
Function10378c:

View File

@@ -318,7 +318,7 @@ Function108229:
MobileTradeAnim_InitSpeciesName:
push de
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, wStringBuffer1
pop de

View File

@@ -3967,7 +3967,7 @@ BattleTower_UbersCheck:
.uber_under_70
pop af
ld a, [de]
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, wStringBuffer1
ld de, wcd49
@@ -5624,11 +5624,11 @@ Function11ad1b:
ld [wCurIconTile], a
ld hl, LoadMenuMonIcon
ld a, BANK(LoadMenuMonIcon)
ld e, $4
ld e, MONICON_MOBILE1
rst FarCall
ld hl, LoadMenuMonIcon
ld a, BANK(LoadMenuMonIcon)
ld e, $5
ld e, MONICON_MOBILE2
rst FarCall
ld hl, $c6d0
ld bc, $0115
@@ -6127,7 +6127,7 @@ Function11b099:
.loop
push af
ld a, [de]
ld [wd265], a
ld [wTempSpecies], a
push de
push hl
call .PlaceMonNameOrPlaceholderString
@@ -6387,13 +6387,13 @@ Function11b20b:
ld hl, $c6d0
add hl, de
ld a, [hl]
ld [wd265], a
ld [wTempSpecies], a
ret
CheckCaughtMemMon:
push de
push hl
ld a, [wd265]
ld a, [wTempSpecies]
dec a
call CheckCaughtMon
pop hl
@@ -6403,7 +6403,7 @@ CheckCaughtMemMon:
CheckSeenMemMon:
push de
push hl
ld a, [wd265]
ld a, [wTempSpecies]
dec a
call CheckSeenMon
pop hl
@@ -6463,7 +6463,7 @@ Function11b275:
ret
Function11b279:
ld a, [wd265]
ld a, [wTempSpecies]
ld [wCurSpecies], a
call CheckSeenMemMon
jr z, .asm_11b28f

View File

@@ -121,10 +121,10 @@ Function170c06:
push hl
ld de, 0
xor a
ld [wd265], a
ld [wTempByteValue], a
.asm_170c30
ld hl, wPartyMon1HP
ld a, [wd265]
ld a, [wTempByteValue]
call GetPartyLocation
ld a, [hli]
ld b, a
@@ -143,9 +143,9 @@ Function170c06:
push hl
pop de
jr c, .asm_170c58
ld a, [wd265]
ld a, [wTempByteValue]
inc a
ld [wd265], a
ld [wTempByteValue], a
cp $3
jr c, .asm_170c30
jr .asm_170c5b

View File

@@ -3902,7 +3902,7 @@ Function17f1d0:
ld a, [hl]
ld a, $1
ld [rSVBK], a
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
pop hl
call PlaceString
@@ -4021,7 +4021,7 @@ Function17f27b:
ld a, [hl]
ld a, $1
ld [rSVBK], a
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetItemName
pop hl
call PlaceString