From ed29db5841849345c5971a9b08681dfb6560c07d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Oct 2015 23:32:11 -0400 Subject: No more -bash000; engine/movement.asm, SPRITEMOVEFN --- home/joypad.asm | 36 +++++++++++++++++------------------ home/map.asm | 54 ++++++++++++++++++++++++++-------------------------- home/map_objects.asm | 18 +++++++++--------- home/menu.asm | 2 +- 4 files changed, 55 insertions(+), 55 deletions(-) (limited to 'home') diff --git a/home/joypad.asm b/home/joypad.asm index d5bfc83f3..450fa28cb 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -356,14 +356,14 @@ JoyTextDelay:: ; a57 ; a80 Functiona80:: ; a80 - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] push af - ld a, [hConnectedMapWidth] + ld a, [hMapObjectIndexBuffer2] push af xor a - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ld a, 6 - ld [hConnectedMapWidth], a + ld [hMapObjectIndexBuffer2], a .loop push hl @@ -377,9 +377,9 @@ Functiona80:: ; a80 jr z, .loop pop af - ld [hConnectedMapWidth], a + ld [hMapObjectIndexBuffer2], a pop af - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ret ; aa5 @@ -459,37 +459,37 @@ Functionb06:: ; b06 cp b pop bc jr nz, .asm_b27 - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] dec a - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ret nz - ld a, [hConnectedMapWidth] + ld a, [hMapObjectIndexBuffer2] dec a - ld [hConnectedMapWidth], a + ld [hMapObjectIndexBuffer2], a ret nz ld a, "─" ld [hl], a ld a, -1 - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ld a, 6 - ld [hConnectedMapWidth], a + ld [hMapObjectIndexBuffer2], a ret .asm_b27 - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] and a ret z dec a - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ret nz dec a - ld [hConnectionStripLength], a - ld a, [hConnectedMapWidth] + ld [hMapObjectIndexBuffer1], a + ld a, [hMapObjectIndexBuffer2] dec a - ld [hConnectedMapWidth], a + ld [hMapObjectIndexBuffer2], a ret nz ld a, $6 - ld [hConnectedMapWidth], a + ld [hMapObjectIndexBuffer2], a ld a, $ee ld [hl], a ret diff --git a/home/map.asm b/home/map.asm index 7f1c83b63..9ddb2f88e 100644 --- a/home/map.asm +++ b/home/map.asm @@ -729,9 +729,9 @@ ChangeMap:: ; 24e4 ld hl, OverworldMap ld a, [MapWidth] - ld [hConnectedMapWidth], a + ld [hMapObjectIndexBuffer2], a add $6 - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ld c, a ld b, 0 rept 3 @@ -750,7 +750,7 @@ endr ld b, a .asm_250c push hl - ld a, [hConnectedMapWidth] + ld a, [hMapObjectIndexBuffer2] ld c, a .asm_2510 ld a, [de] @@ -759,7 +759,7 @@ endr dec c jr nz, .asm_2510 pop hl - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] add l ld l, a jr nc, .asm_251e @@ -794,10 +794,10 @@ FillMapConnections:: ; 2524 ld e, a ld a, [NorthConnectionStripLocation + 1] ld d, a - ld a, [NorthConnectionStripLength] - ld [hConnectionStripLength], a - ld a, [NorthConnectedMapWidth] - ld [hConnectedMapWidth], a + ld a, [NorthMapObjectIndexBuffer1] + ld [hMapObjectIndexBuffer1], a + ld a, [NorthMapObjectIndexBuffer2] + ld [hMapObjectIndexBuffer2], a call FillNorthConnectionStrip .South @@ -817,10 +817,10 @@ FillMapConnections:: ; 2524 ld e, a ld a, [SouthConnectionStripLocation + 1] ld d, a - ld a, [SouthConnectionStripLength] - ld [hConnectionStripLength], a - ld a, [SouthConnectedMapWidth] - ld [hConnectedMapWidth], a + ld a, [SouthMapObjectIndexBuffer1] + ld [hMapObjectIndexBuffer1], a + ld a, [SouthMapObjectIndexBuffer2] + ld [hMapObjectIndexBuffer2], a call FillSouthConnectionStrip .West @@ -843,7 +843,7 @@ FillMapConnections:: ; 2524 ld a, [WestConnectionStripLength] ld b, a ld a, [WestConnectedMapWidth] - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a call FillWestConnectionStrip .East @@ -866,7 +866,7 @@ FillMapConnections:: ; 2524 ld a, [EastConnectionStripLength] ld b, a ld a, [EastConnectedMapWidth] - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a call FillEastConnectionStrip .Done @@ -882,7 +882,7 @@ FillSouthConnectionStrip:: ; 25d3 push de push hl - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] ld b, a .x ld a, [hli] @@ -892,7 +892,7 @@ FillSouthConnectionStrip:: ; 25d3 jr nz, .x pop hl - ld a, [hConnectedMapWidth] + ld a, [hMapObjectIndexBuffer2] ld e, a ld d, 0 add hl, de @@ -917,7 +917,7 @@ FillEastConnectionStrip:: ; 25f6 .asm_25f6 ld a, [MapWidth] add 6 - ld [hConnectedMapWidth], a + ld [hMapObjectIndexBuffer2], a push de @@ -933,13 +933,13 @@ FillEastConnectionStrip:: ; 25f6 inc de pop hl - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] ld e, a ld d, 0 add hl, de pop de - ld a, [hConnectedMapWidth] + ld a, [hMapObjectIndexBuffer2] add e ld e, a jr nc, .asm_2617 @@ -1171,7 +1171,7 @@ CoordinatesEventText:: ; 2702 Function2707:: ; 2707 - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] ld e, a ld d, $0 ld hl, wd81e @@ -1181,7 +1181,7 @@ Function2707:: ; 2707 ; 2712 Function2712:: ; 2712 - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] ld e, a ld d, $0 ld hl, wd81e @@ -1191,7 +1191,7 @@ Function2712:: ; 2712 ; 271e Function271e:: ; 271e - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] ld e, a ld d, $0 ld hl, wd81e @@ -1463,7 +1463,7 @@ SaveScreen:: ; 289d ld de, XCoord + 1 ld a, [MapWidth] add $6 - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ld a, [wd151] and a jr z, .asm_28cb @@ -1477,7 +1477,7 @@ SaveScreen:: ; 289d .asm_28c0 ld de, wdcbf - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] ld c, a ld b, $0 add hl, bc @@ -1512,7 +1512,7 @@ LoadNeighboringBlockData:: ; 28e3 ld l, a ld a, [MapWidth] add $6 - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ld de, XCoord + 1 ld b, $6 ld c, $5 @@ -1537,7 +1537,7 @@ Function28f7:: ; 28f7 .asm_2908 pop hl - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] ld c, a ld b, $0 add hl, bc @@ -2145,7 +2145,7 @@ GetMapBank:: ; 2c29 GetAnyMapBank:: ; 2c31 push hl push de - ld de, $0000 + ld de, NONE call GetAnyMapHeaderMember ld a, c pop de diff --git a/home/map_objects.asm b/home/map_objects.asm index ac363b31d..74273f343 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -21,7 +21,7 @@ Function180e:: ; 180e ld hl, UsedSprites + 2 ld c, SPRITE_GFX_LIST_CAPACITY - 1 ld b, a - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] cp 0 jr z, .nope ld a, b @@ -234,14 +234,14 @@ GetMapObject:: ; 18d2 Function18de:: ; 18de ; Sets carry if the object is not visible on the screen. - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp -1 jr z, .not_visible - ld [hConnectedMapWidth], a + ld [hMapObjectIndexBuffer2], a call GetObjectStruct and a ret @@ -326,7 +326,7 @@ Function18f5:: ; 18f5 ; 194d Function194d:: ; 194d - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a call GetMapObject call CopyObjectStruct ret @@ -335,16 +335,16 @@ Function194d:: ; 194d _CopyObjectStruct:: ; 1956 - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a call Function271e - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] call GetMapObject callba CopyObjectStruct ret ; 1967 Function1967:: ; 1967 - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc @@ -569,12 +569,12 @@ endr ld [hl], a ld a, [bc] inc bc - ld hl, OBJECT_04 + ld hl, OBJECT_FLAGS1 add hl, de ld [hl], a ld a, [bc] inc bc - ld hl, OBJECT_FLAGS + ld hl, OBJECT_FLAGS2 add hl, de ld [hl], a ld a, [bc] diff --git a/home/menu.asm b/home/menu.asm index c4f0ed0d9..a63f74c08 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -62,7 +62,7 @@ MenuDataHeader_0x1d75:: ; 1d75 db $40 ; tile backup db 0, 0 ; start coords db 17, 19 ; end coords - dw $0000 + dw NONE db 1 ; default option ; 1d7d -- cgit v1.2.3 From 8153737bae7169d42b8937c5dc7eec6f669acbb2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Oct 2015 10:34:35 -0400 Subject: Enumerate text constants --- home/text.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'home') diff --git a/home/text.asm b/home/text.asm index 1445aa5ef..42f55d285 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1057,13 +1057,13 @@ Function1522:: ; 1522 ; 152d TextSFX:: ; 152d - dbw $0b, SFX_DEX_FANFARE_50_79 - dbw $12, SFX_FANFARE - dbw $0e, SFX_DEX_FANFARE_20_49 - dbw $0f, SFX_ITEM - dbw $10, SFX_CAUGHT_MON - dbw $11, SFX_DEX_FANFARE_80_109 - dbw $13, SFX_SLOT_MACHINE_START + dbw TX_SOUND_0B, SFX_DEX_FANFARE_50_79 + dbw TX_SOUND_12, SFX_FANFARE + dbw TX_SOUND_0E, SFX_DEX_FANFARE_20_49 + dbw TX_SOUND_0F, SFX_ITEM + dbw TX_SOUND_10, SFX_CAUGHT_MON + dbw TX_SOUND_11, SFX_DEX_FANFARE_80_109 + dbw TX_SOUND_13, SFX_SLOT_MACHINE_START db -1 ; 1543 @@ -1122,11 +1122,11 @@ Text_TX_STRINGBUFFER:: ; 156a push hl ld e, a ld d, 0 - ld hl, Unknown_24000 + ld hl, StringBufferPointers rept 2 add hl, de endr - ld a, BANK(Unknown_24000) + ld a, BANK(StringBufferPointers) call GetFarHalfword ld d, h ld e, l -- cgit v1.2.3 From fda1f7c01a9fb2944aeb42f2d2f19a766b2538e6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 31 Oct 2015 21:05:02 -0400 Subject: SPRITEMOVEDATA --- home/map_objects.asm | 13 ++++++++----- home/text.asm | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'home') diff --git a/home/map_objects.asm b/home/map_objects.asm index 74273f343..07a361340 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -453,7 +453,10 @@ Function19e9:: ; 19e9 -Function1a13:: ; 1a13 +FindFirstEmptyObjectStruct:: ; 1a13 +; Returns the index of the first empty object struct in A and its address in HL, then sets carry. +; If all object structs are occupied, A = 0 and Z is set. +; Preserves BC and DE. push bc push de ld hl, ObjectStructs @@ -462,15 +465,15 @@ Function1a13:: ; 1a13 .loop ld a, [hl] and a - jr z, .empty + jr z, .break add hl, de dec c jr nz, .loop xor a jr .done -.empty - ld a, $d +.break + ld a, NUM_OBJECT_STRUCTS sub c scf @@ -547,7 +550,7 @@ Function1a71:: ; 1a71 push de ld e, a ld d, 0 - ld hl, ObjectStruct3_Data + 1 + ld hl, ObjectStruct3_Data + 1 ; facing? rept OBJECT_STRUCT_3_DATA_WIDTH add hl, de endr diff --git a/home/text.asm b/home/text.asm index 42f55d285..d400ddd66 100644 --- a/home/text.asm +++ b/home/text.asm @@ -175,7 +175,7 @@ RadioTerminator:: ; 1052 PrintText:: ; 1057 call SetUpTextBox -Function105a:: ; 105a +BuenaPrintText:: ; 105a push hl hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW -- cgit v1.2.3 From 3b4805ee98c0b57cb69974160d51fb9ef89f3a34 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 1 Nov 2015 09:38:48 -0500 Subject: Sweepthrough of ClearBox arg conversion to lb --- home/tilemap.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home') diff --git a/home/tilemap.asm b/home/tilemap.asm index d6a8f31b1..928c6a983 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -175,7 +175,7 @@ Function1cc6:: ; 1cc6 Function1ce1:: ; 1ce1 call GetMemTileCoord - ld bc, $0015 + lb bc, 0, 21 add hl, bc call GetMenuBoxDims dec b -- cgit v1.2.3 From 31c407bb3de7328f9e80f006052c23ffcfbbfe39 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 1 Nov 2015 12:44:30 -0500 Subject: Buena local labels --- home/menu.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'home') diff --git a/home/menu.asm b/home/menu.asm index a63f74c08..c5aca06fe 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -16,7 +16,7 @@ CopyMenuDataHeader:: ; 0x1d4b Function1d4b:: ; 1d4b - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a ret ; 1d4f @@ -410,7 +410,7 @@ Function1f2a:: ; 1f2a ld a, [hl] ld [MenuSelection], a ld a, [wcfa9] - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a and a ret @@ -571,7 +571,7 @@ InterpretMenu:: ; 202a ld a, [hROMBank] ld [wcf94], a callba Function2400e - ld a, [wPocketCursorBuffer] + ld a, [wMenuCursorBuffer] ret ; 2039 @@ -579,7 +579,7 @@ Function2039:: ; 2039 ld a, [hROMBank] ld [wcf94], a callba Function24022 - ld a, [wPocketCursorBuffer] + ld a, [wMenuCursorBuffer] ret ; 2048 @@ -587,7 +587,7 @@ Function2048:: ; 2048 ld a, [hROMBank] ld [wcf94], a callba Function2403c - ld a, [wPocketCursorBuffer] + ld a, [wMenuCursorBuffer] ret ; 2057 -- cgit v1.2.3 From 76e2ea534fa8374e62b8916e068514101cd617fa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 1 Nov 2015 21:17:46 -0500 Subject: Object masks --- home/map.asm | 16 ++++++++-------- home/map_objects.asm | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'home') diff --git a/home/map.asm b/home/map.asm index 07f6b468b..c1a26b772 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1170,33 +1170,33 @@ CoordinatesEventText:: ; 2702 ; 2707 -Function2707:: ; 2707 +CheckObjectMask:: ; 2707 ld a, [hMapObjectIndexBuffer1] ld e, a ld d, $0 - ld hl, wd81e + ld hl, wObjectMasks add hl, de ld a, [hl] ret ; 2712 -Function2712:: ; 2712 +MaskObject:: ; 2712 ld a, [hMapObjectIndexBuffer1] ld e, a ld d, $0 - ld hl, wd81e + ld hl, wObjectMasks add hl, de - ld [hl], $ff + ld [hl], -1 ; ,masked ret ; 271e -Function271e:: ; 271e +UnmaskObject:: ; 271e ld a, [hMapObjectIndexBuffer1] ld e, a ld d, $0 - ld hl, wd81e + ld hl, wObjectMasks add hl, de - ld [hl], $0 + ld [hl], 0 ; unmasked ret ; 272a diff --git a/home/map_objects.asm b/home/map_objects.asm index 07a361340..0bfb4e98f 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -251,7 +251,7 @@ Function18de:: ; 18de ret ; 18f5 -Function18f5:: ; 18f5 +CheckObjectTime:: ; 18f5 ld hl, MAPOBJECT_HOUR add hl, bc ld a, [hl] @@ -336,7 +336,7 @@ Function194d:: ; 194d _CopyObjectStruct:: ; 1956 ld [hMapObjectIndexBuffer1], a - call Function271e + call UnmaskObject ld a, [hMapObjectIndexBuffer1] call GetMapObject callba CopyObjectStruct @@ -378,7 +378,7 @@ Function1985:: ; 1985 DeleteObjectStruct:: ; 199f call Function1967 - call Function2712 + call MaskObject ret ; 19a6 -- cgit v1.2.3 From d35cfad0de085fab1b0c40c7f0497c9b745cb7b2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Nov 2015 11:15:32 -0500 Subject: object_struct --- home/joypad.asm | 36 +++++++++++----------- home/map.asm | 84 ++++++++++++++++++++++++++-------------------------- home/map_objects.asm | 58 ++++++++++++++++++------------------ 3 files changed, 89 insertions(+), 89 deletions(-) (limited to 'home') diff --git a/home/joypad.asm b/home/joypad.asm index 450fa28cb..00179fc7f 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -356,14 +356,14 @@ JoyTextDelay:: ; a57 ; a80 Functiona80:: ; a80 - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] push af - ld a, [hMapObjectIndexBuffer2] + ld a, [hObjectStructIndexBuffer] push af xor a - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a ld a, 6 - ld [hMapObjectIndexBuffer2], a + ld [hObjectStructIndexBuffer], a .loop push hl @@ -377,9 +377,9 @@ Functiona80:: ; a80 jr z, .loop pop af - ld [hMapObjectIndexBuffer2], a + ld [hObjectStructIndexBuffer], a pop af - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a ret ; aa5 @@ -459,37 +459,37 @@ Functionb06:: ; b06 cp b pop bc jr nz, .asm_b27 - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] dec a - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a ret nz - ld a, [hMapObjectIndexBuffer2] + ld a, [hObjectStructIndexBuffer] dec a - ld [hMapObjectIndexBuffer2], a + ld [hObjectStructIndexBuffer], a ret nz ld a, "─" ld [hl], a ld a, -1 - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a ld a, 6 - ld [hMapObjectIndexBuffer2], a + ld [hObjectStructIndexBuffer], a ret .asm_b27 - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] and a ret z dec a - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a ret nz dec a - ld [hMapObjectIndexBuffer1], a - ld a, [hMapObjectIndexBuffer2] + ld [hMapObjectIndexBuffer], a + ld a, [hObjectStructIndexBuffer] dec a - ld [hMapObjectIndexBuffer2], a + ld [hObjectStructIndexBuffer], a ret nz ld a, $6 - ld [hMapObjectIndexBuffer2], a + ld [hObjectStructIndexBuffer], a ld a, $ee ld [hl], a ret diff --git a/home/map.asm b/home/map.asm index c1a26b772..fa60ac299 100644 --- a/home/map.asm +++ b/home/map.asm @@ -252,10 +252,10 @@ Function2252:: ; 2252 ; 2266 Function2266:: ; 2266 - ld a, [MapY] + ld a, [PlayerMapY] sub $4 ld e, a - ld a, [MapX] + ld a, [PlayerMapX] sub $4 ld d, a ld a, [wCurrMapWarpCount] @@ -652,11 +652,11 @@ Function2457:: ; 2457 ; 2471 Function2471:: ; 2471 - ld hl, ObjectStruct1 + ld hl, Object1Struct ld bc, OBJECT_STRUCT_LENGTH * (NUM_OBJECT_STRUCTS - 1) xor a call ByteFill - ld hl, ObjectStruct1 + ld hl, Object1Struct ld de, OBJECT_STRUCT_LENGTH ld c, NUM_OBJECT_STRUCTS - 1 xor a @@ -729,9 +729,9 @@ ChangeMap:: ; 24e4 ld hl, OverworldMap ld a, [MapWidth] - ld [hMapObjectIndexBuffer2], a + ld [hObjectStructIndexBuffer], a add $6 - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a ld c, a ld b, 0 rept 3 @@ -750,7 +750,7 @@ endr ld b, a .asm_250c push hl - ld a, [hMapObjectIndexBuffer2] + ld a, [hObjectStructIndexBuffer] ld c, a .asm_2510 ld a, [de] @@ -759,7 +759,7 @@ endr dec c jr nz, .asm_2510 pop hl - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] add l ld l, a jr nc, .asm_251e @@ -794,10 +794,10 @@ FillMapConnections:: ; 2524 ld e, a ld a, [NorthConnectionStripLocation + 1] ld d, a - ld a, [NorthMapObjectIndexBuffer1] - ld [hMapObjectIndexBuffer1], a - ld a, [NorthMapObjectIndexBuffer2] - ld [hMapObjectIndexBuffer2], a + ld a, [NorthMapObjectIndexBuffer] + ld [hMapObjectIndexBuffer], a + ld a, [NorthObjectStructIndexBuffer] + ld [hObjectStructIndexBuffer], a call FillNorthConnectionStrip .South @@ -817,10 +817,10 @@ FillMapConnections:: ; 2524 ld e, a ld a, [SouthConnectionStripLocation + 1] ld d, a - ld a, [SouthMapObjectIndexBuffer1] - ld [hMapObjectIndexBuffer1], a - ld a, [SouthMapObjectIndexBuffer2] - ld [hMapObjectIndexBuffer2], a + ld a, [SouthMapObjectIndexBuffer] + ld [hMapObjectIndexBuffer], a + ld a, [SouthObjectStructIndexBuffer] + ld [hObjectStructIndexBuffer], a call FillSouthConnectionStrip .West @@ -843,7 +843,7 @@ FillMapConnections:: ; 2524 ld a, [WestConnectionStripLength] ld b, a ld a, [WestConnectedMapWidth] - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a call FillWestConnectionStrip .East @@ -866,7 +866,7 @@ FillMapConnections:: ; 2524 ld a, [EastConnectionStripLength] ld b, a ld a, [EastConnectedMapWidth] - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a call FillEastConnectionStrip .Done @@ -882,7 +882,7 @@ FillSouthConnectionStrip:: ; 25d3 push de push hl - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] ld b, a .x ld a, [hli] @@ -892,7 +892,7 @@ FillSouthConnectionStrip:: ; 25d3 jr nz, .x pop hl - ld a, [hMapObjectIndexBuffer2] + ld a, [hObjectStructIndexBuffer] ld e, a ld d, 0 add hl, de @@ -917,7 +917,7 @@ FillEastConnectionStrip:: ; 25f6 .asm_25f6 ld a, [MapWidth] add 6 - ld [hMapObjectIndexBuffer2], a + ld [hObjectStructIndexBuffer], a push de @@ -933,13 +933,13 @@ FillEastConnectionStrip:: ; 25f6 inc de pop hl - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] ld e, a ld d, 0 add hl, de pop de - ld a, [hMapObjectIndexBuffer2] + ld a, [hObjectStructIndexBuffer] add e ld e, a jr nc, .asm_2617 @@ -1171,7 +1171,7 @@ CoordinatesEventText:: ; 2702 CheckObjectMask:: ; 2707 - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] ld e, a ld d, $0 ld hl, wObjectMasks @@ -1181,7 +1181,7 @@ CheckObjectMask:: ; 2707 ; 2712 MaskObject:: ; 2712 - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] ld e, a ld d, $0 ld hl, wObjectMasks @@ -1191,7 +1191,7 @@ MaskObject:: ; 2712 ; 271e UnmaskObject:: ; 271e - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] ld e, a ld d, $0 ld hl, wObjectMasks @@ -1463,7 +1463,7 @@ SaveScreen:: ; 289d ld de, XCoord + 1 ld a, [MapWidth] add $6 - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a ld a, [wd151] and a jr z, .asm_28cb @@ -1477,7 +1477,7 @@ SaveScreen:: ; 289d .asm_28c0 ld de, wdcbf - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] ld c, a ld b, $0 add hl, bc @@ -1512,7 +1512,7 @@ LoadNeighboringBlockData:: ; 28e3 ld l, a ld a, [MapWidth] add $6 - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a ld de, XCoord + 1 ld b, $6 ld c, $5 @@ -1537,7 +1537,7 @@ Function28f7:: ; 28f7 .asm_2908 pop hl - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] ld c, a ld b, $0 add hl, bc @@ -1552,15 +1552,15 @@ Function2914:: ; 2914 ld [TilePermissions], a call Function296c call Function294d - ld a, [MapX] + ld a, [PlayerMapX] ld d, a - ld a, [MapY] + ld a, [PlayerMapY] ld e, a call Function2a3c - ld [StandingTile], a + ld [PlayerStandingTile], a call Function29ff ret nz - ld a, [StandingTile] + ld a, [PlayerStandingTile] and 7 ld hl, .data_2945 add l @@ -1580,9 +1580,9 @@ Function2914:: ; 2914 ; 294d Function294d:: ; 294d - ld a, [MapX] + ld a, [PlayerMapX] ld d, a - ld a, [MapY] + ld a, [PlayerMapY] ld e, a push de inc e @@ -1598,9 +1598,9 @@ Function294d:: ; 294d ; 296c Function296c:: ; 296c - ld a, [MapX] + ld a, [PlayerMapX] ld d, a - ld a, [MapY] + ld a, [PlayerMapY] ld e, a push de dec d @@ -1725,10 +1725,10 @@ endr ld h, [hl] ld l, a - ld a, [MapX] + ld a, [PlayerMapX] add d ld d, a - ld a, [MapY] + ld a, [PlayerMapY] add e ld e, a ld a, [hl] @@ -1906,10 +1906,10 @@ CheckStandingOnXYTrigger:: ; 2ae7 call CheckTriggers ld b, a ; Load your current coordinates into de. This will be used to check if your position is in the xy-trigger table for the current map. - ld a, [MapX] + ld a, [PlayerMapX] sub 4 ld d, a - ld a, [MapY] + ld a, [PlayerMapY] sub 4 ld e, a diff --git a/home/map_objects.asm b/home/map_objects.asm index 0bfb4e98f..36750b1eb 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -21,7 +21,7 @@ Function180e:: ; 180e ld hl, UsedSprites + 2 ld c, SPRITE_GFX_LIST_CAPACITY - 1 ld b, a - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] cp 0 jr z, .nope ld a, b @@ -78,14 +78,14 @@ Function1836:: ; 1836 Function184a:: ; 184a - ld a, [StandingTile] + ld a, [PlayerStandingTile] call GetTileCollision ld b, a ret ; 1852 CheckOnWater:: ; 1852 - ld a, [StandingTile] + ld a, [PlayerStandingTile] call GetTileCollision sub 1 ret z @@ -209,7 +209,7 @@ CheckWaterfallTile:: ; 18bd ; 18c3 CheckStandingOnEntrance:: ; 18c3 - ld a, [StandingTile] + ld a, [PlayerStandingTile] cp $71 ; door ret z cp $79 @@ -232,16 +232,16 @@ GetMapObject:: ; 18d2 ; 18de -Function18de:: ; 18de +CheckObjectVisibility:: ; 18de ; Sets carry if the object is not visible on the screen. - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp -1 jr z, .not_visible - ld [hMapObjectIndexBuffer2], a + ld [hObjectStructIndexBuffer], a call GetObjectStruct and a ret @@ -326,7 +326,7 @@ CheckObjectTime:: ; 18f5 ; 194d Function194d:: ; 194d - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a call GetMapObject call CopyObjectStruct ret @@ -335,22 +335,22 @@ Function194d:: ; 194d _CopyObjectStruct:: ; 1956 - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a call UnmaskObject - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] call GetMapObject callba CopyObjectStruct ret ; 1967 Function1967:: ; 1967 - ld [hMapObjectIndexBuffer1], a + ld [hMapObjectIndexBuffer], a call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp -1 - ret z + ret z ; already hidden ld [hl], -1 push af call Function1985 @@ -361,18 +361,18 @@ Function1967:: ; 1967 ; 1985 Function1985:: ; 1985 - ld hl, wd4cd + ld hl, wObjectFollow_Leader cp [hl] jr z, .ok - ld hl, wd4ce + ld hl, wObjectFollow_Follower cp [hl] ret nz .ok - callba Function581f + callba StopFollow ld a, -1 - ld [wd4cd], a - ld [wd4ce], a + ld [wObjectFollow_Leader], a + ld [wObjectFollow_Follower], a ret ; 199f @@ -413,11 +413,11 @@ Function19b8:: ; 19b8 cp $d ret nc ld b, a - ld a, [wd4cd] + ld a, [wObjectFollow_Leader] cp b jr nz, .ok ld a, -1 - ld [wd4cd], a + ld [wObjectFollow_Leader], a .ok ld a, b @@ -429,19 +429,19 @@ Function19b8:: ; 19b8 Function19e9:: ; 19e9 - ld [wc2e2], a + ld [wMovementPerson], a ld a, [hROMBank] - ld [wc2e3], a + ld [wMovementDataPointer], a ld a, l - ld [wc2e3 + 1], a + ld [wMovementDataPointer + 1], a ld a, h - ld [wc2e3 + 2], a - ld a, [wc2e2] - call Function18de + ld [wMovementDataPointer + 2], a + ld a, [wMovementPerson] + call CheckObjectVisibility ret c - ld hl, OBJECT_03 + ld hl, OBJECT_MOVEMENTTYPE add hl, bc - ld [hl], $14 + ld [hl], SPRITEMOVEDATA_14 ld hl, OBJECT_09 add hl, bc ld [hl], 0 @@ -486,7 +486,7 @@ FindFirstEmptyObjectStruct:: ; 1a13 Function1a2f:: ; 1a2f - ld hl, OBJECT_03 + ld hl, OBJECT_MOVEMENTTYPE add hl, bc ld a, [hl] cp OBJECT_STRUCT_3_DATA_HEIGHT @@ -544,7 +544,7 @@ Function1a61:: ; 1a61 ; 1a71 Function1a71:: ; 1a71 - ld hl, OBJECT_03 + ld hl, OBJECT_MOVEMENTTYPE add hl, de ld [hl], a push de -- cgit v1.2.3 From e0d6e9ca7acf8a23ad70fad405ddf1073dcd4291 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Nov 2015 12:54:27 -0500 Subject: Fix NorthMapObjectIndexBuffer etc --- home/map.asm | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'home') diff --git a/home/map.asm b/home/map.asm index fa60ac299..a15e32893 100644 --- a/home/map.asm +++ b/home/map.asm @@ -111,7 +111,7 @@ Function217a:: ; 217a call Function2198 ld a, $60 hlcoord 0, 0 - ld bc, TileMapEnd - TileMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill ld a, BANK(Function4d15b) @@ -131,12 +131,12 @@ Function2198:: ; 2198 ld hl, wEnemyMoveStruct ld b, $5 -.asm_21a5 +.loop push de push hl ld c, $6 -.asm_21a9 +.loop2 push de push hl ld a, [de] @@ -187,7 +187,7 @@ endr pop de inc de dec c - jp nz, .asm_21a9 + jp nz, .loop2 pop hl ld de, $0060 add hl, de @@ -201,7 +201,7 @@ endr .asm_2225 dec b - jp nz, .asm_21a5 + jp nz, .loop ret ; 222a @@ -729,9 +729,9 @@ ChangeMap:: ; 24e4 ld hl, OverworldMap ld a, [MapWidth] - ld [hObjectStructIndexBuffer], a + ld [hConnectedMapWidth], a add $6 - ld [hMapObjectIndexBuffer], a + ld [hConnectionStripLength], a ld c, a ld b, 0 rept 3 @@ -750,7 +750,7 @@ endr ld b, a .asm_250c push hl - ld a, [hObjectStructIndexBuffer] + ld a, [hConnectedMapWidth] ld c, a .asm_2510 ld a, [de] @@ -759,7 +759,7 @@ endr dec c jr nz, .asm_2510 pop hl - ld a, [hMapObjectIndexBuffer] + ld a, [hConnectionStripLength] add l ld l, a jr nc, .asm_251e @@ -794,10 +794,10 @@ FillMapConnections:: ; 2524 ld e, a ld a, [NorthConnectionStripLocation + 1] ld d, a - ld a, [NorthMapObjectIndexBuffer] - ld [hMapObjectIndexBuffer], a - ld a, [NorthObjectStructIndexBuffer] - ld [hObjectStructIndexBuffer], a + ld a, [NorthConnectionStripLength] + ld [hConnectionStripLength], a + ld a, [NorthConnectedMapWidth] + ld [hConnectedMapWidth], a call FillNorthConnectionStrip .South @@ -817,10 +817,10 @@ FillMapConnections:: ; 2524 ld e, a ld a, [SouthConnectionStripLocation + 1] ld d, a - ld a, [SouthMapObjectIndexBuffer] - ld [hMapObjectIndexBuffer], a - ld a, [SouthObjectStructIndexBuffer] - ld [hObjectStructIndexBuffer], a + ld a, [SouthConnectionStripLength] + ld [hConnectionStripLength], a + ld a, [SouthConnectedMapWidth] + ld [hConnectedMapWidth], a call FillSouthConnectionStrip .West @@ -843,7 +843,7 @@ FillMapConnections:: ; 2524 ld a, [WestConnectionStripLength] ld b, a ld a, [WestConnectedMapWidth] - ld [hMapObjectIndexBuffer], a + ld [hConnectionStripLength], a call FillWestConnectionStrip .East @@ -866,7 +866,7 @@ FillMapConnections:: ; 2524 ld a, [EastConnectionStripLength] ld b, a ld a, [EastConnectedMapWidth] - ld [hMapObjectIndexBuffer], a + ld [hConnectionStripLength], a call FillEastConnectionStrip .Done @@ -882,7 +882,7 @@ FillSouthConnectionStrip:: ; 25d3 push de push hl - ld a, [hMapObjectIndexBuffer] + ld a, [hConnectionStripLength] ld b, a .x ld a, [hli] @@ -892,7 +892,7 @@ FillSouthConnectionStrip:: ; 25d3 jr nz, .x pop hl - ld a, [hObjectStructIndexBuffer] + ld a, [hConnectedMapWidth] ld e, a ld d, 0 add hl, de @@ -917,7 +917,7 @@ FillEastConnectionStrip:: ; 25f6 .asm_25f6 ld a, [MapWidth] add 6 - ld [hObjectStructIndexBuffer], a + ld [hConnectedMapWidth], a push de @@ -933,13 +933,13 @@ FillEastConnectionStrip:: ; 25f6 inc de pop hl - ld a, [hMapObjectIndexBuffer] + ld a, [hConnectionStripLength] ld e, a ld d, 0 add hl, de pop de - ld a, [hObjectStructIndexBuffer] + ld a, [hConnectedMapWidth] add e ld e, a jr nc, .asm_2617 -- cgit v1.2.3 From 72af3337fd8746c51aac273b6c056209e73c7ae0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Nov 2015 14:37:02 -0500 Subject: No more NONE --- home/map.asm | 2 +- home/menu.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'home') diff --git a/home/map.asm b/home/map.asm index a15e32893..d2a5b1771 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2145,7 +2145,7 @@ GetMapBank:: ; 2c29 GetAnyMapBank:: ; 2c31 push hl push de - ld de, NONE + ld de, 0 call GetAnyMapHeaderMember ld a, c pop de diff --git a/home/menu.asm b/home/menu.asm index a88545713..a42b29cd1 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -62,7 +62,7 @@ MenuDataHeader_0x1d75:: ; 1d75 db $40 ; tile backup db 0, 0 ; start coords db 17, 19 ; end coords - dw NONE + dw 0 db 1 ; default option ; 1d7d -- cgit v1.2.3