diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-23 16:29:30 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-23 16:29:30 -0500 |
| commit | 99e66c25577e367d6c7ca75fea8b466b54c3317a (patch) | |
| tree | 56183dddfd540a395086a7540060c374f9541723 /engine/pokegear | |
| parent | 1a054661ecac2d6075961e486213b6880c0afc4e (diff) | |
Rename some labels
- Remove "Buffer" suffix from some byte and word quantities
- Change "Ptr" to "Pointer"
Fixes #789
Diffstat (limited to 'engine/pokegear')
| -rw-r--r-- | engine/pokegear/pokegear.asm | 8 | ||||
| -rw-r--r-- | engine/pokegear/radio.asm | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index d0ce65a97..cbac4cd9e 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -1037,13 +1037,13 @@ PokegearPhone_UpdateDisplayList: ld hl, wPhoneList add hl, de xor a - ld [wPokegearPhoneLoadNameBuffer], a + ld [wPokegearPhoneDisplayPosition], a .loop ld a, [hli] push hl push af hlcoord 2, 4 - ld a, [wPokegearPhoneLoadNameBuffer] + ld a, [wPokegearPhoneDisplayPosition] ld bc, 2 * SCREEN_WIDTH call AddNTimes ld d, h @@ -1052,9 +1052,9 @@ PokegearPhone_UpdateDisplayList: ld b, a call GetCallerClassAndName pop hl - ld a, [wPokegearPhoneLoadNameBuffer] + ld a, [wPokegearPhoneDisplayPosition] inc a - ld [wPokegearPhoneLoadNameBuffer], a + ld [wPokegearPhoneDisplayPosition], a cp PHONE_DISPLAY_HEIGHT jr c, .loop call PokegearPhone_UpdateCursor diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index bc7c3195d..313f23189 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -257,7 +257,7 @@ endr inc hl ; skip level ld a, BANK(JohtoGrassWildMons) call GetFarByte - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld [wCurPartySpecies], a call GetPokemonName ld hl, wStringBuffer1 @@ -319,7 +319,7 @@ OPT_OakText3: OaksPKMNTalk7: ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, OPT_MaryText1 ld a, OAKS_POKEMON_TALK_8 @@ -674,7 +674,7 @@ PokedexShow1: inc c ld a, c ld [wCurPartySpecies], a - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, PokedexShowText ld a, POKEDEX_SHOW_2 @@ -1552,7 +1552,7 @@ GetBuenasPassword: ld l, c add hl, de ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ret .RawString: |