Rename some labels
- Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
This commit is contained in:
@@ -320,9 +320,9 @@ DebugColor_InitScreen:
|
||||
ld a, [wDebugColorCurMon]
|
||||
inc a
|
||||
ld [wCurPartySpecies], a
|
||||
ld [wDeciramBuffer], a
|
||||
ld [wTextDecimalByte], a
|
||||
hlcoord 0, 1
|
||||
ld de, wDeciramBuffer
|
||||
ld de, wTextDecimalByte
|
||||
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
|
||||
call PrintNum
|
||||
ld a, [wDebugColorIsTrainer]
|
||||
@@ -364,7 +364,7 @@ DebugColor_InitScreen:
|
||||
jr .done
|
||||
|
||||
.trainer
|
||||
ld a, [wDeciramBuffer]
|
||||
ld a, [wTextDecimalByte]
|
||||
ld [wTrainerClass], a
|
||||
callfar GetTrainerAttributes
|
||||
ld de, wStringBuffer1
|
||||
|
@@ -573,9 +573,9 @@ DebugRoom_EditPagedValues:
|
||||
ld a, [hli]
|
||||
ld [wDebugRoomPageCount], a
|
||||
ld a, l
|
||||
ld [wDebugRoomPagedValuesPtr], a
|
||||
ld [wDebugRoomPagesPointer], a
|
||||
ld a, h
|
||||
ld [wDebugRoomPagedValuesPtr+1], a
|
||||
ld [wDebugRoomPagesPointer+1], a
|
||||
ld hl, hInMenu
|
||||
ld a, [hl]
|
||||
push af
|
||||
@@ -669,7 +669,7 @@ DebugRoom_PageString:
|
||||
db " P @"
|
||||
|
||||
DebugRoom_IncrementPagedValue:
|
||||
call DebugRoom_GetCurPagedValuePtr
|
||||
call DebugRoom_GetCurPagedValuePointer
|
||||
ld e, [hl] ; de = value address
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
@@ -684,7 +684,7 @@ DebugRoom_IncrementPagedValue:
|
||||
ret
|
||||
|
||||
DebugRoom_DecrementPagedValue:
|
||||
call DebugRoom_GetCurPagedValuePtr
|
||||
call DebugRoom_GetCurPagedValuePointer
|
||||
ld e, [hl] ; de = value address
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
@@ -709,7 +709,7 @@ DebugRoom_NextPage:
|
||||
ld [wDebugRoomCurPage], a
|
||||
call DebugRoom_PrintPage
|
||||
ld a, [wDebugRoomCurPage]
|
||||
call DebugRoom_GetNthPagePtr
|
||||
call DebugRoom_GetNthPagePointer
|
||||
ld a, [wDebugRoomCurValue]
|
||||
cp [hl]
|
||||
jr c, .skip
|
||||
@@ -731,7 +731,7 @@ DebugRoom_PrevPage:
|
||||
ld [wDebugRoomCurPage], a
|
||||
call DebugRoom_PrintPage
|
||||
ld a, [wDebugRoomCurPage]
|
||||
call DebugRoom_GetNthPagePtr
|
||||
call DebugRoom_GetNthPagePointer
|
||||
ld a, [wDebugRoomCurValue]
|
||||
cp [hl]
|
||||
jr c, .skip
|
||||
@@ -747,7 +747,7 @@ DebugRoom_NextPagedValue:
|
||||
ld a, " "
|
||||
call DebugRoom_ShowHideCursor
|
||||
ld a, [wDebugRoomCurPage]
|
||||
call DebugRoom_GetNthPagePtr
|
||||
call DebugRoom_GetNthPagePointer
|
||||
ld a, [wDebugRoomCurValue]
|
||||
inc a
|
||||
cp [hl] ; incremented value < paged_value count?
|
||||
@@ -776,15 +776,15 @@ DebugRoom_PrevPagedValue:
|
||||
dec a
|
||||
jr DebugRoom_UpdateValueCursor
|
||||
|
||||
DebugRoom_GetNthPagePtr:
|
||||
DebugRoom_GetNthPagePointer:
|
||||
; Input: a = page index
|
||||
; Output: hl = pointer to paged_data list
|
||||
ld h, 0
|
||||
ld l, a
|
||||
add hl, hl
|
||||
ld a, [wDebugRoomPagedValuesPtr]
|
||||
ld a, [wDebugRoomPagesPointer]
|
||||
ld e, a
|
||||
ld a, [wDebugRoomPagedValuesPtr+1]
|
||||
ld a, [wDebugRoomPagesPointer+1]
|
||||
ld d, a
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
@@ -792,10 +792,10 @@ DebugRoom_GetNthPagePtr:
|
||||
ld l, a
|
||||
ret
|
||||
|
||||
_DebugRoom_GetPageBValueCPtr:
|
||||
_DebugRoom_GetPageBValueCPointer:
|
||||
push bc
|
||||
ld a, b
|
||||
call DebugRoom_GetNthPagePtr
|
||||
call DebugRoom_GetNthPagePointer
|
||||
pop bc
|
||||
inc hl
|
||||
ld a, c
|
||||
@@ -803,12 +803,12 @@ _DebugRoom_GetPageBValueCPtr:
|
||||
call AddNTimes
|
||||
ret
|
||||
|
||||
DebugRoom_GetCurPagedValuePtr:
|
||||
DebugRoom_GetCurPagedValuePointer:
|
||||
ld a, [wDebugRoomCurPage]
|
||||
ld b, a
|
||||
ld a, [wDebugRoomCurValue]
|
||||
ld c, a
|
||||
jr _DebugRoom_GetPageBValueCPtr
|
||||
jr _DebugRoom_GetPageBValueCPointer
|
||||
|
||||
DebugRoom_ShowHideCursor:
|
||||
push af
|
||||
@@ -837,9 +837,9 @@ DebugRoom_InitializePagedValues:
|
||||
ld h, 0
|
||||
ld l, a
|
||||
add hl, hl
|
||||
ld a, [wDebugRoomPagedValuesPtr]
|
||||
ld a, [wDebugRoomPagesPointer]
|
||||
ld e, a
|
||||
ld a, [wDebugRoomPagedValuesPtr+1]
|
||||
ld a, [wDebugRoomPagesPointer+1]
|
||||
ld d, a
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
@@ -860,9 +860,9 @@ DebugRoom_InitializePagedValues:
|
||||
ld h, 0
|
||||
ld l, b
|
||||
add hl, hl
|
||||
ld a, [wDebugRoomPagedValuesPtr]
|
||||
ld a, [wDebugRoomPagesPointer]
|
||||
ld e, a
|
||||
ld a, [wDebugRoomPagedValuesPtr+1]
|
||||
ld a, [wDebugRoomPagesPointer+1]
|
||||
ld d, a
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
@@ -897,9 +897,9 @@ DebugRoom_PrintPage:
|
||||
ld h, 0
|
||||
ld l, a
|
||||
add hl, hl
|
||||
ld a, [wDebugRoomPagedValuesPtr]
|
||||
ld a, [wDebugRoomPagesPointer]
|
||||
ld e, a
|
||||
ld a, [wDebugRoomPagedValuesPtr+1]
|
||||
ld a, [wDebugRoomPagesPointer+1]
|
||||
ld d, a
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
@@ -927,9 +927,9 @@ DebugRoom_PrintPagedValue:
|
||||
ld h, 0
|
||||
ld l, b
|
||||
add hl, hl
|
||||
ld a, [wDebugRoomPagedValuesPtr]
|
||||
ld a, [wDebugRoomPagesPointer]
|
||||
ld e, a
|
||||
ld a, [wDebugRoomPagedValuesPtr+1]
|
||||
ld a, [wDebugRoomPagesPointer+1]
|
||||
ld d, a
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
@@ -1083,7 +1083,7 @@ DebugRoom_SaveItem:
|
||||
done
|
||||
|
||||
DebugRoom_PrintItemName:
|
||||
ld [wNamedObjectIndexBuffer], a
|
||||
ld [wNamedObjectIndex], a
|
||||
push bc
|
||||
call GetItemName
|
||||
pop hl
|
||||
@@ -1229,19 +1229,19 @@ DebugRoom_SavePokemon:
|
||||
done
|
||||
|
||||
DebugRoom_PrintPokemonName:
|
||||
ld [wNamedObjectIndexBuffer], a
|
||||
ld [wNamedObjectIndex], a
|
||||
push bc
|
||||
call GetPokemonName
|
||||
jr _DebugRoom_FinishGetName
|
||||
|
||||
DebugRoom_PrintItemName2:
|
||||
ld [wNamedObjectIndexBuffer], a
|
||||
ld [wNamedObjectIndex], a
|
||||
push bc
|
||||
call GetItemName
|
||||
jr _DebugRoom_FinishGetName
|
||||
|
||||
DebugRoom_PrintMoveName:
|
||||
ld [wNamedObjectIndexBuffer], a
|
||||
ld [wNamedObjectIndex], a
|
||||
push bc
|
||||
call GetMoveName
|
||||
jr _DebugRoom_FinishGetName
|
||||
|
Reference in New Issue
Block a user