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

@@ -311,9 +311,9 @@ Function81adb:
ld a, [wcf66]
inc a
ld [wCurPartySpecies], a
ld [wd265], a
ld [wDeciramBuffer], a
hlcoord 0, 1
ld de, wd265
ld de, wDeciramBuffer
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
call PrintNum
ld a, [wd002]
@@ -353,7 +353,7 @@ Function81adb:
jr .asm_81ba9
.asm_81b7a
ld a, [wd265]
ld a, [wDeciramBuffer]
ld [wTrainerClass], a
callfar GetTrainerAttributes
ld de, wStringBuffer1
@@ -738,9 +738,9 @@ Function81df4:
call Function81e5e
ld a, [wd004]
inc a
ld [wd265], a
ld [wTempTMHM], a
predef GetTMHMMove
ld a, [wd265]
ld a, [wTempTMHM]
ld [wPutativeTMHMMove], a
call GetMoveName
hlcoord 10, 12

View File

@@ -593,7 +593,7 @@ Continue_DisplayBadgeCount:
ld b, 2
call CountSetBits
pop hl
ld de, wd265
ld de, wNumSetBits
lb bc, 1, 2
jp PrintNum
@@ -610,7 +610,7 @@ else
endc
call CountSetBits
pop hl
ld de, wd265
ld de, wNumSetBits
lb bc, 1, 3
jp PrintNum

View File

@@ -170,7 +170,7 @@ StartMenu_PrintBugContestStatus:
and a
ld de, .None
jr z, .no_contest_mon
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
.no_contest_mon

View File

@@ -84,13 +84,13 @@ NamingScreen:
.Pokemon:
ld a, [wCurPartySpecies]
ld [wd265], a
ld [wTempIconSpecies], a
ld hl, LoadMenuMonIcon
ld a, BANK(LoadMenuMonIcon)
ld e, $1
rst FarCall ; ; indirect jump to LoadMenuMonIcon (8e83f (23:683f))
ld e, MONICON_NAMINGSCREEN
rst FarCall
ld a, [wCurPartySpecies]
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
hlcoord 5, 2
call PlaceString

View File

@@ -133,12 +133,12 @@ StartMoveMonWOMail_SaveGame:
ret
PauseGameLogic:
ld a, $1
ld a, TRUE
ld [wGameLogicPaused], a
ret
ResumeGameLogic:
xor a
xor a ; FALSE
ld [wGameLogicPaused], a
ret
@@ -230,13 +230,13 @@ _SavingDontTurnOffThePower:
SavedTheGame:
call _SaveGameData
; wait 32 frames
ld c, $20
ld c, 32
call DelayFrames
; copy the original text speed setting to the stack
ld a, [wOptions]
push af
; set text speed super slow
ld a, 3
; set text speed to medium
ld a, TEXT_DELAY_MED
ld [wOptions], a
; <PLAYER> saved the game!
ld hl, Text_PlayerSavedTheGame
@@ -248,7 +248,7 @@ SavedTheGame:
call WaitPlaySFX
call WaitSFX
; wait 30 frames
ld c, $1e
ld c, 30
call DelayFrames
ret
@@ -332,8 +332,8 @@ SavingDontTurnOffThePower:
; Save the text speed setting to the stack
ld a, [wOptions]
push af
; Set the text speed to super slow
ld a, $3
; Set the text speed to medium
ld a, TEXT_DELAY_MED
ld [wOptions], a
; SAVING... DON'T TURN OFF THE POWER.
ld hl, Text_SavingDontTurnOffThePower
@@ -342,7 +342,7 @@ SavingDontTurnOffThePower:
pop af
ld [wOptions], a
; Wait for 16 frames
ld c, $10
ld c, 16
call DelayFrames
ret

View File

@@ -639,7 +639,7 @@ CantUseItemText:
PartyMonItemName:
ld a, [wCurItem]
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetItemName
call CopyName1
ret
@@ -842,17 +842,17 @@ TryGiveItemToPartymon:
ret
.already_holding_item
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
call GetItemName
ld hl, SwitchAlreadyHoldingText
call StartMenuYesNo
jr c, .abort
call GiveItemToPokemon
ld a, [wd265]
ld a, [wNamedObjectIndexBuffer]
push af
ld a, [wCurItem]
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
pop af
ld [wCurItem], a
call ReceiveItemFromPokemon
@@ -860,13 +860,13 @@ TryGiveItemToPartymon:
ld hl, TookAndMadeHoldText
call MenuTextBoxBackup
ld a, [wd265]
ld a, [wNamedObjectIndexBuffer]
ld [wCurItem], a
call GivePartyItem
ret
.bag_full
ld a, [wd265]
ld a, [wNamedObjectIndexBuffer]
ld [wCurItem], a
call ReceiveItemFromPokemon
ld hl, ItemStorageIsFullText
@@ -901,7 +901,7 @@ TakePartyItem:
farcall ItemIsMail
call GetPartyItemLocation
ld a, [hl]
ld [wd265], a
ld [wNamedObjectIndexBuffer], a
ld [hl], NO_ITEM
call GetItemName
ld hl, TookFromText
@@ -1654,8 +1654,8 @@ SetUpMoveScreenBG:
ld hl, wPartySpecies
add hl, de
ld a, [hl]
ld [wd265], a
ld e, $2
ld [wTempIconSpecies], a
ld e, MONICON_MOVES
farcall LoadMenuMonIcon
hlcoord 0, 1
ld b, 9
@@ -1755,8 +1755,8 @@ PlaceMoveData:
hlcoord 16, 12
cp 2
jr c, .no_power
ld [wd265], a
ld de, wd265
ld [wDeciramBuffer], a
ld de, wDeciramBuffer
lb bc, 1, 3
call PrintNum
jr .description

View File

@@ -276,7 +276,7 @@ TrainerCard_Page1_PrintDexCaught_GameTime:
ld hl, wPokedexCaught
ld b, wEndPokedexCaught - wPokedexCaught
call CountSetBits
ld de, wd265
ld de, wNumSetBits
hlcoord 15, 10
lb bc, 1, 3
call PrintNum