Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
pokecrystal/engine/map_objects.asm

3113 lines
46 KiB
NASM
Raw Normal View History

Move lots of data tables into individual data/ files (This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
2017-12-11 18:47:58 +00:00
INCLUDE "data/facings.asm"
Split out map object code.
2015-02-11 22:13:22 +00:00
More movement stuff
2015-12-29 18:15:58 +00:00
INCLUDE "data/map_objects.asm"
Further decoding of SpriteMovementData
2015-11-16 05:52:53 +00:00
Keep table labels in the same files as their contents.
2017-12-12 03:44:25 +00:00
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4357
Movement etc.
2015-12-17 20:14:51 +00:00
DeleteMapObject:: ; 4357
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_MAP_OBJECT_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
push af
ld h, b
ld l, c
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld bc, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
call ByteFill
pop af
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp -1
jr z, .ok
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 7, a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .ok
Split out map object code.
2015-02-11 22:13:22 +00:00
call GetMapObject
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_SPRITE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], -1
.ok
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
ret
; 437b
Function437b: ; 437b
Movement etc.
2015-12-17 20:14:51 +00:00
call .CheckObjectStillVisible
Split out map object code.
2015-02-11 22:13:22 +00:00
ret c
More movement stuff
2015-12-29 18:15:58 +00:00
call .HandleStepType
call .HandleObjectAction
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.CheckObjectStillVisible:
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
res 6, [hl]
ld a, [XCoord]
ld e, a
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
add 1
Split out map object code.
2015-02-11 22:13:22 +00:00
sub e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .ok
cp MAPOBJECT_SCREEN_WIDTH
jr nc, .ok
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [YCoord]
ld e, a
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
add 1
Split out map object code.
2015-02-11 22:13:22 +00:00
sub e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .ok
cp MAPOBJECT_SCREEN_HEIGHT
jr nc, .ok
jr .yes
Split out map object code.
2015-02-11 22:13:22 +00:00
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
set 6, [hl]
ld a, [XCoord]
ld e, a
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_INIT_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
add 1
Split out map object code.
2015-02-11 22:13:22 +00:00
sub e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .ok2
cp MAPOBJECT_SCREEN_WIDTH
jr nc, .ok2
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [YCoord]
ld e, a
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_INIT_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
add 1
Split out map object code.
2015-02-11 22:13:22 +00:00
sub e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .ok2
cp MAPOBJECT_SCREEN_HEIGHT
jr nc, .ok2
.yes
Split out map object code.
2015-02-11 22:13:22 +00:00
and a
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok2
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS1
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
bit 1, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .yes2
Movement etc.
2015-12-17 20:14:51 +00:00
call DeleteMapObject
Split out map object code.
2015-02-11 22:13:22 +00:00
scf
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.yes2
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
set 6, [hl]
and a
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.HandleStepType:
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
and a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .zero
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
bit 5, [hl]
SPRITEMOVEDATA
2015-11-01 01:05:02 +00:00
jr nz, .bit5
Movement etc.
2015-12-17 20:14:51 +00:00
cp STEP_TYPE_SLEEP
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .one
More movement stuff
2015-12-29 18:15:58 +00:00
jr .ok3
Split out map object code.
2015-02-11 22:13:22 +00:00
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.zero
Movement etc.
2015-12-17 20:14:51 +00:00
call ObjectMovementReset
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
bit 5, [hl]
SPRITEMOVEDATA
2015-11-01 01:05:02 +00:00
jr nz, .bit5
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.one
Movement etc.
2015-12-17 20:14:51 +00:00
call MapObjectMovementPattern
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
and a
ret z
Movement etc.
2015-12-17 20:14:51 +00:00
cp STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
More movement stuff
2015-12-29 18:15:58 +00:00
.ok3
All functions in main.asm have non-generic names
2016-05-08 18:11:24 +00:00
ld hl, StepTypesJumptable
Split out map object code.
2015-02-11 22:13:22 +00:00
rst JumpTable
ret
SPRITEMOVEDATA
2015-11-01 01:05:02 +00:00
.bit5
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.HandleObjectAction:
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS1
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
bit INVISIBLE, [hl]
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
jr nz, SetFacingStanding
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
bit 6, [hl]
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
jr nz, SetFacingStanding
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 5, [hl]
More movement stuff
2015-12-29 18:15:58 +00:00
jr nz, asm_4448
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld de, ObjectActionPairPointers ; use first column
Document constants with comments, actual names, and more thorough usage
2017-12-09 05:50:59 +00:00
jr _HandleObjectAction
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4440
Function4440: ; 4440
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS1
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
bit INVISIBLE, [hl]
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
jr nz, SetFacingStanding
Document constants with comments, actual names, and more thorough usage
2017-12-09 05:50:59 +00:00
asm_4448
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld de, ObjectActionPairPointers + 2 ; use second column
Document constants with comments, actual names, and more thorough usage
2017-12-09 05:50:59 +00:00
jr _HandleObjectAction
Split out map object code.
2015-02-11 22:13:22 +00:00
; 444d
Document constants with comments, actual names, and more thorough usage
2017-12-09 05:50:59 +00:00
_HandleObjectAction
More map object work
2015-11-14 19:41:47 +00:00
; call [4 * ObjectStructs[ObjInd, OBJECT_ACTION] + de]
Document constants with comments, actual names, and more thorough usage
2017-12-09 05:50:59 +00:00
ld hl, OBJECT_ACTION
add hl, bc
ld a, [hl]
ld l, a
ld h, 0
add hl, hl
add hl, hl
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
call _hl_
ret
; 445f
More movement stuff
2015-12-29 18:15:58 +00:00
INCLUDE "engine/map_object_action.asm"
Split out map object code.
2015-02-11 22:13:22 +00:00
Movement etc.
2015-12-17 20:14:51 +00:00
CopyNextCoordsTileToStandingCoordsTile: ; 4600
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_NEXT_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STANDING_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call SetTallGrassFlags
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_NEXT_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call UselessAndA
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 462a
Function462a: ; 462a
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
ret
; 463f
Movement etc.
2015-12-17 20:14:51 +00:00
UpdateTallGrassFlags: ; 463f
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
bit 3, [hl] ; is current tile grass?
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .ok
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_NEXT_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call SetTallGrassFlags
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_NEXT_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call UselessAndA
ret c ; never happens
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STANDING_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call UselessAndA
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4661
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
SetTallGrassFlags: ; 4661
Wild Pokemon functions and data Replaced encounter rates with percent values Added new constants denoting the number of wild Pokemon in the grass and water wild constructs Annotated and relabeled the encounter generating functions Renamed a WRAM address associaed with the temporary storage of the wild Pokemon's species Moved spawn constants to constants/map_constants.asm for use anywhere in the disassembly
2015-07-23 07:41:52 +00:00
call CheckSuperTallGrassTile
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .set
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call CheckGrassTile
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .reset
.set
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
set 3, [hl]
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.reset
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
res 3, [hl]
ret
; 4679
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
UselessAndA: ; 4679
Split out map object code.
2015-02-11 22:13:22 +00:00
and a
ret
; 467b
Movement etc.
2015-12-17 20:14:51 +00:00
EndSpriteMovement: ; 467b
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld hl, OBJECT_STEP_FRAME
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hli], a
Labeled every function in ROM0 that's referenced in the source
2016-05-10 16:31:49 +00:00
ld [hli], a
ld [hli], a
More map object work
2015-11-14 19:41:47 +00:00
ld [hl], a ; OBJECT_30
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4690
Movement etc.
2015-12-17 20:14:51 +00:00
InitStep: ; 4690
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS1
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object work
2015-11-14 19:41:47 +00:00
bit FIXED_FACING, [hl]
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
jr nz, GetNextTile
Split out map object code.
2015-02-11 22:13:22 +00:00
add a
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
add a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00001100
ld hl, OBJECT_FACING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
GetNextTile: ; 46a6
Split out map object code.
2015-02-11 22:13:22 +00:00
call GetStepVector
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
ld a, d
More map object work
2015-11-14 19:41:47 +00:00
call GetStepVectorSign
ld hl, OBJECT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
add [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
ld d, a
ld a, e
More map object work
2015-11-14 19:41:47 +00:00
call GetStepVectorSign
ld hl, OBJECT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
add [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
ld e, a
push bc
sprite engine; tileset constants
2015-11-13 05:49:27 +00:00
call GetCoordTile
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_NEXT_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
ret
; 46d7
More map object work
2015-11-14 19:41:47 +00:00
AddStepVector: ; 46d7
Split out map object code.
2015-02-11 22:13:22 +00:00
call GetStepVector
ld hl, OBJECT_SPRITE_X
add hl, bc
ld a, [hl]
add d
ld [hl], a
ld hl, OBJECT_SPRITE_Y
add hl, bc
ld a, [hl]
add e
ld [hl], a
ret
; 46e9
GetStepVector: ; 46e9
; Return (x, y, duration, speed) in (d, e, a, h).
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00001111
Split out map object code.
2015-02-11 22:13:22 +00:00
add a
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
add a
Split out map object code.
2015-02-11 22:13:22 +00:00
ld l, a
ld h, 0
ld de, StepVectors
add hl, de
ld d, [hl]
inc hl
ld e, [hl]
inc hl
ld a, [hli]
ld h, [hl]
ret
; 4700
StepVectors: ; 4700
; x, y, duration, speed
; slow
db 0, 1, 16, 1
db 0, -1, 16, 1
db -1, 0, 16, 1
db 1, 0, 16, 1
; normal
db 0, 2, 8, 2
db 0, -2, 8, 2
db -2, 0, 8, 2
db 2, 0, 8, 2
; fast
db 0, 4, 4, 4
db 0, -4, 4, 4
db -4, 0, 4, 4
db 4, 0, 4, 4
; 4730
More map object work
2015-11-14 19:41:47 +00:00
GetStepVectorSign: ; 4730
Split out map object code.
2015-02-11 22:13:22 +00:00
add a
More map object work
2015-11-14 19:41:47 +00:00
ret z ; 0 or 128
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, 1
More map object work
2015-11-14 19:41:47 +00:00
ret nc ; 1 - 127
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, -1
More map object work
2015-11-14 19:41:47 +00:00
ret ; 129 - 255
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4738
Movement etc.
2015-12-17 20:14:51 +00:00
UpdatePlayerStep: ; 4738
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000011
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [wPlayerStepDirection], a
More map object work
2015-11-14 19:41:47 +00:00
call AddStepVector
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld a, [wPlayerStepVectorX]
Split out map object code.
2015-02-11 22:13:22 +00:00
add d
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [wPlayerStepVectorX], a
ld a, [wPlayerStepVectorY]
Split out map object code.
2015-02-11 22:13:22 +00:00
add e
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [wPlayerStepVectorY], a
ld hl, wPlayerStepFlags
Split out map object code.
2015-02-11 22:13:22 +00:00
set 5, [hl]
ret
; 4759
Function4759: ; 4759
More movement stuff
2015-12-29 18:15:58 +00:00
; unreferenced
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
ld e, a
ld d, 0
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_MAP_OBJECT_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
call GetMapObject
add hl, de
ld a, [hl]
pop bc
ret
; 4769
object_struct
2015-11-02 16:15:32 +00:00
RestoreDefaultMovement: ; 4769
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_MAP_OBJECT_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp -1
jr z, .ok
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
call GetMapObject
Reworked person_event arguments
2015-07-29 22:22:23 +00:00
ld hl, MAPOBJECT_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
pop bc
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
More movement stuff
2015-12-29 18:15:58 +00:00
ld a, SPRITEMOVEFN_STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4780
More map object work
2015-11-14 19:41:47 +00:00
ClearObjectMovementByteIndex: ; 4780
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4787
More map object work
2015-11-14 19:41:47 +00:00
IncrementObjectMovementByteIndex: ; 4787
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
inc [hl]
ret
; 478d
More map object work
2015-11-14 19:41:47 +00:00
DecrementObjectMovementByteIndex: ; 478d
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
dec [hl]
ret
; 4793
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
MovementAnonymousJumptable: ; 4793
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
pop hl
rst JumpTable
ret
; 479b
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ClearObjectStructField28: ; 479b
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_28
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 47a2
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
IncrementObjectStructField28: ; 47a2
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_28
add hl, bc
inc [hl]
ret
; 47a8
More map object work
2015-11-14 19:41:47 +00:00
Object28AnonymousJumptable: ; 47a8
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_28
add hl, bc
ld a, [hl]
pop hl
rst JumpTable
ret
; 47b0
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
GetValueObjectStructField28: ; 47b0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_28
add hl, bc
ld a, [hl]
ret
; 47b6
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
SetValueObjectStructField28: ; 47b6
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_28
add hl, bc
ld [hl], a
ret
; 47bc
Movement etc.
2015-12-17 20:14:51 +00:00
ObjectMovementReset: ; 47bc
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld d, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld e, [hl]
push bc
sprite engine; tileset constants
2015-11-13 05:49:27 +00:00
call GetCoordTile
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_NEXT_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
Movement etc.
2015-12-17 20:14:51 +00:00
call CopyNextCoordsTileToStandingCoordsTile
call EndSpriteMovement
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 47dd
Movement etc.
2015-12-17 20:14:51 +00:00
MapObjectMovementPattern: ; 47dd
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call ClearObjectStructField28
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call GetSpriteMovementFunction
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hl]
ld hl, .Pointers
rst JumpTable
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Pointers: ; 47e9
Document constants with comments, actual names, and more thorough usage
2017-12-09 05:50:59 +00:00
; entries correspond to SPRITEMOVEFN_* constants
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
dw .Null_00 ; 00
dw .RandomWalkY ; 01
dw .RandomWalkX ; 02
dw .RandomWalkXY ; 03
dw .RandomSpin1 ; 04
dw .RandomSpin2 ; 05
dw .Standing ; 06
dw .ObeyDPad ; 07
dw .Movement08 ; 08
dw .Movement09 ; 09
dw .Movement0a ; 0a
dw .Movement0b ; 0b
dw .Movement0c ; 0c
dw .Movement0d ; 0d
dw .Movement0e ; 0e
dw .Follow ; 0f
dw .Script ; 10
dw .Strength ; 11
dw .FollowNotExact ; 12
dw .MovementShadow ; 13
dw .MovementEmote ; 14
dw .MovementBigStanding ; 15
dw .MovementBouncing ; 16
dw .MovementScreenShake ; 17
dw .MovementSpinClockwise ; 18
dw .MovementSpinCounterclockwise ; 19
dw .MovementBoulderDust ; 1a
dw .MovementShakingGrass ; 1b
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Null_00:
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.RandomWalkY:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
ld a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000001
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jp .RandomWalkContinue
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.RandomWalkX:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
ld a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000001
or %00000010
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jp .RandomWalkContinue
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.RandomWalkXY:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
ld a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000011
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jp .RandomWalkContinue
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.RandomSpin1:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
ld a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00001100
ld hl, OBJECT_FACING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
More map object work
2015-11-14 19:41:47 +00:00
jp RandomStepDuration_Slow
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.RandomSpin2:
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_FACING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00001100
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
call Random
ld a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00001100
Split out map object code.
2015-02-11 22:13:22 +00:00
cp d
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .keep
xor %00001100
.keep
Split out map object code.
2015-02-11 22:13:22 +00:00
ld [hl], a
More map object work
2015-11-14 19:41:47 +00:00
jp RandomStepDuration_Fast
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Standing:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Function462a
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_STAND
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_05
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.ObeyDPad:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, Function5000
More splits; map setup labels
2015-11-12 04:38:57 +00:00
jp HandleMovementData
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Movement08:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, Function5015
More splits; map setup labels
2015-11-12 04:38:57 +00:00
jp HandleMovementData
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Movement09:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, Function5026
More splits; map setup labels
2015-11-12 04:38:57 +00:00
jp HandleMovementData
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Movement0a:
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
jp _GetMovementObject
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Movement0b:
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
jp _GetMovementObject
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Movement0c:
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
jp _GetMovementObject
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Movement0d:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, Function5000
More splits; map setup labels
2015-11-12 04:38:57 +00:00
jp HandleMovementData
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Movement0e:
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
jp _GetMovementObject
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Follow:
More movement stuff
2015-12-29 18:15:58 +00:00
ld hl, GetFollowerNextMovementByte
More splits; map setup labels
2015-11-12 04:38:57 +00:00
jp HandleMovementData
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Script:
More movement stuff
2015-12-29 18:15:58 +00:00
ld hl, GetMovementByte
More splits; map setup labels
2015-11-12 04:38:57 +00:00
jp HandleMovementData
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Strength:
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call MovementAnonymousJumptable
Sprite movement function labels
2015-11-06 21:42:38 +00:00
dw .Strength_Start
dw .Strength_Stop
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Strength_Start:
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_NEXT_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
call CheckPitTile
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .on_pit
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
bit 2, [hl]
res 2, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .ok
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_RANGE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000011
or 0
Movement etc.
2015-12-17 20:14:51 +00:00
call InitStep
Split out map object code.
2015-02-11 22:13:22 +00:00
call Function6ec1
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .ok2
Split out map object code.
2015-02-11 22:13:22 +00:00
ld de, SFX_STRENGTH
call PlaySFX
More map object work
2015-11-14 19:41:47 +00:00
call SpawnStrengthBoulderDust
Movement etc.
2015-12-17 20:14:51 +00:00
call UpdateTallGrassFlags
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_0F
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok2
Split out map object code.
2015-02-11 22:13:22 +00:00
call Function462a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.on_pit
More map object work
2015-11-14 19:41:47 +00:00
call IncrementObjectMovementByteIndex
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Strength_Stop:
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.FollowNotExact:
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld d, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld e, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_RANGE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
push bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call GetObjectStruct
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp STANDING
jr z, .standing
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
cp d
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .equal
jr c, .less
ld a, 3
jr .done
Split out map object code.
2015-02-11 22:13:22 +00:00
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.less
ld a, 2
jr .done
Split out map object code.
2015-02-11 22:13:22 +00:00
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.equal
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
cp e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .standing
jr c, .less2
ld a, 0
jr .done
Split out map object code.
2015-02-11 22:13:22 +00:00
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.less2
ld a, 1
.done
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00001100
Split out map object code.
2015-02-11 22:13:22 +00:00
or d
pop bc
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
jp NormalStep
Split out map object code.
2015-02-11 22:13:22 +00:00
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.standing
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_STAND
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementBigStanding:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_BIG_SNORLAX
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_04
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementBouncing:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_BOUNCE
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_04
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementSpinCounterclockwise:
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call MovementAnonymousJumptable
Sprite movement function labels
2015-11-06 21:42:38 +00:00
dw .MovementSpinInit
dw .MovementSpinRepeat
dw .MovementSpinTurnLeft
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementSpinClockwise:
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call MovementAnonymousJumptable
Sprite movement function labels
2015-11-06 21:42:38 +00:00
dw .MovementSpinInit
dw .MovementSpinRepeat
dw .MovementSpinTurnRight
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementSpinInit:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
More map object work
2015-11-14 19:41:47 +00:00
call IncrementObjectMovementByteIndex
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementSpinRepeat:
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_STAND
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_RANGE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld a, $10
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_03
More map object work
2015-11-14 19:41:47 +00:00
call IncrementObjectMovementByteIndex
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementSpinTurnLeft:
Sprite movement function labels
2015-11-06 21:42:38 +00:00
ld de, .DirectionData_Counterclockwise
call .MovementSpinNextFacing
jr .MovementSpinCounterclockwise
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.DirectionData_Counterclockwise: ; 49c0
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
db OW_RIGHT, OW_LEFT, OW_DOWN, OW_UP
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementSpinTurnRight:
Sprite movement function labels
2015-11-06 21:42:38 +00:00
ld de, .DirectionData_Clockwise
call .MovementSpinNextFacing
jr .MovementSpinClockwise
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.DirectionData_Clockwise: ; 49cc
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
db OW_LEFT, OW_RIGHT, OW_UP, OW_DOWN
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementSpinNextFacing:
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_FACING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00001100
Split out map object code.
2015-02-11 22:13:22 +00:00
rrca
rrca
push hl
ld l, a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld h, 0
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
ld a, [hl]
pop hl
ld [hl], a
More map object work
2015-11-14 19:41:47 +00:00
call DecrementObjectMovementByteIndex
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementShadow:
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
call ._MovementShadow_Grass_Emote_BoulderDust
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_SHADOW
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, de
ld a, [hl]
inc a
add a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
add 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
ld a, [hl]
and 3
Movement etc.
2015-12-17 20:14:51 +00:00
ld d, 1 * 8 + 6
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp DOWN
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .ok_13
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp UP
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .ok_13
Movement etc.
2015-12-17 20:14:51 +00:00
ld d, 1 * 8 + 4
Sprite movement function labels
2015-11-06 21:42:38 +00:00
.ok_13
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], d
ld hl, OBJECT_SPRITE_X_OFFSET
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_TRACKING_OBJECT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementEmote:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
call ._MovementShadow_Grass_Emote_BoulderDust
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_EMOTE
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], -2 * 8
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_X_OFFSET
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_TRACKING_OBJECT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementBoulderDust:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
call ._MovementShadow_Grass_Emote_BoulderDust
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_BOULDER_DUST
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, de
ld a, [hl]
inc a
add a
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000011
Split out map object code.
2015-02-11 22:13:22 +00:00
ld e, a
ld d, 0
ld hl, .data_4a81
More movement stuff
2015-12-29 18:15:58 +00:00
add hl, de
add hl, de
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, [hl]
inc hl
ld e, [hl]
ld hl, OBJECT_SPRITE_X_OFFSET
add hl, bc
ld [hl], d
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], e
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_TRACKING_OBJECT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
.data_4a81 ; 4a81
; x, y
db 0, -4
db 0, 8
db 6, 2
db -6, 2
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementShakingGrass:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
call ._MovementShadow_Grass_Emote_BoulderDust
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_GRASS_SHAKE
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, de
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
add -1
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_TRACKING_OBJECT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with underscores have colons depending on whether the first alphanumeric character is capitalized or not
2016-04-10 19:11:37 +00:00
._MovementShadow_Grass_Emote_BoulderDust:
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_RANGE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
push bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call GetObjectStruct
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, b
ld e, c
pop bc
ld hl, OBJECT_29
add hl, bc
ld [hl], e
inc hl
ld [hl], d
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.MovementScreenShake:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_00
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_RANGE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
call ._MovementScreenShake
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], e
ld hl, OBJECT_30
add hl, bc
ld [hl], a
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_15
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with underscores have colons depending on whether the first alphanumeric character is capitalized or not
2016-04-10 19:11:37 +00:00
._MovementScreenShake:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00111111
Split out map object code.
2015-02-11 22:13:22 +00:00
ld e, a
ld a, d
rlca
rlca
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000011
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
inc d
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld a, 1
.loop
Split out map object code.
2015-02-11 22:13:22 +00:00
dec d
ret z
add a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.RandomWalkContinue:
Movement etc.
2015-12-17 20:14:51 +00:00
call InitStep
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call Function6ec1 ; check whether the object can move in that direction
jr c, .NewDuration
Movement etc.
2015-12-17 20:14:51 +00:00
call UpdateTallGrassFlags
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_STEP
Movement constants, script stack
2015-11-16 16:53:26 +00:00
ld hl, wCenteredObject
object_struct
2015-11-02 16:15:32 +00:00
ld a, [hMapObjectIndexBuffer]
Split out map object code.
2015-02-11 22:13:22 +00:00
cp [hl]
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .load_6
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_07
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Sprite movement function labels
2015-11-06 21:42:38 +00:00
.load_6
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement constants, script stack
2015-11-16 16:53:26 +00:00
ld [hl], STEP_TYPE_PLAYER_WALK
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.NewDuration:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
Split out map object code.
2015-02-11 22:13:22 +00:00
call Function462a
More map object work
2015-11-14 19:41:47 +00:00
RandomStepDuration_Slow: ; 4b1d
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
ld a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %01111111
More map object work
2015-11-14 19:41:47 +00:00
jr SetRandomStepDuration
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4b26
More map object work
2015-11-14 19:41:47 +00:00
RandomStepDuration_Fast: ; 4b26
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
ld a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00011111
More map object work
2015-11-14 19:41:47 +00:00
SetRandomStepDuration: ; 4b2d
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_STAND
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_03
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4b45
All functions in main.asm have non-generic names
2016-05-08 18:11:24 +00:00
StepTypesJumptable: ; 4b45
Document constants with comments, actual names, and more thorough usage
2017-12-09 05:50:59 +00:00
; entries correspond to STEP_TYPE_* constants
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
dw ObjectMovementReset ; 00
More movement stuff
2015-12-29 18:15:58 +00:00
dw MapObjectMovementPattern ; unused
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
dw NPCStep ; 02 npc walk
More movement stuff
2015-12-29 18:15:58 +00:00
dw StepType03 ; 03
dw StepType04 ; 04
dw StepType05 ; 05
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
dw PlayerStep ; 06 player walk
More movement stuff
2015-12-29 18:15:58 +00:00
dw StepType07 ; 07
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
dw NPCJump ; 08 npc jump step
dw PlayerJump ; 09 player jump step
More movement stuff
2015-12-29 18:15:58 +00:00
dw PlayerOrNPCTurnStep ; 0a half step
dw StepTypeBump ; 0b
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
dw TeleportFrom ; 0c teleport from
dw TeleportTo ; 0d teleport to
dw Skyfall ; 0e skyfall
More movement stuff
2015-12-29 18:15:58 +00:00
dw StepType0f ; 0f
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
dw GotBiteStep ; 10
dw RockSmashStep ; 11
dw ReturnDigStep ; 12
More movement stuff
2015-12-29 18:15:58 +00:00
dw StepTypeTrackingObject ; 13
dw StepType14 ; 14
dw StepType15 ; 15
dw StepType16 ; 16
dw StepType17 ; 17
dw StepType18 ; 18
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
dw SkyfallTop ; 19
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4b79
More movement stuff
2015-12-29 18:15:58 +00:00
WaitStep_InPlace: ; 4b79
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4b86
Movement etc.
2015-12-17 20:14:51 +00:00
NPCJump: ; 4b86
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
More movement stuff
2015-12-29 18:15:58 +00:00
dw .Jump
dw .Land
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Jump:
More map object work
2015-11-14 19:41:47 +00:00
call AddStepVector
Split out map object code.
2015-02-11 22:13:22 +00:00
call UpdateJumpPosition
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
Movement etc.
2015-12-17 20:14:51 +00:00
call CopyNextCoordsTileToStandingCoordsTile
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call GetNextTile
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
res 3, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Land:
More map object work
2015-11-14 19:41:47 +00:00
call AddStepVector
Split out map object code.
2015-02-11 22:13:22 +00:00
call UpdateJumpPosition
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
Movement etc.
2015-12-17 20:14:51 +00:00
call CopyNextCoordsTileToStandingCoordsTile
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4bbf
Movement etc.
2015-12-17 20:14:51 +00:00
PlayerJump: ; 4bbf
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
Movement etc.
2015-12-17 20:14:51 +00:00
dw .initjump
dw .stepjump
dw .initland
dw .stepland
Split out map object code.
2015-02-11 22:13:22 +00:00
More movement stuff
2015-12-29 18:15:58 +00:00
.initjump
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, wPlayerStepFlags
Split out map object code.
2015-02-11 22:13:22 +00:00
set 7, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
More movement stuff
2015-12-29 18:15:58 +00:00
.stepjump
Split out map object code.
2015-02-11 22:13:22 +00:00
call UpdateJumpPosition
Movement etc.
2015-12-17 20:14:51 +00:00
call UpdatePlayerStep
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
Movement etc.
2015-12-17 20:14:51 +00:00
call CopyNextCoordsTileToStandingCoordsTile
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
res 3, [hl]
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, wPlayerStepFlags
Split out map object code.
2015-02-11 22:13:22 +00:00
set 6, [hl]
set 4, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
More movement stuff
2015-12-29 18:15:58 +00:00
.initland
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
call GetNextTile
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, wPlayerStepFlags
Split out map object code.
2015-02-11 22:13:22 +00:00
set 7, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
More movement stuff
2015-12-29 18:15:58 +00:00
.stepland
Split out map object code.
2015-02-11 22:13:22 +00:00
call UpdateJumpPosition
Movement etc.
2015-12-17 20:14:51 +00:00
call UpdatePlayerStep
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, wPlayerStepFlags
Split out map object code.
2015-02-11 22:13:22 +00:00
set 6, [hl]
Movement etc.
2015-12-17 20:14:51 +00:00
call CopyNextCoordsTileToStandingCoordsTile
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4c18
Movement etc.
2015-12-17 20:14:51 +00:00
TeleportFrom: ; 4c18
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
More movement stuff
2015-12-29 18:15:58 +00:00
dw .InitSpin
dw .DoSpin
dw .InitSpinRise
dw .DoSpinRise
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4c23
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.InitSpin:
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld hl, OBJECT_STEP_FRAME
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
More movement stuff
2015-12-29 18:15:58 +00:00
ld [hl], 16
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.DoSpin:
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_SPIN
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.InitSpinRise:
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld hl, OBJECT_STEP_FRAME
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_31
add hl, bc
ld [hl], $10
ld hl, OBJECT_STEP_DURATION
add hl, bc
More movement stuff
2015-12-29 18:15:58 +00:00
ld [hl], 16
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
res 3, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.DoSpinRise:
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_SPIN
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_31
add hl, bc
inc [hl]
ld a, [hl]
ld d, $60
call Sine
ld a, h
sub $60
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], a
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld hl, OBJECT_STEP_FRAME
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4c89
Movement etc.
2015-12-17 20:14:51 +00:00
TeleportTo: ; 4c89
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
More movement stuff
2015-12-29 18:15:58 +00:00
dw .InitWait
dw .DoWait
dw .InitDescent
dw .DoDescent
dw .InitFinalSpin
dw .DoFinalSpin
dw .FinishStep
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4c9a
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.InitWait:
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_00
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
More movement stuff
2015-12-29 18:15:58 +00:00
ld [hl], 16
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4caa
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.DoWait:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.InitDescent:
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld hl, OBJECT_STEP_FRAME
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_31
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
More movement stuff
2015-12-29 18:15:58 +00:00
ld [hl], 16
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4cc9
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.DoDescent:
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_SPIN
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_31
add hl, bc
inc [hl]
ld a, [hl]
ld d, $60
call Sine
ld a, h
sub $60
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], a
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.InitFinalSpin:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
More movement stuff
2015-12-29 18:15:58 +00:00
ld [hl], 16
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4cf5
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.DoFinalSpin:
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_SPIN
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.FinishStep:
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld hl, OBJECT_STEP_FRAME
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4d14
Movement etc.
2015-12-17 20:14:51 +00:00
Skyfall: ; 4d14
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
More movement stuff
2015-12-29 18:15:58 +00:00
dw .Init
dw .Step
dw .Fall
dw .Finish
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4d1f
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Init:
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_00
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
More movement stuff
2015-12-29 18:15:58 +00:00
ld [hl], 16
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Step:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_STEP
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld hl, OBJECT_STEP_FRAME
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_31
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
More movement stuff
2015-12-29 18:15:58 +00:00
ld [hl], 16
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Fall:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_31
add hl, bc
inc [hl]
ld a, [hl]
ld d, $60
call Sine
ld a, h
sub $60
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], a
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Finish:
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld hl, OBJECT_STEP_FRAME
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4d7e
Movement etc.
2015-12-17 20:14:51 +00:00
GotBiteStep: ; 4d7e
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
More movement stuff
2015-12-29 18:15:58 +00:00
dw .Init
dw .Run
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4d85
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Init:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 8
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
call IncrementObjectStructField28
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Run:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld a, [hl]
xor 1
ld [hl], a
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4daf
Movement etc.
2015-12-17 20:14:51 +00:00
RockSmashStep: ; 4daf
More movement stuff
2015-12-29 18:15:58 +00:00
call .Step
jp WaitStep_InPlace
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4db5
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Step:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000001
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld a, OBJECT_ACTION_STAND
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .yes
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld a, OBJECT_ACTION_00
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.yes
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
ret
; 4dc8
Movement etc.
2015-12-17 20:14:51 +00:00
ReturnDigStep: ; 4dc8
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000001
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld a, OBJECT_ACTION_SPIN
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .yes
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld a, OBJECT_ACTION_SPIN_FLICKER
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.yes
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
More movement stuff
2015-12-29 18:15:58 +00:00
jp WaitStep_InPlace
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4ddd
More movement stuff
2015-12-29 18:15:58 +00:00
StepType03: ; 4ddd
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4df0
More movement stuff
2015-12-29 18:15:58 +00:00
StepType18: ; 4df0
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
Movement etc.
2015-12-17 20:14:51 +00:00
jp DeleteMapObject
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4dff
More movement stuff
2015-12-29 18:15:58 +00:00
StepTypeBump: ; 4dff
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4e0c
More movement stuff
2015-12-29 18:15:58 +00:00
StepType05: ; 4e0c
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
More movement stuff
2015-12-29 18:15:58 +00:00
dw .Reset
dw StepType04
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Reset:
object_struct
2015-11-02 16:15:32 +00:00
call RestoreDefaultMovement
Creation of constants for OBJECT_09 indices
2015-11-13 23:59:49 +00:00
call GetInitialFacing
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_FACING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
More movement stuff
2015-12-29 18:15:58 +00:00
StepType04: ; 4e21
Movement etc.
2015-12-17 20:14:51 +00:00
call MobileFn_4fb2
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4e2b
Movement etc.
2015-12-17 20:14:51 +00:00
NPCStep: ; 4e2b
call MobileFn_4fb2
More map object work
2015-11-14 19:41:47 +00:00
call AddStepVector
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
Movement etc.
2015-12-17 20:14:51 +00:00
call CopyNextCoordsTileToStandingCoordsTile
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4e47
More movement stuff
2015-12-29 18:15:58 +00:00
StepType07: ; 4e47
More map object work
2015-11-14 19:41:47 +00:00
call AddStepVector
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
Movement etc.
2015-12-17 20:14:51 +00:00
call CopyNextCoordsTileToStandingCoordsTile
More map object work
2015-11-14 19:41:47 +00:00
jp RandomStepDuration_Slow
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4e56
Movement etc.
2015-12-17 20:14:51 +00:00
PlayerStep: ; 4e56
Split out map object code.
2015-02-11 22:13:22 +00:00
; AnimateStep?
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
Movement etc.
2015-12-17 20:14:51 +00:00
dw .init
dw .step
Split out map object code.
2015-02-11 22:13:22 +00:00
More movement stuff
2015-12-29 18:15:58 +00:00
.init
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, wPlayerStepFlags
Split out map object code.
2015-02-11 22:13:22 +00:00
set 7, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
More movement stuff
2015-12-29 18:15:58 +00:00
.step
Movement etc.
2015-12-17 20:14:51 +00:00
call UpdatePlayerStep
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, wPlayerStepFlags
Split out map object code.
2015-02-11 22:13:22 +00:00
set 6, [hl]
Movement etc.
2015-12-17 20:14:51 +00:00
call CopyNextCoordsTileToStandingCoordsTile
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4e83
More movement stuff
2015-12-29 18:15:58 +00:00
PlayerOrNPCTurnStep: ; 4e83
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
Movement etc.
2015-12-17 20:14:51 +00:00
dw .init1
dw .step1
dw .init2
dw .step2
Split out map object code.
2015-02-11 22:13:22 +00:00
More movement stuff
2015-12-29 18:15:58 +00:00
.init1
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld hl, OBJECT_STEP_FRAME
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 2
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 2
call IncrementObjectStructField28
More movement stuff
2015-12-29 18:15:58 +00:00
.step1
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
More movement stuff
2015-12-29 18:15:58 +00:00
.init2
Movement etc.
2015-12-17 20:14:51 +00:00
ld hl, OBJECT_29 ; new facing
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_FACING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
ld hl, OBJECT_STEP_DURATION
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], 2
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
More movement stuff
2015-12-29 18:15:58 +00:00
.step2
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4ecd
More movement stuff
2015-12-29 18:15:58 +00:00
StepType0f: ; 4ecd
More map object work
2015-11-14 19:41:47 +00:00
call AddStepVector
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
push bc
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld d, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld e, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_MAP_OBJECT_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
ld b, a
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall CopyDECoordsToMapObject
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
res 2, [hl]
Movement etc.
2015-12-17 20:14:51 +00:00
call CopyNextCoordsTileToStandingCoordsTile
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_DIRECTION_WALKING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4f04
More movement stuff
2015-12-29 18:15:58 +00:00
StepTypeTrackingObject: ; 4f04
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_29
add hl, bc
ld e, [hl]
inc hl
ld d, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_SPRITE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
ld a, [hl]
and a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .nope
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_X
add hl, de
ld a, [hl]
ld hl, OBJECT_SPRITE_X
add hl, bc
ld [hl], a
ld hl, OBJECT_SPRITE_Y
add hl, de
ld a, [hl]
ld hl, OBJECT_SPRITE_Y
add hl, bc
ld [hl], a
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld a, [hl]
and a
ret z
dec [hl]
ret nz
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.nope
Movement etc.
2015-12-17 20:14:51 +00:00
jp DeleteMapObject
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4f33
More movement stuff
2015-12-29 18:15:58 +00:00
StepType14: ; 4f33
StepType15: ; 4f33
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
More movement stuff
2015-12-29 18:15:58 +00:00
dw .Init
dw .Run
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Init:
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
ld hl, OBJECT_29
add hl, bc
ld [hl], a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Run:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_29
add hl, bc
ld d, [hl]
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld a, [wPlayerStepVectorY]
Split out map object code.
2015-02-11 22:13:22 +00:00
sub d
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [wPlayerStepVectorY], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .ok
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hl]
More movement stuff
2015-12-29 18:15:58 +00:00
call .GetSign
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_29
add hl, bc
ld [hl], a
ld d, a
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld a, [wPlayerStepVectorY]
Split out map object code.
2015-02-11 22:13:22 +00:00
add d
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [wPlayerStepVectorY], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
Movement etc.
2015-12-17 20:14:51 +00:00
call DeleteMapObject
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.GetSign:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_30
add hl, bc
and 1
ld a, [hl]
ret z
cpl
inc a
ret
; 4f77
More movement stuff
2015-12-29 18:15:58 +00:00
StepType16: ; 4f77
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable ; ????
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4f7a
More movement stuff
2015-12-29 18:15:58 +00:00
StepType17: ; 4f7a
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
More movement stuff
2015-12-29 18:15:58 +00:00
dw .null
dw .null
dw .null
.null
Split out map object code.
2015-02-11 22:13:22 +00:00
; 4f83
Movement etc.
2015-12-17 20:14:51 +00:00
SkyfallTop: ; 4f83
More map object work
2015-11-14 19:41:47 +00:00
call Object28AnonymousJumptable
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
; anonymous dw
More movement stuff
2015-12-29 18:15:58 +00:00
dw .Init
dw .Run
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Init:
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_ACTION
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld [hl], OBJECT_ACTION_SKYFALL
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], 16
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call IncrementObjectStructField28
Split out map object code.
2015-02-11 22:13:22 +00:00
More movement stuff
2015-12-29 18:15:58 +00:00
.Run:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], $60
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld hl, OBJECT_STEP_FRAME
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], 0
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Movement etc.
2015-12-17 20:14:51 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 4fb2
Movement etc.
2015-12-17 20:14:51 +00:00
MobileFn_4fb2: mobile
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_29
add hl, bc
inc [hl]
ld a, [hl]
srl a
srl a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000111
Split out map object code.
2015-02-11 22:13:22 +00:00
ld l, a
ld h, 0
ld de, .y
add hl, de
ld a, [hl]
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], a
ret
.y ; 4fcd
db 0, -1, -2, -3, -4, -3, -2, -1
; 4fd5
UpdateJumpPosition: ; 4fd5
call GetStepVector
ld a, h
ld hl, OBJECT_31
add hl, bc
ld e, [hl]
add e
ld [hl], a
nop
srl e
ld d, 0
ld hl, .y
add hl, de
ld a, [hl]
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], a
ret
.y ; 4ff0
db -4, -6, -8, -10, -11, -12, -12, -12
db -11, -10, -9, -8, -6, -4, 0, 0
; 5000
object_struct
2015-11-02 16:15:32 +00:00
Function5000: ; unscripted?
More movement stuff
2015-12-29 18:15:58 +00:00
; copy [wPlayerNextMovement] to [wPlayerMovement]
ld a, [wPlayerNextMovement]
ld hl, wPlayerMovement
Split out map object code.
2015-02-11 22:13:22 +00:00
ld [hl], a
Unify step_sleep macro
2016-05-14 16:28:00 +00:00
; load [wPlayerNextMovement] with movement_step_sleep
ld a, movement_step_sleep
More movement stuff
2015-12-29 18:15:58 +00:00
ld [wPlayerNextMovement], a
; recover the previous value of [wPlayerNextMovement]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hl]
ret
; 500e
More movement stuff
2015-12-29 18:15:58 +00:00
GetMovementByte:
object_struct
2015-11-02 16:15:32 +00:00
ld hl, wMovementDataPointer
More movement stuff
2015-12-29 18:15:58 +00:00
call _GetMovementByte
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 5015
Function5015: ; 5015
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld e, [hl]
inc [hl]
ld d, 0
More movement stuff
2015-12-29 18:15:58 +00:00
ld hl, wc2e2
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hli]
ld h, [hl]
ld l, a
add hl, de
ld a, [hl]
ret
; 5026
Function5026: ; 5026
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld e, [hl]
inc [hl]
ld d, 0
ld hl, wc2e6
ld a, [hli]
ld h, [hl]
ld l, a
add hl, de
ld a, [hl]
ret
; 5037
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
_GetMovementObject: ; 5037
ld hl, GetMovementObject
More splits; map setup labels
2015-11-12 04:38:57 +00:00
jp HandleMovementData
Split out map object code.
2015-02-11 22:13:22 +00:00
; 503d
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
GetMovementObject: ; 503d
ld a, [wMovementObject]
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 5041
More splits; map setup labels
2015-11-12 04:38:57 +00:00
HandleMovementData: ; 5041
More movement stuff
2015-12-29 18:15:58 +00:00
call .StorePointer
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
More movement stuff
2015-12-29 18:15:58 +00:00
ld [wMovementByteWasControlSwitch], a
call JumpMovementPointer
Trainer data structure and field move functions Trainer data in map scripts is now a macro-defined structure. Field move functions in main.asm are now nearly completely annotated, with local references. Trailing white space deleted.
2015-07-19 03:45:39 +00:00
call DoMovementFunction
More movement stuff
2015-12-29 18:15:58 +00:00
ld a, [wMovementByteWasControlSwitch]
Split out map object code.
2015-02-11 22:13:22 +00:00
and a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.StorePointer:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, l
object_struct
2015-11-02 16:15:32 +00:00
ld [wMovementPointer], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, h
object_struct
2015-11-02 16:15:32 +00:00
ld [wMovementPointer + 1], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 505e
More movement stuff
2015-12-29 18:15:58 +00:00
JumpMovementPointer: ; 505e
object_struct
2015-11-02 16:15:32 +00:00
ld hl, wMovementPointer
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hli]
ld h, [hl]
ld l, a
Replace ‘jp [hl]’ with ‘jp hl’ The former is arguably misleading (as you don’t access the memory location in hl to retrieve the jump location), and is consequently deprecated in newer versions of rgbds. This fix silences these deprecation warnings.
2017-06-09 21:01:10 +00:00
jp hl
Split out map object code.
2015-02-11 22:13:22 +00:00
; 5065
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ContinueReadingMovement: ; 5065
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld a, 1
More movement stuff
2015-12-29 18:15:58 +00:00
ld [wMovementByteWasControlSwitch], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 506b
Trainer data structure and field move functions Trainer data in map scripts is now a macro-defined structure. Field move functions in main.asm are now nearly completely annotated, with local references. Trailing white space deleted.
2015-07-19 03:45:39 +00:00
DoMovementFunction: ; 506b
Split out map object code.
2015-02-11 22:13:22 +00:00
push af
object_struct
2015-11-02 16:15:32 +00:00
call ApplyMovementToFollower
Split out map object code.
2015-02-11 22:13:22 +00:00
pop af
ld hl, MovementPointers
rst JumpTable
ret
; 5075
INCLUDE "engine/movement.asm"
; 54b8
object_struct
2015-11-02 16:15:32 +00:00
ApplyMovementToFollower: ; 54b8
Split out map object code.
2015-02-11 22:13:22 +00:00
ld e, a
object_struct
2015-11-02 16:15:32 +00:00
ld a, [wObjectFollow_Follower]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp -1
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
object_struct
2015-11-02 16:15:32 +00:00
ld a, [wObjectFollow_Leader]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
object_struct
2015-11-02 16:15:32 +00:00
ld a, [hMapObjectIndexBuffer]
Split out map object code.
2015-02-11 22:13:22 +00:00
cp d
ret nz
ld a, e
Unify step_sleep macro
2016-05-14 16:28:00 +00:00
cp movement_step_sleep
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
More movement stuff
2015-12-29 18:15:58 +00:00
cp movement_step_end
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
More movement stuff
2015-12-29 18:15:58 +00:00
cp movement_step_4b
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
More movement stuff
2015-12-29 18:15:58 +00:00
cp movement_step_bump
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
Unify directional movement macros
2016-05-14 17:46:14 +00:00
cp movement_slow_step
Split out map object code.
2015-02-11 22:13:22 +00:00
ret c
push af
More movement stuff
2015-12-29 18:15:58 +00:00
ld hl, wFollowerMovementQueueLength
Split out map object code.
2015-02-11 22:13:22 +00:00
inc [hl]
ld e, [hl]
ld d, 0
More movement stuff
2015-12-29 18:15:58 +00:00
ld hl, wFollowMovementQueue
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
pop af
ld [hl], a
ret
; 54e6
More movement stuff
2015-12-29 18:15:58 +00:00
GetFollowerNextMovementByte: ; 54e6
ld hl, wFollowerMovementQueueLength
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hl]
and a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .done
cp -1
jr z, .done
Split out map object code.
2015-02-11 22:13:22 +00:00
dec [hl]
ld e, a
ld d, 0
More movement stuff
2015-12-29 18:15:58 +00:00
ld hl, wFollowMovementQueue
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
inc e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld a, -1
.loop
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, [hl]
ld [hld], a
ld a, d
dec e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.done
More movement stuff
2015-12-29 18:15:58 +00:00
call .CancelFollowIfLeaderMissing
Split out map object code.
2015-02-11 22:13:22 +00:00
ret c
Unify step_sleep macro
2016-05-14 16:28:00 +00:00
ld a, movement_step_sleep
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.CancelFollowIfLeaderMissing:
object_struct
2015-11-02 16:15:32 +00:00
ld a, [wObjectFollow_Leader]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp -1
jr z, .nope
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call GetObjectStruct
ld hl, OBJECT_SPRITE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
pop bc
and a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .nope
Split out map object code.
2015-02-11 22:13:22 +00:00
and a
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.nope
More movement stuff
2015-12-29 18:15:58 +00:00
ld a, -1
object_struct
2015-11-02 16:15:32 +00:00
ld [wObjectFollow_Follower], a
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld a, movement_step_end
Split out map object code.
2015-02-11 22:13:22 +00:00
scf
ret
; 5529
More map object work
2015-11-14 19:41:47 +00:00
SpawnShadow: ; 5529
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
More map object work
2015-11-14 19:41:47 +00:00
ld de, .ShadowObject
call CopyTempObjectData
call InitTempObject
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.ShadowObject:
More map object work
2015-11-14 19:41:47 +00:00
; vtile, palette, movement
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SHADOW
Split out map object code.
2015-02-11 22:13:22 +00:00
; 5538
More map object work
2015-11-14 19:41:47 +00:00
SpawnStrengthBoulderDust: ; 5538
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
More map object work
2015-11-14 19:41:47 +00:00
ld de, .BoulderDustObject
call CopyTempObjectData
call InitTempObject
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.BoulderDustObject:
More map object work
2015-11-14 19:41:47 +00:00
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_BOULDERDUST
Split out map object code.
2015-02-11 22:13:22 +00:00
; 5547
More map object work
2015-11-14 19:41:47 +00:00
SpawnEmote: ; 5547
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
More map object work
2015-11-14 19:41:47 +00:00
ld de, .EmoteObject
call CopyTempObjectData
call InitTempObject
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.EmoteObject:
More map object work
2015-11-14 19:41:47 +00:00
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_EMOTE
Split out map object code.
2015-02-11 22:13:22 +00:00
; 5556
More map object work
2015-11-14 19:41:47 +00:00
ShakeGrass: ; 5556
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
ld de, .data_5562
More map object work
2015-11-14 19:41:47 +00:00
call CopyTempObjectData
call InitTempObject
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
ret
.data_5562
More map object work
2015-11-14 19:41:47 +00:00
db $00, PAL_OW_TREE, SPRITEMOVEDATA_GRASS
Split out map object code.
2015-02-11 22:13:22 +00:00
; 5565
More map object work
2015-11-14 19:41:47 +00:00
ShakeScreen: ; 5565
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
push af
More map object work
2015-11-14 19:41:47 +00:00
ld de, .ScreenShakeObject
call CopyTempObjectData
Split out map object code.
2015-02-11 22:13:22 +00:00
pop af
More map object work
2015-11-14 19:41:47 +00:00
ld [wTempObjectCopyRange], a
call InitTempObject
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.ScreenShakeObject:
More map object work
2015-11-14 19:41:47 +00:00
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE
Split out map object code.
2015-02-11 22:13:22 +00:00
; 5579
More map object work
2015-11-14 19:41:47 +00:00
DespawnEmote: ; 5579
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
object_struct
2015-11-02 16:15:32 +00:00
ld a, [hMapObjectIndexBuffer]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld c, a
More map object work
2015-11-14 19:41:47 +00:00
call .DeleteEmote
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.DeleteEmote:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld de, ObjectStructs
Name some map event reading functions.
2015-07-26 07:11:33 +00:00
ld a, NUM_OBJECT_STRUCTS
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
Split out map object code.
2015-02-11 22:13:22 +00:00
push af
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS1
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
bit EMOTE_OBJECT, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .next
ld hl, OBJECT_SPRITE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
ld a, [hl]
and a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .next
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
xor a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld bc, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
call ByteFill
pop bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.next
ld hl, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
ld d, h
ld e, l
pop af
dec a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 55ac
More map object work
2015-11-14 19:41:47 +00:00
InitTempObject: ; 55ac
SPRITEMOVEDATA
2015-11-01 01:05:02 +00:00
call FindFirstEmptyObjectStruct
Split out map object code.
2015-02-11 22:13:22 +00:00
ret nc
ld d, h
ld e, l
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall CopyTempObjectToObjectStruct
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 55b9
More map object work
2015-11-14 19:41:47 +00:00
CopyTempObjectData: ; 55b9
; load into wTempObjectCopy:
; -1, -1, [de], [de + 1], [de + 2], [hMapObjectIndexBuffer], [NextMapX], [NextMapY], -1
; This spawns the object at the same place as whichever object is loaded into bc.
ld hl, wTempObjectCopyMapObjectIndex
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], -1
Split out map object code.
2015-02-11 22:13:22 +00:00
inc hl
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], -1
Split out map object code.
2015-02-11 22:13:22 +00:00
inc hl
ld a, [de]
inc de
ld [hli], a
ld a, [de]
inc de
ld [hli], a
ld a, [de]
ld [hli], a
object_struct
2015-11-02 16:15:32 +00:00
ld a, [hMapObjectIndexBuffer]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld [hli], a
push hl
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld d, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld e, [hl]
pop hl
ld [hl], d
inc hl
ld [hl], e
inc hl
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], -1
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 55e0
Function55e0:: ; 55e0
ld a, [VramState]
bit 0, a
ret z
ld bc, ObjectStructs
xor a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
object_struct
2015-11-02 16:15:32 +00:00
ld [hMapObjectIndexBuffer], a
HDMA transfer functions
2016-05-05 02:34:09 +00:00
call DoesObjectHaveASprite
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .ok
Split out map object code.
2015-02-11 22:13:22 +00:00
call Function565c
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
ld hl, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
object_struct
2015-11-02 16:15:32 +00:00
ld a, [hMapObjectIndexBuffer]
Split out map object code.
2015-02-11 22:13:22 +00:00
inc a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp NUM_OBJECT_STRUCTS
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 5602
Movement constants, script stack
2015-11-16 16:53:26 +00:00
Function5602: ; 5602, called at battle start
call Function5645 ; clear sprites
ld a, PLAYER
call Function5629 ; respawn player
Rename several script commands
2015-11-25 15:16:29 +00:00
ld a, [wBattleScriptFlags]
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 7, a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .ok
Add constants for common map object ids.
2015-07-22 06:49:18 +00:00
ld a, [hLastTalked]
Split out map object code.
2015-02-11 22:13:22 +00:00
and a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .ok
Movement constants, script stack
2015-11-16 16:53:26 +00:00
call Function5629 ; respawn opponent
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
call _UpdateSprites
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 561d
Function561d: ; 561d
Movement constants, script stack
2015-11-16 16:53:26 +00:00
call Function5645 ; clear sprites
ld a, PLAYER
call Function5629 ; respawn player
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
call _UpdateSprites
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 5629
Function5629: ; 5629
Name some map event reading functions.
2015-07-26 07:11:33 +00:00
cp NUM_OBJECTS
Split out map object code.
2015-02-11 22:13:22 +00:00
ret nc
call GetMapObject
Updated signpost items and person_event flags
2015-07-18 19:46:38 +00:00
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
Finished the decoration attributes table Interpretation of the Decoration Attributes table is complete. Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
2015-07-19 08:58:31 +00:00
cp -1
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
Name some map event reading functions.
2015-07-26 07:11:33 +00:00
cp NUM_OBJECT_STRUCTS
Split out map object code.
2015-02-11 22:13:22 +00:00
ret nc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call GetObjectStruct
HDMA transfer functions
2016-05-05 02:34:09 +00:00
call DoesObjectHaveASprite
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
call Function5673
ret
; 5645
Function5645: ; 5645
xor a
ld bc, ObjectStructs
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
object_struct
2015-11-02 16:15:32 +00:00
ld [hMapObjectIndexBuffer], a
Movement constants, script stack
2015-11-16 16:53:26 +00:00
call SetFacing_Standing
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
object_struct
2015-11-02 16:15:32 +00:00
ld a, [hMapObjectIndexBuffer]
Split out map object code.
2015-02-11 22:13:22 +00:00
inc a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp NUM_OBJECT_STRUCTS
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 565c
Function565c: ; 565c
push bc
call Function56cd
pop bc
Movement constants, script stack
2015-11-16 16:53:26 +00:00
jr c, SetFacing_Standing
Split out map object code.
2015-02-11 22:13:22 +00:00
call Function56a3
Movement constants, script stack
2015-11-16 16:53:26 +00:00
jr c, SetFacing_Standing
Split out map object code.
2015-02-11 22:13:22 +00:00
call Function5688
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall Function4440
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
ret
; 5673
Function5673: ; 5673
call Function56a3
Movement constants, script stack
2015-11-16 16:53:26 +00:00
jr c, SetFacing_Standing
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall Function4440 ; no need to farcall
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
ret
; 5680
Movement constants, script stack
2015-11-16 16:53:26 +00:00
SetFacing_Standing: ; 5680
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_FACING_STEP
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld [hl], STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
scf
ret
; 5688
Function5688: ; 5688
push bc
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld d, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld e, [hl]
sprite engine; tileset constants
2015-11-13 05:49:27 +00:00
call GetCoordTile
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_NEXT_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall UpdateTallGrassFlags ; no need to farcall
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 56a3
Function56a3: ; 56a3
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_X
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld d, [hl]
More map object work
2015-11-14 19:41:47 +00:00
ld hl, OBJECT_NEXT_MAP_Y
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld e, [hl]
inc d
inc e
ld a, [XCoord]
cp d
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .equal_x
jr nc, .nope
Split out map object code.
2015-02-11 22:13:22 +00:00
add $b
cp d
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .nope
.equal_x
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [YCoord]
cp e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .equal_y
jr nc, .nope
Split out map object code.
2015-02-11 22:13:22 +00:00
add $a
cp e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .nope
.equal_y
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.nope
Split out map object code.
2015-02-11 22:13:22 +00:00
scf
ret
; 56cd
Function56cd: ; 56cd
HDMA transfer functions
2016-05-05 02:34:09 +00:00
ld a, [wPlayerBGMapOffsetX]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
ld hl, OBJECT_SPRITE_X_OFFSET
add hl, bc
ld a, [hl]
ld hl, OBJECT_SPRITE_X
add hl, bc
add [hl]
add d
cp $f0
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nc, .ok1
Split out map object code.
2015-02-11 22:13:22 +00:00
cp $a0
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jp nc, .nope
.ok1
and %00000111
ld d, 2
cp 4
jr c, .ok2
ld d, 3
.ok2
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hl]
srl a
srl a
srl a
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
cp SCREEN_WIDTH
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .ok3
Split out map object code.
2015-02-11 22:13:22 +00:00
sub $20
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok3
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld [hUsedSpriteIndex], a
HDMA transfer functions
2016-05-05 02:34:09 +00:00
ld a, [wPlayerBGMapOffsetY]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld e, a
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld a, [hl]
ld hl, OBJECT_SPRITE_Y
add hl, bc
add [hl]
add e
cp $f0
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nc, .ok4
Split out map object code.
2015-02-11 22:13:22 +00:00
cp $90
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nc, .nope
.ok4
and %00000111
ld e, 2
cp 4
jr c, .ok5
ld e, 3
.ok5
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hl]
srl a
srl a
srl a
cp $12
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .ok6
Split out map object code.
2015-02-11 22:13:22 +00:00
sub $20
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok6
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld [hUsedSpriteTile], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_PALETTE
add hl, bc
bit 7, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .ok7
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, d
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
add 2
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
ld a, e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
add 2
Split out map object code.
2015-02-11 22:13:22 +00:00
ld e, a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok7
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, d
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld [hFFBF], a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld a, [hFFBF]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld a, [hUsedSpriteTile]
Split out map object code.
2015-02-11 22:13:22 +00:00
add e
dec a
cp $12
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nc, .ok9
Split out map object code.
2015-02-11 22:13:22 +00:00
ld b, a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.next
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld a, [hUsedSpriteIndex]
Split out map object code.
2015-02-11 22:13:22 +00:00
add d
dec a
cp $14
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nc, .ok8
Split out map object code.
2015-02-11 22:13:22 +00:00
ld c, a
push bc
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 21:53:37 +00:00
call Coord2Tile
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
ld a, [hl]
cp $60
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nc, .nope
.ok8
Split out map object code.
2015-02-11 22:13:22 +00:00
dec d
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .next
.ok9
Split out map object code.
2015-02-11 22:13:22 +00:00
dec e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
and a
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.nope
Split out map object code.
2015-02-11 22:13:22 +00:00
scf
ret
; 576a
more gfx-related labels
2016-01-04 13:43:55 +00:00
HandleNPCStep:: ; 576a
Movement etc.
2015-12-17 20:14:51 +00:00
call .ResetStepVector
more gfx-related labels
2016-01-04 13:43:55 +00:00
call .DoStepsForAllObjects
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.ResetStepVector:
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [wPlayerStepVectorX], a
ld [wPlayerStepVectorY], a
ld [wPlayerStepFlags], a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld a, -1
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [wPlayerStepDirection], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.DoStepsForAllObjects:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld bc, ObjectStructs
xor a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
object_struct
2015-11-02 16:15:32 +00:00
ld [hMapObjectIndexBuffer], a
HDMA transfer functions
2016-05-05 02:34:09 +00:00
call DoesObjectHaveASprite
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .next
Split out map object code.
2015-02-11 22:13:22 +00:00
call Function437b
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.next
ld hl, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
object_struct
2015-11-02 16:15:32 +00:00
ld a, [hMapObjectIndexBuffer]
Split out map object code.
2015-02-11 22:13:22 +00:00
inc a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp NUM_OBJECT_STRUCTS
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 579d
more gfx-related labels
2016-01-04 13:43:55 +00:00
RefreshPlayerSprite: ; 579d
Unify step_sleep macro
2016-05-14 16:28:00 +00:00
ld a, movement_step_sleep
More movement stuff
2015-12-29 18:15:58 +00:00
ld [wPlayerNextMovement], a
ld [wPlayerMovement], a
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
Unify directional movement macros
2016-05-14 17:46:14 +00:00
ld [wPlayerTurningDirection], a
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld [PlayerObjectStepFrame], a
more gfx-related labels
2016-01-04 13:43:55 +00:00
call .TryResetPlayerAction
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall CheckWarpFacingDown
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 07:51:52 +00:00
call c, SpawnInFacingDown
more gfx-related labels
2016-01-04 13:43:55 +00:00
call .SpawnInCustomFacing
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 57bc
more gfx-related labels
2016-01-04 13:43:55 +00:00
.TryResetPlayerAction: ; 57bc
About time I got to these functions
2015-10-24 14:34:19 +00:00
ld hl, wPlayerSpriteSetupFlags
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 7, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .ok
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
Renaming: (fix #412) - MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 18:46:34 +00:00
ld a, OBJECT_ACTION_00
Split out map object code.
2015-02-11 22:13:22 +00:00
ld [PlayerAction], a
ret
; 57ca
more gfx-related labels
2016-01-04 13:43:55 +00:00
.SpawnInCustomFacing: ; 57ca
About time I got to these functions
2015-10-24 14:34:19 +00:00
ld hl, wPlayerSpriteSetupFlags
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 5, [hl]
ret z
About time I got to these functions
2015-10-24 14:34:19 +00:00
ld a, [wPlayerSpriteSetupFlags]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and 3
Split out map object code.
2015-02-11 22:13:22 +00:00
add a
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
add a
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
jr ContinueSpawnFacing
Split out map object code.
2015-02-11 22:13:22 +00:00
; 57d9
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 07:51:52 +00:00
SpawnInFacingDown: ; 57d9
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld a, 0
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ContinueSpawnFacing: ; 57db
Split out map object code.
2015-02-11 22:13:22 +00:00
ld bc, PlayerStruct
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call SetSpriteDirection
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 57e2
Phone scripts and specials
2015-11-17 17:29:37 +00:00
SetPlayerPalette: ; 57e2
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, d
object_struct
2015-11-02 16:15:32 +00:00
and %10000000
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
No more NONE
2015-11-02 19:37:02 +00:00
ld bc, 0 ; debug?
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_FACING
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
or d
ld [hl], a
ld a, d
swap a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000111
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
ld bc, PlayerStruct
ld hl, OBJECT_PALETTE
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %11111000
Split out map object code.
2015-02-11 22:13:22 +00:00
or d
ld [hl], a
ret
; 5803
object_struct
2015-11-02 16:15:32 +00:00
StartFollow:: ; 5803
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
ld a, b
object_struct
2015-11-02 16:15:32 +00:00
call SetLeaderIfVisible
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
ret c
ld a, c
object_struct
2015-11-02 16:15:32 +00:00
call SetFollowerIfVisible
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall QueueFollowerFirstStep
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 5815
object_struct
2015-11-02 16:15:32 +00:00
SetLeaderIfVisible: ; 5815
call CheckObjectVisibility
Split out map object code.
2015-02-11 22:13:22 +00:00
ret c
object_struct
2015-11-02 16:15:32 +00:00
ld a, [hObjectStructIndexBuffer]
ld [wObjectFollow_Leader], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 581f
object_struct
2015-11-02 16:15:32 +00:00
StopFollow:: ; 581f
call ResetLeader
call ResetFollower
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 5826
object_struct
2015-11-02 16:15:32 +00:00
ResetLeader: ; 5826
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld a, -1
object_struct
2015-11-02 16:15:32 +00:00
ld [wObjectFollow_Leader], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 582c
object_struct
2015-11-02 16:15:32 +00:00
SetFollowerIfVisible: ; 582c
Split out map object code.
2015-02-11 22:13:22 +00:00
push af
object_struct
2015-11-02 16:15:32 +00:00
call ResetFollower
Split out map object code.
2015-02-11 22:13:22 +00:00
pop af
object_struct
2015-11-02 16:15:32 +00:00
call CheckObjectVisibility
Split out map object code.
2015-02-11 22:13:22 +00:00
ret c
object_struct
2015-11-02 16:15:32 +00:00
ld hl, OBJECT_MOVEMENTTYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
Sprite movement function labels
2015-11-06 21:42:38 +00:00
ld [hl], SPRITEMOVEDATA_FOLLOWING
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_00
object_struct
2015-11-02 16:15:32 +00:00
ld a, [hObjectStructIndexBuffer]
ld [wObjectFollow_Follower], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 5847
object_struct
2015-11-02 16:15:32 +00:00
ResetFollower: ; 5847
ld a, [wObjectFollow_Follower]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp -1
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call GetObjectStruct
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall Function58e3 ; no need to bankswitch
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld a, -1
object_struct
2015-11-02 16:15:32 +00:00
ld [wObjectFollow_Follower], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 585c
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
SetFlagsForMovement_1:: ; 585c
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, c
object_struct
2015-11-02 16:15:32 +00:00
call CheckObjectVisibility
Split out map object code.
2015-02-11 22:13:22 +00:00
ret c
push bc
call Function587a
pop bc
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
res 5, [hl]
xor a
ret
; 586e
Function586e: ; 586e
object_struct
2015-11-02 16:15:32 +00:00
call CheckObjectVisibility
Split out map object code.
2015-02-11 22:13:22 +00:00
ret c
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
set 5, [hl]
xor a
ret
; 587a
Function587a: ; 587a
ld bc, ObjectStructs
xor a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
Split out map object code.
2015-02-11 22:13:22 +00:00
push af
HDMA transfer functions
2016-05-05 02:34:09 +00:00
call DoesObjectHaveASprite
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .next
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
set 5, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.next
ld hl, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
pop af
inc a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp NUM_OBJECT_STRUCTS
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 5897
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
_SetFlagsForMovement_2:: ; 5897
object_struct
2015-11-02 16:15:32 +00:00
ld a, [wObjectFollow_Leader]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp -1
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
push bc
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call GetObjectStruct
ld hl, OBJECT_MAP_OBJECT_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
pop bc
cp c
ret nz
object_struct
2015-11-02 16:15:32 +00:00
ld a, [wObjectFollow_Follower]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp -1
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
call GetObjectStruct
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
res 5, [hl]
ret
; 58b9
Function58b9:: ; 58b9
push bc
ld bc, ObjectStructs
xor a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
Split out map object code.
2015-02-11 22:13:22 +00:00
push af
HDMA transfer functions
2016-05-05 02:34:09 +00:00
call DoesObjectHaveASprite
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .next
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
res 5, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.next
ld hl, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
pop af
inc a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp NUM_OBJECT_STRUCTS
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
ret
; 58d8
Function58d8: ; 58d8
object_struct
2015-11-02 16:15:32 +00:00
call CheckObjectVisibility
Split out map object code.
2015-02-11 22:13:22 +00:00
ret c
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
res 5, [hl]
ret
; 58e3
Function58e3: ; 58e3
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_MAP_OBJECT_INDEX
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp -1
More splits; map setup labels
2015-11-12 04:38:57 +00:00
jp z, Function5903 ; a jr would have been appropriate here
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
call GetMapObject
Reworked person_event arguments
2015-07-29 22:22:23 +00:00
ld hl, MAPOBJECT_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
pop bc
object_struct
2015-11-02 16:15:32 +00:00
ld hl, OBJECT_MOVEMENTTYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_00
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 5903
Function5903: ; 5903
call GetSpriteDirection
rrca
rrca
ld e, a
ld d, 0
SPRITEMOVEDATA
2015-11-01 01:05:02 +00:00
ld hl, .standing_movefns
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
ld a, [hl]
object_struct
2015-11-02 16:15:32 +00:00
ld hl, OBJECT_MOVEMENTTYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, OBJECT_STEP_TYPE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld [hl], STEP_TYPE_00
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
SPRITEMOVEDATA
2015-11-01 01:05:02 +00:00
.standing_movefns
db SPRITEMOVEDATA_STANDING_DOWN
db SPRITEMOVEDATA_STANDING_UP
db SPRITEMOVEDATA_STANDING_LEFT
db SPRITEMOVEDATA_STANDING_RIGHT
Split out map object code.
2015-02-11 22:13:22 +00:00
; 5920
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
_UpdateSprites:: ; 5920
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [VramState]
bit 0, a
ret z
xor a
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld [hUsedSpriteIndex], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hOAMUpdate]
push af
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld a, 1
Split out map object code.
2015-02-11 22:13:22 +00:00
ld [hOAMUpdate], a
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
call InitSprites
call .fill
Split out map object code.
2015-02-11 22:13:22 +00:00
pop af
ld [hOAMUpdate], a
ret
More movement stuff
2015-12-29 18:15:58 +00:00
.fill
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [VramState]
bit 1, a
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 18:40:10 +00:00
ld b, LOW(SpritesEnd)
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .ok
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld b, 28 * 4
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld a, [hUsedSpriteIndex]
Split out map object code.
2015-02-11 22:13:22 +00:00
cp b
ret nc
ld l, a
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 18:40:10 +00:00
ld h, HIGH(Sprites)
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld de, 4
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, b
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld c, SCREEN_HEIGHT_PX + 16
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
Split out map object code.
2015-02-11 22:13:22 +00:00
ld [hl], c
add hl, de
cp l
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
; 5958
HDMA transfer functions
2016-05-05 02:34:09 +00:00
ApplyBGMapAnchorToObjects: ; 5958
Split out map object code.
2015-02-11 22:13:22 +00:00
push hl
push de
push bc
HDMA transfer functions
2016-05-05 02:34:09 +00:00
ld a, [wPlayerBGMapOffsetX]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
HDMA transfer functions
2016-05-05 02:34:09 +00:00
ld a, [wPlayerBGMapOffsetY]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld e, a
ld bc, ObjectStructs
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld a, NUM_OBJECT_STRUCTS
.loop
Split out map object code.
2015-02-11 22:13:22 +00:00
push af
HDMA transfer functions
2016-05-05 02:34:09 +00:00
call DoesObjectHaveASprite
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .skip
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_X
add hl, bc
ld a, [hl]
add d
ld [hl], a
ld hl, OBJECT_SPRITE_Y
add hl, bc
ld a, [hl]
add e
ld [hl], a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.skip
ld hl, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
pop af
dec a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .loop
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
HDMA transfer functions
2016-05-05 02:34:09 +00:00
ld [wPlayerBGMapOffsetX], a
ld [wPlayerBGMapOffsetY], a
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
pop de
pop hl
ret
; 5991
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
InitSprites: ; 5991
PRIORITY_LOW EQU $10
PRIORITY_NORM EQU $20
PRIORITY_HIGH EQU $30
call .DeterminePriorities
ld c, PRIORITY_HIGH
call .InitSpritesByPriority
ld c, PRIORITY_NORM
call .InitSpritesByPriority
ld c, PRIORITY_LOW
call .InitSpritesByPriority
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.DeterminePriorities:
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
More movement stuff
2015-12-29 18:15:58 +00:00
ld hl, wMovementPointer
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld bc, NUM_OBJECT_STRUCTS
Split out map object code.
2015-02-11 22:13:22 +00:00
call ByteFill
ld d, 0
ld bc, ObjectStructs
More movement stuff
2015-12-29 18:15:58 +00:00
ld hl, wMovementPointer
Split out map object code.
2015-02-11 22:13:22 +00:00
.loop
push hl
HDMA transfer functions
2016-05-05 02:34:09 +00:00
call DoesObjectHaveASprite
Split out map object code.
2015-02-11 22:13:22 +00:00
jr z, .skip
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_FACING_STEP
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
cp STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
jr z, .skip
; Define the sprite priority.
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld e, PRIORITY_LOW
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
bit 0, [hl]
jr nz, .add
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld e, PRIORITY_NORM
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 1, [hl]
jr z, .add
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld e, PRIORITY_HIGH
Split out map object code.
2015-02-11 22:13:22 +00:00
jr .add
.skip
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
pop hl
jr .next
.add
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_STRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
pop hl
ld a, d
or e
ld [hli], a
.next
inc d
ld a, d
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp NUM_OBJECT_STRUCTS
Split out map object code.
2015-02-11 22:13:22 +00:00
jr nz, .loop
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.InitSpritesByPriority:
object_struct
2015-11-02 16:15:32 +00:00
ld hl, wMovementPointer
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
.next_sprite
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hli]
ld d, a
More splits; map setup labels
2015-11-12 04:38:57 +00:00
and $f0
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
cp c
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
jr nz, .next_sprite
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
push hl
ld a, d
More splits; map setup labels
2015-11-12 04:38:57 +00:00
and $f
call .GetObjectStructPointer
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
call .InitSprite
Split out map object code.
2015-02-11 22:13:22 +00:00
pop hl
pop bc
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
jr .next_sprite
Split out map object code.
2015-02-11 22:13:22 +00:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.InitSprite:
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_SPRITE_TILE
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %01111111
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld [hFFC1], a
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
bit 7, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nz, .skip1
or %00001000
.skip1
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-30 03:32:11 +00:00
ld hl, OBJECT_FLAGS2
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld e, [hl]
bit 7, e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .skip2
or %10000000
.skip2
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 4, e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .skip3
or %00010000
.skip3
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_PALETTE
add hl, bc
ld d, a
ld a, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000111
Split out map object code.
2015-02-11 22:13:22 +00:00
or d
ld d, a
xor a
bit 3, e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .skip4
or %10000000
.skip4
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld [hFFC2], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_X
add hl, bc
ld a, [hl]
ld hl, OBJECT_SPRITE_X_OFFSET
add hl, bc
add [hl]
add 8
ld e, a
HDMA transfer functions
2016-05-05 02:34:09 +00:00
ld a, [wPlayerBGMapOffsetX]
Split out map object code.
2015-02-11 22:13:22 +00:00
add e
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld [hFFBF], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_SPRITE_Y
add hl, bc
ld a, [hl]
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
add [hl]
add 12
ld e, a
HDMA transfer functions
2016-05-05 02:34:09 +00:00
ld a, [wPlayerBGMapOffsetY]
Split out map object code.
2015-02-11 22:13:22 +00:00
add e
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld [hFFC0], a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld hl, OBJECT_FACING_STEP
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
More map object work
2015-11-14 19:41:47 +00:00
cp STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
jp z, .done
cp NUM_FACINGS
jp nc, .done
ld l, a
ld h, 0
add hl, hl
ld bc, Facings
add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld a, [hUsedSpriteIndex]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld c, a
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 18:40:10 +00:00
ld b, HIGH(Sprites)
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hli]
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld [hUsedSpriteTile], a
Split out map object code.
2015-02-11 22:13:22 +00:00
add c
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 18:40:10 +00:00
cp LOW(SpritesEnd)
Split out map object code.
2015-02-11 22:13:22 +00:00
jr nc, .full
.addsprite
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld a, [hFFC0]
Split out map object code.
2015-02-11 22:13:22 +00:00
add [hl]
inc hl
ld [bc], a
inc c
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld a, [hFFBF]
Split out map object code.
2015-02-11 22:13:22 +00:00
add [hl]
inc hl
ld [bc], a
inc c
ld e, [hl]
inc hl
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld a, [hFFC1]
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 2, e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .nope1
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.nope1
Split out map object code.
2015-02-11 22:13:22 +00:00
add [hl]
inc hl
ld [bc], a
inc c
ld a, e
bit 1, a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .nope2
More splits; map setup labels
2015-11-12 04:38:57 +00:00
ld a, [hFFC2]
Split out map object code.
2015-02-11 22:13:22 +00:00
or e
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.nope2
and %11110000
Split out map object code.
2015-02-11 22:13:22 +00:00
or d
ld [bc], a
inc c
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld a, [hUsedSpriteTile]
Split out map object code.
2015-02-11 22:13:22 +00:00
dec a
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld [hUsedSpriteTile], a
Split out map object code.
2015-02-11 22:13:22 +00:00
jr nz, .addsprite
ld a, c
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 14:38:48 +00:00
ld [hUsedSpriteIndex], a
Split out map object code.
2015-02-11 22:13:22 +00:00
.done
xor a
ret
.full
scf
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.GetObjectStructPointer:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld c, a
ld b, 0
ld hl, .Addresses
More movement stuff
2015-12-29 18:15:58 +00:00
add hl, bc
add hl, bc
Split out map object code.
2015-02-11 22:13:22 +00:00
ld c, [hl]
inc hl
ld b, [hl]
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 18:42:14 +00:00
.Addresses: ; 5ace
Split out map object code.
2015-02-11 22:13:22 +00:00
dw PlayerStruct
object_struct
2015-11-02 16:15:32 +00:00
dw Object1Struct
dw Object2Struct
dw Object3Struct
dw Object4Struct
dw Object5Struct
dw Object6Struct
dw Object7Struct
dw Object8Struct
dw Object9Struct
dw Object10Struct
dw Object11Struct
dw Object12Struct
Split out map object code.
2015-02-11 22:13:22 +00:00
; 5ae8