diff options
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/map_objects.asm | 74 | ||||
| -rwxr-xr-x | engine/overworld/movement.asm | 8 | ||||
| -rwxr-xr-x | engine/overworld/npc_movement.asm | 22 | ||||
| -rwxr-xr-x | engine/overworld/player_movement.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/player_object.asm | 34 | ||||
| -rwxr-xr-x | engine/overworld/player_step.asm | 8 | ||||
| -rwxr-xr-x | engine/overworld/time.asm | 18 |
7 files changed, 84 insertions, 84 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 593a1d75..6c344d31 100755 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -415,7 +415,7 @@ Function5429: ; 5429 (1:5429) ld [hl], $2 call Function54c8 ld hl, wCenteredObject - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] cp [hl] jr z, .asm_5450 ld hl, $9 @@ -435,7 +435,7 @@ Function5457: ; 5457 (1:5457) ret z ld a, [wObjectFollow_Leader] ld d, a - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] cp d ret nz ld a, e @@ -565,7 +565,7 @@ Function5504: ; 5504 (1:5504) Function5518: ; 5518 (1:5518) push bc - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] ld c, a call Function5521 pop bc @@ -622,7 +622,7 @@ Function5558: ; 5558 (1:5558) ld [hli], a ld a, [de] ld [hli], a - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] ld [hli], a push hl ld hl, $10 @@ -646,7 +646,7 @@ Function557f:: ; 557f (1:557f) ld bc, wPlayerStruct xor a .asm_5589 - ld [hConnectionStripLength], a + ldh [hConnectionStripLength], a call DoesObjectHaveASprite jr z, .asm_5593 call Function55ef @@ -655,7 +655,7 @@ Function557f:: ; 557f (1:557f) add hl, bc ld b, h ld c, l - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] inc a cp $d jr nz, .asm_5589 @@ -668,7 +668,7 @@ Function55a1 ld a, [wd180] bit 7, a jr z, .asm_55b8 - ld a, [hLastTalked] + ldh a, [hLastTalked] and a jr z, .asm_55b8 call Function55bc @@ -697,13 +697,13 @@ Function55d8: ; 55d8 (1:55d8) xor a ld bc, wPlayerStruct .asm_55dc - ld [hMapObjectIndexBuffer], a + ldh [hMapObjectIndexBuffer], a call Function5613 ld hl, $28 add hl, bc ld b, h ld c, l - ld a, [hConnectionStripLength] + ldh a, [hConnectionStripLength] inc a cp $d jr nz, .asm_55dc @@ -812,7 +812,7 @@ Function5660: ; 5660 (1:5660) jr c, .asm_568f sub $20 .asm_568f - ld [hUsedSpriteIndex], a + ldh [hUsedSpriteIndex], a ld a, [wce82] ld e, a ld hl, $1a @@ -841,7 +841,7 @@ Function5660: ; 5660 (1:5660) jr c, .asm_56bf sub $20 .asm_56bf - ld [hUsedSpriteTile], a + ldh [hUsedSpriteTile], a ld hl, $6 add hl, bc bit 7, [hl] @@ -854,18 +854,18 @@ Function5660: ; 5660 (1:5660) ld e, a .asm_56d1 ld a, d - ld [hFFC1], a + ldh [hFFC1], a .asm_56d4 - ld a, [hFFC1] + ldh a, [hFFC1] ld d, a - ld a, [hUsedSpriteTile] + ldh a, [hUsedSpriteTile] add e dec a cp $12 jr nc, .asm_56f6 ld b, a .asm_56e0 - ld a, [hUsedSpriteIndex] + ldh a, [hUsedSpriteIndex] add d dec a cp $14 @@ -908,7 +908,7 @@ Function5714: ; 5714 (1:5714) ld bc, wPlayerSprite xor a .asm_5718 - ld [hMapObjectIndexBuffer], a + ldh [hMapObjectIndexBuffer], a call DoesObjectHaveASprite jr z, .asm_5722 call Function437c @@ -917,7 +917,7 @@ Function5714: ; 5714 (1:5714) add hl, bc ld b, h ld c, l - ld a, [hConnectionStripLength] + ldh a, [hConnectionStripLength] inc a cp $d jr nz, .asm_5718 @@ -980,7 +980,7 @@ StartFollow:: Function578b: ; 578b (1:578b) call CheckObjectVisibility ret c - ld a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndexBuffer] ld [wObjectFollow_Leader], a ret @@ -1006,7 +1006,7 @@ Function57a2: ; 57a2 (1:57a2) ld hl, $9 add hl, bc ld [hl], $0 - ld a, [hConnectedMapWidth] + ldh a, [hConnectedMapWidth] ld [wObjectFollow_Follower], a ret @@ -1159,20 +1159,20 @@ UpdateSprites_:: ; 5896 (1:5896) bit 0, a ret z xor a - ld [hUsedSpriteIndex], a - ld a, [hOAMUpdate] + ldh [hUsedSpriteIndex], a + ldh a, [hOAMUpdate] push af ld a, $1 - ld [hOAMUpdate], a + ldh [hOAMUpdate], a call Function58fe call Function58b0 pop af - ld [hOAMUpdate], a + ldh [hOAMUpdate], a ret Function58b0: ; 58b0 (1:58b0) ld b, $a0 - ld a, [hUsedSpriteIndex] + ldh a, [hUsedSpriteIndex] cp b ret nc ld l, a @@ -1333,11 +1333,11 @@ Function597a: ; 597a (1:597a) jr z, .asm_599d or $80 .asm_599d - ld [hFFC4], a + ldh [hFFC4], a ld hl, $2 add hl, bc ld a, [hl] - ld [hFFC3], a + ldh [hFFC3], a ld hl, $17 add hl, bc ld a, [hl] @@ -1348,7 +1348,7 @@ Function597a: ; 597a (1:597a) ld e, a ld a, [wce81] add e - ld [hFFC1], a + ldh [hFFC1], a ld hl, $18 add hl, bc ld a, [hl] @@ -1359,7 +1359,7 @@ Function597a: ; 597a (1:597a) ld e, a ld a, [wce82] add e - ld [hFFC2], a + ldh [hFFC2], a ld hl, $d add hl, bc ld a, [hl] @@ -1375,28 +1375,28 @@ Function597a: ; 597a (1:597a) ld a, [hli] ld h, [hl] ld l, a - ld a, [hUsedSpriteIndex] + ldh a, [hUsedSpriteIndex] ld c, a ld b, $c3 ld a, [hli] - ld [hUsedSpriteTile], a + ldh [hUsedSpriteTile], a add c cp $a0 jr nc, .asm_5a25 .asm_59f3 - ld a, [hFFC2] + ldh a, [hFFC2] add [hl] inc hl ld [bc], a inc c - ld a, [hFFC1] + ldh a, [hFFC1] add [hl] inc hl ld [bc], a inc c ld e, [hl] inc hl - ld a, [hFFC3] + ldh a, [hFFC3] bit 2, e jr z, .asm_5a08 xor a @@ -1408,19 +1408,19 @@ Function597a: ; 597a (1:597a) ld a, e bit 1, a jr z, .asm_5a14 - ld a, [hFFC4] + ldh a, [hFFC4] or e .asm_5a14 and $f0 or d ld [bc], a inc c - ld a, [hUsedSpriteTile] + ldh a, [hUsedSpriteTile] dec a - ld [hUsedSpriteTile], a + ldh [hUsedSpriteTile], a jr nz, .asm_59f3 ld a, c - ld [hUsedSpriteIndex], a + ldh [hUsedSpriteIndex], a .asm_5a23 xor a ret diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 74e44cd3..5a299571 100755 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -302,7 +302,7 @@ Function517a: ; 517a (1:517a) Function519c: ; 519c (1:519c) call DeleteMapObject ld hl, wObjectFollow_Leader - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] cp [hl] jr nz, .asm_51a9 ld [hl], $ff @@ -719,7 +719,7 @@ Function53b1: ; 53b1 (1:53b1) call Function54f5 .asm_53cf ld hl, wCenteredObject - ld a, [hConnectionStripLength] + ldh a, [hConnectionStripLength] cp [hl] jr z, .asm_53de ld hl, $9 @@ -740,7 +740,7 @@ Function53e5: ; 53e5 (1:53e5) add hl, bc ld [hl], $4 ld hl, wCenteredObject - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] cp [hl] jr z, .asm_5400 ld hl, $9 @@ -761,7 +761,7 @@ Function5407: ; 5407 (1:5407) add hl, bc ld [hl], $1 ld hl, wCenteredObject - ld a, [hConnectionStripLength] + ldh a, [hConnectionStripLength] cp [hl] jr z, .asm_5422 ld hl, $9 diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index e776402a..84235570 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -224,7 +224,7 @@ CheckFacingObject: .asm_70d0 ld bc, wObjectStructs ld a, $0 - ld [hMapObjectIndexBuffer], a + ldh [hMapObjectIndexBuffer], a call Function7120 ret nc ld hl, $7 @@ -249,7 +249,7 @@ WillPersonBumpIntoSomeoneElse: ; 70e8 (1:70e8) jr Function7120 Function70f4: - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] call GetObjectStruct call Function7100 call Function7120 @@ -288,7 +288,7 @@ Function7120: ; 7120 (1:7120) ld bc, wPlayerStruct xor a .asm_7124 - ld [hObjectStructIndexBuffer], a + ldh [hObjectStructIndexBuffer], a call DoesObjectHaveASprite jr z, .asm_7172 ld hl, $4 @@ -315,9 +315,9 @@ Function7120: ; 7120 (1:7120) cp e jr nz, .asm_715a .asm_7152 - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] ld l, a - ld a, [hConnectedMapWidth] + ldh a, [hConnectedMapWidth] cp l jr nz, .asm_7181 .asm_715a @@ -331,9 +331,9 @@ Function7120: ; 7120 (1:7120) ld a, [hl] cp e jr nz, .asm_7172 - ld a, [hConnectionStripLength] + ldh a, [hConnectionStripLength] ld l, a - ld a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndexBuffer] cp l jr nz, .asm_7181 .asm_7172 @@ -341,7 +341,7 @@ Function7120: ; 7120 (1:7120) add hl, bc ld b, h ld c, l - ld a, [hConnectedMapWidth] + ldh a, [hConnectedMapWidth] inc a cp $d jr nz, .asm_7124 @@ -445,7 +445,7 @@ Function71f2 ld bc, wObjectStructs xor a .asm_71fe - ld [hConnectedMapWidth], a + ldh [hConnectedMapWidth], a call DoesObjectHaveASprite jr z, .asm_723f ld hl, $3 @@ -468,7 +468,7 @@ Function71f2 ld a, [hl] cp d jr nz, .asm_722d - ld a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndexBuffer] cp $0 jr z, .asm_723f jr .asm_724e @@ -491,7 +491,7 @@ Function71f2 add hl, bc ld b, h ld c, l - ld a, [hConnectedMapWidth] + ldh a, [hConnectedMapWidth] inc a cp $d jr nz, .asm_71fe diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 8af7c726..c919f000 100755 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -11,7 +11,7 @@ DoPlayerMovement:: ; 10000 (4:4000) ret Function10017: ; 10017 (4:4017) - ld a, [hJoyDown] + ldh a, [hJoyDown] ld [wcf29], a CheckFlagHL ENGINE_DOWNHILL ret z @@ -564,7 +564,7 @@ Function102ec: ; 102ec (4:42ec) Function10341: ; 10341 (4:4341) ld a, 0 - ld [hMapObjectIndexBuffer], a + ldh [hMapObjectIndexBuffer], a ld a, [wPlayerStandingMapX] ld d, a ld a, [wcf30] diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 64977b97..a706f8aa 100755 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -1,7 +1,7 @@ BlankScreen: call DisableSpriteUpdates xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call ClearBGPalettes call ClearSprites ld hl, wTileMap @@ -26,10 +26,10 @@ SpawnPlayer: ; 861a (2:461a) ld b, $0 call PlayerSpawn_ConvertCoords ld a, $0 - ld [hObjectStructIndexBuffer], a + ldh [hObjectStructIndexBuffer], a ld de, wObjectStructs ld a, $0 - ld [hMapObjectIndexBuffer], a + ldh [hMapObjectIndexBuffer], a ld bc, wMapObjects call CopyMapObjectToObjectStruct ld a, $0 @@ -77,7 +77,7 @@ WritePersonXY: ld hl, $11 add hl, bc ld e, [hl] - ld a, [hConnectionStripLength] + ldh a, [hConnectionStripLength] ld b, a call CopyDECoordsToMapObject and a @@ -130,12 +130,12 @@ CopyObjectStruct_:: ; 86d7 (2:46d7) ld a, $1 ld de, $28 .asm_86e4 - ld [hObjectStructIndexBuffer], a + ldh [hObjectStructIndexBuffer], a ld a, [hl] and a jr z, .asm_86f4 add hl, de - ld a, [hConnectedMapWidth] + ldh a, [hConnectedMapWidth] inc a cp $d jr nz, .asm_86e4 @@ -160,11 +160,11 @@ CopyMapObjectToObjectStruct: ; 8706 (2:4706) ret CopyMapObjectToTempObject: ; 870d (2:470d) - ld a, [hConnectedMapWidth] + ldh a, [hConnectedMapWidth] ld hl, $0 add hl, bc ld [hl], a - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] ld [wce99], a ld hl, $1 add hl, bc @@ -210,7 +210,7 @@ InitializeVariableSprites: ld bc, wMap2Object ld a, $2 .asm_876c - ld [hConnectionStripLength], a + ldh [hConnectionStripLength], a ld hl, $1 add hl, bc ld a, [hl] @@ -250,7 +250,7 @@ InitializeVariableSprites: add hl, bc ld b, h ld c, l - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] inc a cp $10 jr nz, .asm_876c @@ -289,7 +289,7 @@ asm_87da ld bc, wMap2Object ld a, $2 .asm_87e4 - ld [hConnectionStripLength], a + ldh [hConnectionStripLength], a ld hl, $1 add hl, bc ld a, [hl] @@ -323,7 +323,7 @@ asm_87da add hl, bc ld b, h ld c, l - ld a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndexBuffer] inc a cp $10 jr nz, .asm_87e4 @@ -344,7 +344,7 @@ asm_882e ld bc, wMap2Object ld a, $2 .asm_8838 - ld [hConnectionStripLength], a + ldh [hConnectionStripLength], a ld hl, $1 add hl, bc ld a, [hl] @@ -378,7 +378,7 @@ asm_882e add hl, bc ld b, h ld c, l - ld a, [hConnectionStripLength] + ldh a, [hConnectionStripLength] inc a cp $10 jr nz, .asm_8838 @@ -474,14 +474,14 @@ InitTempObjectRadius: ; 88fd (2:48fd) ret TrainerWalkToPlayer: - ld a, [hLastTalked] + ldh a, [hLastTalked] call InitMovementBuffer ld a, movement_step_sleep call AppendToMovementBuffer ld a, [wcf2a] dec a jr z, .asm_892b - ld a, [hLastTalked] + ldh a, [hLastTalked] ld b, a ld c, PLAYER ld d, $1 @@ -624,7 +624,7 @@ FollowNotExact: ld hl, $18 add hl, de ld [hl], a - ld a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndexBuffer] ld hl, $20 add hl, de ld [hl], a diff --git a/engine/overworld/player_step.asm b/engine/overworld/player_step.asm index 70947346..36698ed8 100755 --- a/engine/overworld/player_step.asm +++ b/engine/overworld/player_step.asm @@ -39,12 +39,12 @@ ScrollScreen:: ld d, a ld a, [wPlayerStepVectorY] ld e, a - ld a, [hSCX] + ldh a, [hSCX] add d - ld [hSCX], a - ld a, [hSCY] + ldh [hSCX], a + ldh a, [hSCY] add e - ld [hSCY], a + ldh [hSCY], a ret Functiond4f2: ; d4f2 (3:54f2) diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index ce847b18..01273a75 100755 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -305,7 +305,7 @@ CalcSecsMinsHoursDaysSince: ; 119c7 (4:59c7) inc hl inc hl inc hl - ld a, [hSeconds] + ldh a, [hSeconds] ld c, a sub [hl] jr nc, .asm_119d2 @@ -315,7 +315,7 @@ CalcSecsMinsHoursDaysSince: ; 119c7 (4:59c7) dec hl ld [wSecsSince], a CalcMinsHoursDaysSince_ - ld a, [hMinutes] + ldh a, [hMinutes] ld c, a sbc [hl] jr nc, .asm_119df @@ -325,7 +325,7 @@ CalcMinsHoursDaysSince_ dec hl ld [wMinsSince], a CalcHoursDaysSince_ - ld a, [hHours] + ldh a, [hHours] ld c, a sbc [hl] jr nc, .asm_119ec @@ -348,11 +348,11 @@ CalcDaysSince_: CopyDayHourMinSecToHL: ; 119ff (4:59ff) ld a, [wCurDay] ld [hli], a - ld a, [hHours] + ldh a, [hHours] ld [hli], a - ld a, [hMinutes] + ldh a, [hMinutes] ld [hli], a - ld a, [hSeconds] + ldh a, [hSeconds] ld [hli], a ret @@ -364,15 +364,15 @@ CopyDayToHL: ; 11a0d (4:5a0d) CopyDayHourToHL: ld a, [wCurDay] ld [hli], a - ld a, [hHours] + ldh a, [hHours] ld [hli], a ret CopyDayHourMinToHL: ; 11a1a (4:5a1a) ld a, [wCurDay] ld [hli], a - ld a, [hHours] + ldh a, [hHours] ld [hli], a - ld a, [hMinutes] + ldh a, [hMinutes] ld [hli], a ret |