named wram variables

This commit is contained in:
YamaArashi 2015-07-14 23:16:06 -07:00
parent 07dd705637
commit 994c2cbf28
21 changed files with 246 additions and 204 deletions

View file

@ -325,9 +325,9 @@ Func_216b3: ; 216b3 (8:56b3)
Func_216be: ; 216be (8:56be)
ld a, l
ld [wList], a
ld [wListPointer], a
ld a, h
ld [wList + 1], a
ld [wListPointer + 1], a
xor a
ld [wPrintItemPrices], a
ld [wListMenuID], a

View file

@ -227,7 +227,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
ld h,[hl]
ld l,a
push hl
ld a,[wcf06]
ld a,[wUsedItemOnWhichPokemon]
ld hl,wPartyMonNicks
call GetPartyMonName
pop hl

View file

@ -97,9 +97,9 @@ Func_79ab: ; 79ab (1:79ab)
call PrintText
ld hl, wNumBagItems
ld a, l
ld [wList], a
ld [wListPointer], a
ld a, h
ld [wList + 1], a
ld [wListPointer + 1], a
xor a
ld [wPrintItemPrices], a
ld a, $3
@ -151,9 +151,9 @@ Func_7a28: ; 7a28 (1:7a28)
call PrintText
ld hl, wNumBoxItems
ld a, l
ld [wList], a
ld [wListPointer], a
ld a, h
ld [wList + 1], a
ld [wListPointer + 1], a
xor a
ld [wPrintItemPrices], a
ld a, $3
@ -205,9 +205,9 @@ Func_7aa5: ; 7aa5 (1:7aa5)
call PrintText
ld hl, wNumBoxItems
ld a, l
ld [wList], a
ld [wListPointer], a
ld a, h
ld [wList + 1], a
ld [wListPointer + 1], a
xor a
ld [wPrintItemPrices], a
ld a, $3

View file

@ -153,7 +153,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
bit 1,a ; does the player have the Cascade Badge?
jp z,.newBadgeRequired
predef UsedCut
ld a,[wcd6a]
ld a,[wActionResultOrTookBattleTurn]
and a
jp z,.loop
jp CloseTextDisplay
@ -169,7 +169,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
ld [wcf91],a
ld [wd152],a
call UseItem
ld a,[wcd6a]
ld a,[wActionResultOrTookBattleTurn]
and a
jp z,.loop
call GBPalWhiteOutWithDelay3
@ -197,7 +197,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
ld [wcf91],a
ld [wd152],a
call UseItem
ld a,[wcd6a]
ld a,[wActionResultOrTookBattleTurn]
and a
jp z,.loop
call GBPalWhiteOutWithDelay3
@ -308,10 +308,10 @@ StartMenu_Item: ; 13302 (4:7302)
jr .exitMenu
.notInCableClubRoom
ld bc,wNumBagItems
ld hl,wList
ld hl,wListPointer
ld a,c
ld [hli],a
ld [hl],b ; store item bag pointer at wList (for DisplayListMenuID)
ld [hl],b ; store item bag pointer in wListPointer (for DisplayListMenuID)
xor a
ld [wPrintItemPrices],a
ld a,ITEMLISTMENU
@ -401,7 +401,7 @@ StartMenu_Item: ; 13302 (4:7302)
xor a
ld [wd152],a
call UseItem
ld a,[wcd6a]
ld a,[wActionResultOrTookBattleTurn]
and a
jp z,ItemMenuLoop
jp CloseStartMenu
@ -409,7 +409,7 @@ StartMenu_Item: ; 13302 (4:7302)
ld a,[wUpdateSpritesEnabled]
push af
call UseItem
ld a,[wcd6a]
ld a,[wActionResultOrTookBattleTurn]
cp a,$02
jp z,.partyMenuNotDisplayed
call GBPalWhiteOutWithDelay3

View file

@ -316,7 +316,7 @@ StatusScreen2: ; 12b57 (4:6b57)
hlCoord 2, 9
ld de, wMovesString
call PlaceString ; Print moves
ld a, [wcd6c]
ld a, [wNumMovesMinusOne]
inc a
ld c, a
ld a, $4
@ -335,7 +335,7 @@ StatusScreen2: ; 12b57 (4:6b57)
.InitPP ; 12bbb
ld hl, wLoadedMonMoves
deCoord 14, 10
ld b, $0
ld b, 0
.PrintPP ; 12bc3
ld a, [hli]
and a
@ -356,15 +356,15 @@ StatusScreen2: ; 12b57 (4:6b57)
pop de
pop hl
push hl
ld bc, $0014
ld bc, wPartyMon1PP - wPartyMon1Moves - 1
add hl, bc
ld a, [hl]
and $3f
ld [wcd71], a
ld [wStatusScreenCurrentPP], a
ld h, d
ld l, e
push hl
ld de, wcd71
ld de, wStatusScreenCurrentPP
ld bc, $0102
call PrintNumber
ld a, "/"