From 5134266b9a4570f69df5e9bc8a0d91a116da796c Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 3 Nov 2019 12:25:59 -0500 Subject: [PATCH] Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH --- constants/map_object_constants.asm | 4 ++-- engine/overworld/events.asm | 2 +- engine/overworld/map_objects.asm | 22 +++++++++++----------- engine/overworld/map_objects_2.asm | 2 +- engine/overworld/npc_movement.asm | 4 ++-- engine/overworld/overworld.asm | 2 +- engine/overworld/player_object.asm | 16 ++++++++-------- home/map.asm | 8 ++++---- home/map_objects.asm | 10 +++++----- home/trainers.asm | 4 ++-- 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 00ddb772a..f1f81d64c 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -34,7 +34,7 @@ const OBJECT_1F ; 1f const OBJECT_RANGE ; 20 ; 21-27 are not used -OBJECT_STRUCT_LENGTH EQU 40 +OBJECT_LENGTH EQU 40 NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs ; object_struct OBJECT_FACING values @@ -114,7 +114,7 @@ ABSOLUTE_TILE_ID EQU 1 << ABSOLUTE_TILE_ID_F const MAPOBJECT_FLAG_HI ; d const MAPOBJECT_E ; unused const MAPOBJECT_F ; unused -OBJECT_LENGTH EQU const_value +MAPOBJECT_LENGTH EQU const_value ; SpriteMovementData struct members (see data/sprites/map_objects.asm) const_def diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index 178a889a3..76f14e506 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -1626,7 +1626,7 @@ CmdQueue_StoneTable: jr c, .fall_down_hole .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, de ld d, h ld e, l diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 6a1c1a22b..16562213b 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -10,7 +10,7 @@ DeleteMapObject:: push af ld h, b ld l, c - ld bc, OBJECT_STRUCT_LENGTH + ld bc, OBJECT_LENGTH xor a call ByteFill pop af @@ -2082,11 +2082,11 @@ DespawnEmote: jr z, .next push bc xor a - ld bc, OBJECT_STRUCT_LENGTH + ld bc, OBJECT_LENGTH call ByteFill pop bc .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, de ld d, h ld e, l @@ -2149,7 +2149,7 @@ Function55e0:: jr z, .ok call Function565c .ok - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2205,7 +2205,7 @@ Function5645: .loop ldh [hMapObjectIndexBuffer], a call SetFacing_Standing - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2421,7 +2421,7 @@ HandleNPCStep:: jr z, .next call Function437b .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2582,7 +2582,7 @@ Function587a: add hl, bc set OBJ_FLAGS2_5, [hl] .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2625,7 +2625,7 @@ Function58b9:: add hl, bc res OBJ_FLAGS2_5, [hl] .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2750,7 +2750,7 @@ ApplyBGMapAnchorToObjects: add e ld [hl], a .skip - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2809,7 +2809,7 @@ InitSprites: jr .add .skip - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2817,7 +2817,7 @@ InitSprites: jr .next .add - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/map_objects_2.asm b/engine/overworld/map_objects_2.asm index f055e0fd9..d89d95fc0 100644 --- a/engine/overworld/map_objects_2.asm +++ b/engine/overworld/map_objects_2.asm @@ -19,7 +19,7 @@ LoadObjectMasks: ld [de], a inc de pop bc - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index d249d2fd4..f4c730247 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -369,7 +369,7 @@ IsNPCAtCoord: jr nz, .setcarry .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -523,7 +523,7 @@ Unreferenced_Function7113: jr .yes .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm index e47645f2c..814f608f7 100644 --- a/engine/overworld/overworld.asm +++ b/engine/overworld/overworld.asm @@ -109,7 +109,7 @@ AddIndoorSprites: push af ld a, [hl] call AddSpriteGFX - ld de, OBJECT_LENGTH + ld de, MAPOBJECT_LENGTH add hl, de pop af inc a diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 9f1b13dd9..478c8f6c6 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -132,9 +132,9 @@ CopyObjectStruct:: and a ret nz ; masked - ld hl, wObjectStructs + OBJECT_STRUCT_LENGTH * 1 + ld hl, wObjectStructs + OBJECT_LENGTH * 1 ld a, 1 - ld de, OBJECT_STRUCT_LENGTH + ld de, OBJECT_LENGTH .loop ldh [hObjectStructIndexBuffer], a ld a, [hl] @@ -224,7 +224,7 @@ CopyMapObjectToObjectStruct: ret InitializeVisibleSprites: - ld bc, wMapObjects + OBJECT_LENGTH + ld bc, wMapObjects + MAPOBJECT_LENGTH ld a, 1 .loop ldh [hMapObjectIndexBuffer], a @@ -271,7 +271,7 @@ InitializeVisibleSprites: jp c, .ret .next - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -311,7 +311,7 @@ CheckObjectEnteringVisibleRange:: ld d, a ld a, [wXCoord] ld e, a - ld bc, wMapObjects + OBJECT_LENGTH + ld bc, wMapObjects + MAPOBJECT_LENGTH ld a, 1 .loop_v ldh [hMapObjectIndexBuffer], a @@ -345,7 +345,7 @@ CheckObjectEnteringVisibleRange:: pop de .next_v - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -367,7 +367,7 @@ CheckObjectEnteringVisibleRange:: ld e, a ld a, [wYCoord] ld d, a - ld bc, wMapObjects + OBJECT_LENGTH + ld bc, wMapObjects + MAPOBJECT_LENGTH ld a, 1 .loop_h ldh [hMapObjectIndexBuffer], a @@ -401,7 +401,7 @@ CheckObjectEnteringVisibleRange:: pop de .next_h - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/home/map.asm b/home/map.asm index 617ac135a..9e0c12e00 100644 --- a/home/map.asm +++ b/home/map.asm @@ -597,7 +597,7 @@ ReadObjectEvents:: ; Fill the remaining sprite IDs and y coords with 0 and -1, respectively. ; Bleeds into wObjectMasks due to a bug. Uncomment the above subtraction ; to fix. - ld bc, OBJECT_LENGTH + ld bc, MAPOBJECT_LENGTH .loop ld [hl], 0 inc hl @@ -631,7 +631,7 @@ CopyMapObjectEvents:: jr nz, .loop2 pop hl - ld bc, OBJECT_LENGTH + ld bc, MAPOBJECT_LENGTH add hl, bc pop bc dec c @@ -640,13 +640,13 @@ CopyMapObjectEvents:: ClearObjectStructs:: ld hl, wObject1Struct - ld bc, OBJECT_STRUCT_LENGTH * (NUM_OBJECT_STRUCTS - 1) + ld bc, OBJECT_LENGTH * (NUM_OBJECT_STRUCTS - 1) xor a call ByteFill ; Just to make sure (this is rather pointless) ld hl, wObject1Struct - ld de, OBJECT_STRUCT_LENGTH + ld de, OBJECT_LENGTH ld c, NUM_OBJECT_STRUCTS - 1 xor a .loop diff --git a/home/map_objects.asm b/home/map_objects.asm index 162bfbc5c..42ac95cf2 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -202,7 +202,7 @@ CheckStandingOnEntrance:: GetMapObject:: ; Return the location of map object a in bc. ld hl, wMapObjects - ld bc, OBJECT_LENGTH + ld bc, MAPOBJECT_LENGTH call AddNTimes ld b, h ld c, l @@ -358,7 +358,7 @@ CopyPlayerObjectTemplate:: ld [de], a inc de pop hl - ld bc, OBJECT_LENGTH - 1 + ld bc, MAPOBJECT_LENGTH - 1 call CopyBytes ret @@ -370,7 +370,7 @@ Unreferenced_Function19b8: push af ld [hl], -1 inc hl - ld bc, OBJECT_LENGTH - 1 + ld bc, MAPOBJECT_LENGTH - 1 xor a call ByteFill pop af @@ -424,7 +424,7 @@ FindFirstEmptyObjectStruct:: push bc push de ld hl, wObjectStructs - ld de, OBJECT_STRUCT_LENGTH + ld de, OBJECT_LENGTH ld c, NUM_OBJECT_STRUCTS .loop ld a, [hl] @@ -594,7 +594,7 @@ UpdateSprites:: ret GetObjectStruct:: - ld bc, OBJECT_STRUCT_LENGTH + ld bc, OBJECT_LENGTH ld hl, wObjectStructs call AddNTimes ld b, h diff --git a/home/trainers.asm b/home/trainers.asm index 9d012f719..e9971be3f 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -15,7 +15,7 @@ _CheckTrainerBattle:: ; Skip the player object. ld a, 1 - ld de, wMapObjects + OBJECT_LENGTH + ld de, wMapObjects + MAPOBJECT_LENGTH .loop @@ -78,7 +78,7 @@ _CheckTrainerBattle:: .next pop de - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, de ld d, h ld e, l