pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add meaningful aliases for wd265

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

34
engine/pokedex/pokedex.asm
View File

@@ -465,7 +465,7 @@ DexEntryScreen_MenuActionJumptable:
.Cry:
call Pokedex_GetSelectedMon
ld a, [wd265]
ld a, [wTempSpecies]
call GetCryIndex
ld e, c
ld d, b
@@ -1088,7 +1088,7 @@ Pokedex_DrawMainScreenBG:
ld hl, wPokedexSeen
ld b, wEndPokedexSeen - wPokedexSeen
call CountSetBits
ld de, wd265
ld de, wNumSetBits
hlcoord 5, 12
lb bc, 1, 3
call PrintNum
@@ -1098,7 +1098,7 @@ Pokedex_DrawMainScreenBG:
ld hl, wPokedexCaught
ld b, wEndPokedexCaught - wPokedexCaught
call CountSetBits
ld de, wd265
ld de, wNumSetBits
hlcoord 5, 15
lb bc, 1, 3
call PrintNum
@@ -1492,7 +1492,7 @@ Pokedex_PrintListing:
.loop
push af
ld a, [de]
ld [wd265], a
ld [wTempSpecies], a
push de
push hl
call .PrintEntry
@@ -1531,7 +1531,7 @@ Pokedex_PrintNumberIfOldMode:
push hl
ld de, -SCREEN_WIDTH
add hl, de
ld de, wd265
ld de, wTempSpecies
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
call PrintNum
pop hl
@@ -1585,13 +1585,13 @@ Pokedex_GetSelectedMon:
ld hl, wPokedexOrder
add hl, de
ld a, [hl]
ld [wd265], a
ld [wTempSpecies], a
ret
Pokedex_CheckCaught:
push de
push hl
ld a, [wd265]
ld a, [wTempSpecies]
dec a
call CheckCaughtMon
pop hl
@@ -1601,7 +1601,7 @@ Pokedex_CheckCaught:
Pokedex_CheckSeen:
push de
push hl
ld a, [wd265]
ld a, [wTempSpecies]
dec a
call CheckSeenMon
pop hl
@@ -1654,7 +1654,7 @@ Pokedex_OrderMonsByMode:
ld e, d
.loopfindend
ld a, [hld]
ld [wd265], a
ld [wTempSpecies], a
call Pokedex_CheckSeen
jr nz, .foundend
dec d
@@ -1674,10 +1674,10 @@ Pokedex_ABCMode:
.loop1abc
push bc
ld a, [de]
ld [wd265], a
ld [wTempSpecies], a
call Pokedex_CheckSeen
jr z, .skipabc
ld a, [wd265]
ld a, [wTempSpecies]
ld [hli], a
ld a, [wDexListingEnd]
inc a
@@ -1898,7 +1898,7 @@ Pokedex_SearchForMons:
ld a, [hl]
and a
jr z, .next_mon
ld [wd265], a
ld [wTempSpecies], a
ld [wCurSpecies], a
call Pokedex_CheckCaught
jr z, .next_mon
@@ -1917,7 +1917,7 @@ Pokedex_SearchForMons:
jr nz, .next_mon
.match_found
ld a, [wd265]
ld a, [wTempSpecies]
ld [de], a
inc de
ld a, [wDexSearchResultCount]
@@ -2354,7 +2354,7 @@ Pokedex_LoadSelectedMonTiles:
jr z, .QuestionMark
ld a, [wFirstUnownSeen]
ld [wUnownLetter], a
ld a, [wd265]
ld a, [wTempSpecies]
ld [wCurPartySpecies], a
call GetBaseData
ld de, vTiles2
@@ -2378,7 +2378,7 @@ Pokedex_LoadCurrentFootprint:
call Pokedex_GetSelectedMon
Pokedex_LoadAnyFootprint:
ld a, [wd265]
ld a, [wTempSpecies]
dec a
and %11111000
srl a
@@ -2386,7 +2386,7 @@ Pokedex_LoadAnyFootprint:
srl a
ld e, 0
ld d, a
ld a, [wd265]
ld a, [wTempSpecies]
dec a
and %111
swap a ; * $10
@@ -2524,7 +2524,7 @@ _NewPokedexEntry:
call LoadFontsExtra
call Pokedex_LoadGFX
call Pokedex_LoadAnyFootprint
ld a, [wd265]
ld a, [wTempSpecies]
ld [wCurPartySpecies], a
call Pokedex_DrawDexEntryScreenBG
call Pokedex_DrawFootprint

6
engine/pokedex/pokedex_2.asm
View File

@@ -80,7 +80,7 @@ DisplayDexEntry:
call GetPokemonName
hlcoord 9, 3
call PlaceString ; mon species
ld a, [wd265]
ld a, [wTempSpecies]
ld b, a
call GetDexEntryPointer
ld a, b
@@ -96,11 +96,11 @@ DisplayDexEntry:
ld [hli], a
ld a, $5d ; .
ld [hli], a
ld de, wd265
ld de, wTempSpecies
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
call PrintNum
; Check to see if we caught it. Get out of here if we haven't.
ld a, [wd265]
ld a, [wTempSpecies]
dec a
call CheckCaughtMon
pop hl