Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename some labels

Browse Source 
- Remove "Buffer" suffix from some byte and word quantities
- Change "Ptr" to "Pointer"

Fixes #789
This commit is contained in:
Rangi
2020-12-23 16:29:30 -05:00
parent 1a054661ec
commit 99e66c2557
106 changed files with 584 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/fixed_words.asm
View File

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

10
mobile/mobile_12.asm
View File

@@ -295,7 +295,7 @@ asm_4828d:
call WaitBGMap
ld a, [wPlayerGender]
inc a
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
call StaticMenuJoypad
call PlayClickSFX
call ExitMenu
@@ -339,7 +339,7 @@ Function48304:
ld b, $c
ld c, $8
call Function48cdc
ld a, [wMenuCursorBuffer]
ld a, [wMenuCursorPosition]
ld b, a
ld a, [wMenuScrollPosition]
ld c, a
@@ -350,7 +350,7 @@ Function48304:
jr c, .asm_4833f
sub $29
inc a
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
ld a, $29
.asm_4833f
ld [wMenuScrollPosition], a
@@ -363,7 +363,7 @@ Function48304:
ld d, a
pop bc
ld a, b
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
ld a, c
ld [wMenuScrollPosition], a
ld a, d
@@ -412,7 +412,7 @@ Function48383:
.asm_483af
ld hl, wMenuCursorY
ld a, [hl]
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
scf
.asm_483b7
pop bc

2
mobile/mobile_12_2.asm
View File

@@ -719,7 +719,7 @@ Function4acaa:
ld a, $b
ld [wMenuBorderLeftCoord], a
ld a, $1
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
call InitVerticalMenuCursor
ld hl, w2DMenuFlags1
set 6, [hl]

6
mobile/mobile_22.asm
View File

@@ -234,7 +234,7 @@ Function89261:
add $5
ld [hl], a
pop af
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
call PushWindow
call Mobile22_SetBGMapMode0
call Mobile_EnableSpriteUpdates
@@ -2087,7 +2087,7 @@ Function89d5e:
push af
call CopyMenuHeader
pop af
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
call Mobile22_SetBGMapMode0
call PlaceVerticalMenuItems
call InitVerticalMenuCursor
@@ -2904,7 +2904,7 @@ Function8a31c:
call Function8a3b2
pop bc
ld a, c
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
ld [wMenuSelection], a
call PlaceVerticalMenuItems
call InitVerticalMenuCursor

4
mobile/mobile_22_2.asm
View File

@@ -772,7 +772,7 @@ Function8b7bd:
ld hl, MenuHeader_0x8b867
call CopyMenuHeader
ld a, [wd030]
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
ld a, [wd031]
ld [wMenuScrollPosition], a
ld a, [wd032]
@@ -848,7 +848,7 @@ Function8b83e:
Function8b84b:
ld [wMenuScrollPosition], a
ld a, [wMenuCursorY]
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
ret
Function8b855:

22
mobile/mobile_40.asm
View File

@@ -1698,14 +1698,14 @@ Mobile_LoadBattleMenu:
call FarCall_de
ld a, BANK(BattleMenuHeader)
ld [wMenuData_2DMenuItemStringsBank], a
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
ld a, [wBattleMenuCursorPosition]
ld [wMenuCursorPosition], a
call Function100e72
call Function100b45
farcall InitPartyMenuBGPal7
call Function100ed4
ld a, [wMenuCursorBuffer]
ld [wBattleMenuCursorBuffer], a
ld a, [wMenuCursorPosition]
ld [wBattleMenuCursorPosition], a
call ExitMenu
ret
@@ -1730,7 +1730,7 @@ Function100b45:
ld c, a
ld a, [w2DMenuNumRows]
call SimpleMultiply
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
and a
ret
@@ -1749,7 +1749,7 @@ Function100b7a:
Mobile_MoveSelectionScreen:
xor a
ld [wMoveSwapBuffer], a
ld [wSwappingMove], a
farcall CheckPlayerHasUsableMoves
ret z
call Function100dd8
@@ -6522,7 +6522,7 @@ Function102e4f:
ld a, [de]
cp $ff
ret z
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
push bc
push hl
push de
@@ -6550,7 +6550,7 @@ Function102ea8:
ld hl, wPartySpecies
add hl, bc
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, wStringBuffer1
ld de, wStringBuffer2
@@ -6563,7 +6563,7 @@ Function102ea8:
ld hl, wOTPartySpecies
add hl, bc
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, UnknownText_0x102ee2
call PrintTextboxText
@@ -6632,7 +6632,7 @@ Function102f85:
ld hl, wOTPartySpecies
add hl, bc
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
call Function102dc3
ld de, String_102fb2
@@ -7288,7 +7288,7 @@ AskMobileOrCable:
ld a, [wMobileOrCable_LastSelection]
and $0f
jr z, .skip_load
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
.skip_load
call VerticalMenu

