diff options
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/load_map_part.asm | 12 | ||||
| -rw-r--r-- | engine/overworld/npc_movement.asm | 39 | ||||
| -rw-r--r-- | engine/overworld/overworld.asm | 11 |
3 files changed, 34 insertions, 28 deletions
diff --git a/engine/overworld/load_map_part.asm b/engine/overworld/load_map_part.asm index 32dc1226..4e8e228b 100644 --- a/engine/overworld/load_map_part.asm +++ b/engine/overworld/load_map_part.asm @@ -35,7 +35,8 @@ _LoadMapPart:: jr nz, .loop ret -Function153ba: ; unreferenced +ForceApplyFlashlight1: ; unreferenced +; See pokegold-spaceworld's ApplyFlashlight.force_1 in home/map.asm. decoord 2, 2 ld bc, (SURROUNDING_WIDTH + 1) * 2 add hl, bc @@ -66,7 +67,8 @@ Function153ba: ; unreferenced jr nz, .loop ret -Function153dd: ; unreferenced +ForceApplyFlashlight2: ; unreferenced +; See pokegold-spaceworld's ApplyFlashlight.force_2 in home/map.asm. decoord 4, 4 ld bc, (SURROUNDING_WIDTH + 1) * 4 add hl, bc @@ -97,7 +99,8 @@ Function153dd: ; unreferenced jr nz, .loop ret -Ureferenced_Function15400: +ForceApplyFlashlight3: ; unreferenced +; See pokegold-spaceworld's ApplyFlashlight.force_3 in home/map.asm. decoord 6, 6 ld bc, (SURROUNDING_WIDTH + 1) * 6 add hl, bc @@ -128,7 +131,8 @@ Ureferenced_Function15400: jr nz, .loop ret -Function15423: ; unreferenced +ForceApplyFlashlight4: ; unreferenced +; See pokegold-spaceworld's ApplyFlashlight.force_4 in home/map.asm. decoord 8, 8 ld bc, (SURROUNDING_WIDTH + 1) * 8 add hl, bc diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index bcc47a20..1fb8e63a 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -274,14 +274,14 @@ WillObjectBumpIntoSomeoneElse: ld e, [hl] jr IsNPCAtCoord -Function70f4: ; unreferenced +IsObjectFacingSomeoneElse: ; unreferenced ldh a, [hMapObjectIndexBuffer] call GetObjectStruct - call .CheckWillBeFacingNPC + call .GetFacingCoords call IsNPCAtCoord ret -.CheckWillBeFacingNPC: +.GetFacingCoords: ld hl, OBJECT_NEXT_MAP_X add hl, bc ld d, [hl] @@ -289,12 +289,13 @@ Function70f4: ; unreferenced add hl, bc ld e, [hl] call GetSpriteDirection - and a + and a ; OW_DOWN? jr z, .down cp OW_UP jr z, .up cp OW_LEFT jr z, .left + ; OW_RIGHT inc d ret @@ -326,32 +327,31 @@ IsNPCAtCoord: ld hl, OBJECT_PALETTE add hl, bc bit BIG_OBJECT_F, [hl] - jr z, .got - + jr z, .not_big call WillObjectIntersectBigObject - jr nc, .ok - jr .ok2 + jr nc, .check_current_coords + jr .continue -.got +.not_big ld hl, OBJECT_NEXT_MAP_X add hl, bc ld a, [hl] cp d - jr nz, .ok + jr nz, .check_current_coords ld hl, OBJECT_NEXT_MAP_Y add hl, bc ld a, [hl] cp e - jr nz, .ok + jr nz, .check_current_coords -.ok2 +.continue ldh a, [hMapObjectIndexBuffer] ld l, a ldh a, [hObjectStructIndexBuffer] cp l - jr nz, .setcarry + jr nz, .yes -.ok +.check_current_coords ld hl, OBJECT_MAP_X add hl, bc ld a, [hl] @@ -366,7 +366,7 @@ IsNPCAtCoord: ld l, a ldh a, [hObjectStructIndexBuffer] cp l - jr nz, .setcarry + jr nz, .yes .next ld hl, OBJECT_LENGTH @@ -380,7 +380,7 @@ IsNPCAtCoord: and a ret -.setcarry +.yes scf ret @@ -473,7 +473,7 @@ IsObjectMovingOffEdgeOfScreen: scf ret -Function71f2: ; unreferenced +IsNPCAtPlayerCoord: ; unreferenced ld a, [wPlayerStandingMapX] ld d, a ld a, [wPlayerStandingMapY] @@ -484,16 +484,17 @@ Function71f2: ; unreferenced ldh [hObjectStructIndexBuffer], a call DoesObjectHaveASprite jr z, .next + ld hl, OBJECT_MOVEMENTTYPE add hl, bc ld a, [hl] cp SPRITEMOVEDATA_BIGDOLLSYM - jr nz, .not_snorlax + jr nz, .not_big call WillObjectIntersectBigObject jr c, .yes jr .next -.not_snorlax +.not_big ld hl, OBJECT_NEXT_MAP_Y add hl, bc ld a, [hl] diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm index 43465f73..0d285d2a 100644 --- a/engine/overworld/overworld.asm +++ b/engine/overworld/overworld.asm @@ -433,21 +433,22 @@ endr .done: ret -Function1438a: ; unreferenced +GetUsedSpriteTileB: ; unreferenced ld a, c jr GetUsedSprite -Function1438d: ; unreferenced +GetUsedSpriteFirst: ; unreferenced ld a, c - ld b, 0 + ld b, $00 jr GetUsedSprite -Function14392: ; unreferenced +GetUsedSpriteSecond: ; unreferenced ld a, c - ld b, SPRITE_GFX_LIST_CAPACITY + ld b, $0c jr GetUsedSprite GetUsedSprite: +; Input: b = tile id, c = index push bc ld a, c ldh [hUsedSpriteIndex], a |