2
mobile/mobile_42.asm
View File

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

70
mobile/mobile_46.asm
View File

@@ -3979,7 +3979,7 @@ BattleTower_UbersCheck:
.uber_under_70
pop af
ld a, [de]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, wStringBuffer1
ld de, wcd49
@@ -7181,29 +7181,29 @@ Function11b6b4:
ld [$c709], a
ld a, LOW($c708) ; Species
ld [wMobileMonSpeciesPointerBuffer], a
ld [wMobileMonSpeciesPointer], a
ld a, HIGH($c708)
ld [wMobileMonSpeciesPointerBuffer + 1], a
ld [wMobileMonSpeciesPointer + 1], a
ld a, LOW($c60d) ; Partymon Struct
ld [wMobileMonStructurePointerBuffer], a
ld [wMobileMonStructPointer], a
ld a, HIGH($c60d)
ld [wMobileMonStructurePointerBuffer + 1], a
ld [wMobileMonStructPointer + 1], a
ld a, LOW($c63d) ; OT
ld [wMobileMonOTNamePointerBuffer], a
ld [wMobileMonOTNamePointer], a
ld a, HIGH($c63d)
ld [wMobileMonOTNamePointerBuffer + 1], a
ld [wMobileMonOTNamePointer + 1], a
ld a, LOW($c642) ; Nickname
ld [wMobileMonNicknamePointerBuffer], a
ld [wMobileMonNicknamePointer], a
ld a, HIGH($c642)
ld [wMobileMonNicknamePointerBuffer + 1], a
ld [wMobileMonNicknamePointer + 1], a
ld a, LOW($c647) ; Mail
ld [wMobileMonMailPointerBuffer], a
ld [wMobileMonMailPointer], a
ld a, HIGH($c647)
ld [wMobileMonMailPointerBuffer + 1], a
ld [wMobileMonMailPointer + 1], a
ld a, $46
ld [$c628], a
@@ -7483,29 +7483,29 @@ Function11b93b:
call CloseSRAM
ld a, LOW($c608)
ld [wMobileMonSpeciesPointerBuffer], a
ld [wMobileMonSpeciesPointer], a
ld a, HIGH($c608)
ld [wMobileMonSpeciesPointerBuffer + 1], a
ld [wMobileMonSpeciesPointer + 1], a
ld a, LOW($c611)
ld [wMobileMonStructurePointerBuffer], a
ld [wMobileMonStructPointer], a
ld a, HIGH($c611)
ld [wMobileMonStructurePointerBuffer + 1], a
ld [wMobileMonStructPointer + 1], a
ld a, LOW($c641)
ld [wMobileMonOTNamePointerBuffer], a
ld [wMobileMonOTNamePointer], a
ld a, HIGH($c641)
ld [wMobileMonOTNamePointerBuffer + 1], a
ld [wMobileMonOTNamePointer + 1], a
ld a, LOW($c646)
ld [wMobileMonNicknamePointerBuffer], a
ld [wMobileMonNicknamePointer], a
ld a, HIGH($c646)
ld [wMobileMonNicknamePointerBuffer + 1], a
ld [wMobileMonNicknamePointer + 1], a
ld a, LOW($c64b)
ld [wMobileMonMailPointerBuffer], a
ld [wMobileMonMailPointer], a
ld a, HIGH($c64b)
ld [wMobileMonMailPointerBuffer + 1], a
ld [wMobileMonMailPointer + 1], a
call AddMobileMonToParty
farcall SaveAfterLinkTrade
ret
@@ -7516,9 +7516,9 @@ AddMobileMonToParty:
ld e, a
inc [hl]
ld a, [wMobileMonSpeciesPointerBuffer]
ld a, [wMobileMonSpeciesPointer]
ld l, a
ld a, [wMobileMonSpeciesPointerBuffer + 1]
ld a, [wMobileMonSpeciesPointer + 1]
ld h, a
inc hl
ld bc, wPartySpecies
@@ -7538,7 +7538,7 @@ AddMobileMonToParty:
ld hl, wPartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
ld a, e
ld [wMobileMonSpeciesBuffer], a
ld [wMobileMonSpecies], a
.loop2
add hl, bc
dec a
@@ -7546,16 +7546,16 @@ AddMobileMonToParty:
jr nz, .loop2
ld e, l
ld d, h
ld a, [wMobileMonStructurePointerBuffer]
ld a, [wMobileMonStructPointer]
ld l, a
ld a, [wMobileMonStructurePointerBuffer + 1]
ld a, [wMobileMonStructPointer + 1]
ld h, a
ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes
ld hl, wPartyMonOT
ld bc, NAME_LENGTH
ld a, [wMobileMonSpeciesBuffer]
ld a, [wMobileMonSpecies]
.loop3
add hl, bc
dec a
@@ -7563,9 +7563,9 @@ AddMobileMonToParty:
jr nz, .loop3
ld e, l
ld d, h
ld a, [wMobileMonOTNamePointerBuffer]
ld a, [wMobileMonOTNamePointer]
ld l, a
ld a, [wMobileMonOTNamePointerBuffer + 1]
ld a, [wMobileMonOTNamePointer + 1]
ld h, a
ld bc, MON_NAME_LENGTH - 1
call CopyBytes
@@ -7574,7 +7574,7 @@ AddMobileMonToParty:
ld hl, wPartyMonNicknames
ld bc, MON_NAME_LENGTH
ld a, [wMobileMonSpeciesBuffer]
ld a, [wMobileMonSpecies]
.loop4
add hl, bc
dec a
@@ -7582,9 +7582,9 @@ AddMobileMonToParty:
jr nz, .loop4
ld e, l
ld d, h
ld a, [wMobileMonNicknamePointerBuffer]
ld a, [wMobileMonNicknamePointer]
ld l, a
ld a, [wMobileMonNicknamePointerBuffer + 1]
ld a, [wMobileMonNicknamePointer + 1]
ld h, a
ld bc, MON_NAME_LENGTH - 1
call CopyBytes
@@ -7593,7 +7593,7 @@ AddMobileMonToParty:
ld hl, sPartyMail
ld bc, MAIL_STRUCT_LENGTH
ld a, [wMobileMonSpeciesBuffer]
ld a, [wMobileMonSpecies]
.loop5
add hl, bc
dec a
@@ -7603,9 +7603,9 @@ AddMobileMonToParty:
call OpenSRAM
ld e, l
ld d, h
ld a, [wMobileMonMailPointerBuffer]
ld a, [wMobileMonMailPointer]
ld l, a
ld a, [wMobileMonMailPointerBuffer + 1]
ld a, [wMobileMonMailPointer + 1]
ld h, a
ld bc, MAIL_STRUCT_LENGTH
call CopyBytes

6
mobile/mobile_5f.asm
View File

@@ -2596,7 +2596,7 @@ Function17e0fd:
ld a, [hli]
ld [wCurItem], a
ld a, [hli]
ld [wItemQuantityChangeBuffer], a
ld [wItemQuantityChange], a
push hl
ld hl, wNumItems
call ReceiveItem
@@ -3871,7 +3871,7 @@ Function17f1d0:
ld a, [hl]
ld a, $1
ldh [rSVBK], a
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
pop hl
call PlaceString
@@ -3990,7 +3990,7 @@ Function17f27b:
ld a, [hl]
ld a, $1
ldh [rSVBK], a
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetItemName
pop hl
call PlaceString