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

3045 lines
48 KiB
NASM
Raw Normal View History

Group some mutually edited files in data/sprites/
2018-01-10 23:10:01 +00:00
INCLUDE "data/sprites/facings.asm"
Split out map object code.
2015-02-11 22:13:22 +00:00
Group some mutually edited files in data/sprites/
2018-01-10 23:10:01 +00:00
INCLUDE "data/sprites/map_objects.asm"
Further decoding of SpriteMovementData
2015-11-16 05:52:53 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
DeleteMapObject::
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
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld bc, OBJECT_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
Identify more unnamed labels
2020-10-05 20:15:57 +00:00
HandleObjectStep:
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
call CheckObjectStillVisible
Split out map object code.
2015-02-11 22:13:22 +00:00
ret c
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
call HandleStepType
call HandleObjectAction
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
res OBJ_FLAGS2_6, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wXCoord]
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wYCoord]
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
set OBJ_FLAGS2_6, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wXCoord]
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wYCoord]
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Identify more sprite move data flag bits
2018-05-24 02:01:21 +00:00
bit WONT_DELETE_F, [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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
set OBJ_FLAGS2_6, [hl]
Split out map object code.
2015-02-11 22:13:22 +00:00
and a
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
bit FROZEN_F, [hl]
jr nz, .frozen
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
cp STEP_TYPE_FROM_MOVEMENT
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
call StepFunction_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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
bit FROZEN_F, [hl]
jr nz, .frozen
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.one
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
call StepFunction_FromMovement
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
cp STEP_TYPE_FROM_MOVEMENT
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
.frozen
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +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
Use known sprite movement data flag constants
2018-05-23 17:15:07 +00:00
bit INVISIBLE_F, [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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
bit OBJ_FLAGS2_6, [hl]
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
jr nz, SetFacingStanding
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
bit FROZEN_F, [hl]
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
jr nz, _CallFrozenObjectAction
; use first column (normal)
ld de, ObjectActionPairPointers
jr CallObjectAction
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
HandleFrozenObjectAction:
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
Use known sprite movement data flag constants
2018-05-23 17:15:07 +00:00
bit INVISIBLE_F, [hl]
Backup prior to global introduction of PERSONTYPE constants
2015-11-15 19:59:38 +00:00
jr nz, SetFacingStanding
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
_CallFrozenObjectAction:
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
; use second column (frozen)
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld de, ObjectActionPairPointers + 2
jr CallObjectAction ; pointless
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
CallObjectAction:
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
Organize the engine/ directory This is an informed attempt at reorganizing the engine/ directory by creating categorized subdirectories, in order to make it easier to navigate and find things. The directories created are as follows: * engine/game: Contains all "minigames", things like the unown puzzle and slot machine. * engine/gfx: Contains all handling of graphics. From loading palettes to playing animations. * engine/link: Contains all multiplayer functionality. * engine/menu: Contains all generic/misc. menus and menu code. Other, more specialized menus are in their own subdirectories (pokedex, pokegear, party menu, etc). * engine/overworld: Contains all handling of the overworld. From loading and connecting maps to wild encounters and the scripting engine. * engine/pokegear: In the same vein as engine/pokedex, except it could use some more splitting up. * engine/pokemon: Contains everything related to manipulating pokemon data. From the pokemon storage system to evolution and mail. * engine/printer: Contains everything related to printing things as well as the printer communication. * engine/title: Contains intro sequences, title screens and credits.
2018-03-13 12:07:16 +00:00
INCLUDE "engine/overworld/map_object_action.asm"
Split out map object code.
2015-02-11 22:13:22 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CopyNextCoordsTileToStandingCoordsTile:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
CopyStandingCoordsTileToNextCoordsTile:
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
Remove all address comments
2018-06-24 14:09:41 +00:00
UpdateTallGrassFlags:
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
Use known sprite movement data flag constants
2018-05-23 17:15:07 +00:00
bit OVERHEAD_F, [hl]
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
Remove all address comments
2018-06-24 14:09:41 +00:00
SetTallGrassFlags:
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
Use known sprite movement data flag constants
2018-05-23 17:15:07 +00:00
set OVERHEAD_F, [hl]
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
.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
Use known sprite movement data flag constants
2018-05-23 17:15:07 +00:00
res OVERHEAD_F, [hl]
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
UselessAndA:
Split out map object code.
2015-02-11 22:13:22 +00:00
and a
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
EndSpriteMovement:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hli], a ; OBJECT_1C
ld [hli], a ; OBJECT_1D
ld [hl], a ; OBJECT_1E
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
Remove all address comments
2018-06-24 14:09:41 +00:00
InitStep:
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
Use known sprite movement data flag constants
2018-05-23 17:15:07 +00:00
bit FIXED_FACING_F, [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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
GetNextTile:
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
Remove all address comments
2018-06-24 14:09:41 +00:00
AddStepVector:
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
Remove all address comments
2018-06-24 14:09:41 +00:00
GetStepVector:
Split out map object code.
2015-02-11 22:13:22 +00:00
; 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
Remove all address comments
2018-06-24 14:09:41 +00:00
StepVectors:
Split out map object code.
2015-02-11 22:13:22 +00:00
; 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
More constants and data tables
2018-01-11 06:45:27 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
GetStepVectorSign:
Split out map object code.
2015-02-11 22:13:22 +00:00
add a
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ret z ; 0 or 128 (-128)
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, 1
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ret nc ; +1 to +127
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, -1
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ret ; -127 to -1
More constants and data tables
2018-01-11 06:45:27 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
UpdatePlayerStep:
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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
set PLAYERSTEP_CONTINUE_F, [hl]
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
GetMapObjectField: ; 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
Remove all address comments
2018-06-24 14:09:41 +00:00
RestoreDefaultMovement:
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
Misc fixes
2019-08-21 12:43:21 +00:00
ld a, SPRITEMOVEDATA_STANDING_DOWN
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
ObjectMovementByte_ZeroAnonJumptableIndex: ; unreferenced
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
ObjectMovementByte_IncAnonJumptableIndex:
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
ObjectMovementByte_DecAnonJumptableIndex:
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
ObjectMovementByte_AnonJumptable:
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
Field1c_ZeroAnonJumptableIndex:
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1C
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
Field1c_IncAnonJumptableIndex:
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1C
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
inc [hl]
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
Field1c_AnonJumptable:
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1C
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
pop hl
rst JumpTable
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
Field1c_GetAnonJumptableIndex: ; unreferenced
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1C
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld a, [hl]
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
Field1c_SetAnonJumptableIndex: ; unreferenced
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1C
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_Reset:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_FromMovement:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_ZeroAnonJumptableIndex
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
Remove all address comments
2018-06-24 14:09:41 +00:00
.Pointers:
Verify data table sizes with table_width and assert_table_length macros This was discussed in #706 It also uncovered some off-by-one issues with defining some constants. A few structs now use rsreset/_RS to define their offset constants, as discussed in #739
2021-03-04 03:22:41 +00:00
; entries correspond to SPRITEMOVEFN_* constants (see constants/map_object_constants.asm)
table_width 2, StepFunction_FromMovement.Pointers
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
dw MovementFunction_Null ; 00
dw MovementFunction_RandomWalkY ; 01
dw MovementFunction_RandomWalkX ; 02
dw MovementFunction_RandomWalkXY ; 03
dw MovementFunction_RandomSpinSlow ; 04
dw MovementFunction_RandomSpinFast ; 05
dw MovementFunction_Standing ; 06
dw MovementFunction_ObeyDPad ; 07
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
dw MovementFunction_Indexed1 ; 08
dw MovementFunction_Indexed2 ; 09
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
dw MovementFunction_0a ; 0a
dw MovementFunction_0b ; 0b
dw MovementFunction_0c ; 0c
dw MovementFunction_0d ; 0d
dw MovementFunction_0e ; 0e
dw MovementFunction_Follow ; 0f
dw MovementFunction_Script ; 10
dw MovementFunction_Strength ; 11
dw MovementFunction_FollowNotExact ; 12
dw MovementFunction_Shadow ; 13
dw MovementFunction_Emote ; 14
dw MovementFunction_BigStanding ; 15
dw MovementFunction_Bouncing ; 16
dw MovementFunction_ScreenShake ; 17
dw MovementFunction_SpinClockwise ; 18
dw MovementFunction_SpinCounterclockwise ; 19
dw MovementFunction_BoulderDust ; 1a
dw MovementFunction_ShakingGrass ; 1b
Verify data table sizes with table_width and assert_table_length macros This was discussed in #706 It also uncovered some off-by-one issues with defining some constants. A few structs now use rsreset/_RS to define their offset constants, as discussed in #739
2021-03-04 03:22:41 +00:00
assert_table_length NUM_SPRITEMOVEFN
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_Null:
ret
MovementFunction_RandomWalkY:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000001
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
jp _RandomWalkContinue
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_RandomWalkX:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000001
or %00000010
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
jp _RandomWalkContinue
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_RandomWalkXY:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000011
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
jp _RandomWalkContinue
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_RandomSpinSlow:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh 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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_RandomSpinFast:
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
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh 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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_Standing:
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
call CopyStandingCoordsTileToNextCoordsTile
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_RESTORE
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_ObeyDPad:
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld hl, GetPlayerNextMovementByte
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
MovementFunction_Indexed1:
ld hl, GetIndexedMovementByte1
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
MovementFunction_Indexed2:
ld hl, GetIndexedMovementByte2
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_0a:
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_0b:
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_0c:
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_0d:
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld hl, GetPlayerNextMovementByte
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_0e:
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_Strength:
call ObjectMovementByte_AnonJumptable
.anon_dw
dw .start
dw .stop
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
.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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
bit OBJ_FLAGS2_2, [hl]
res OBJ_FLAGS2_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
Function6ec1 → CanObjectMoveInDirection
2018-05-24 16:36:35 +00:00
call CanObjectMoveInDirection
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_STRENGTH_BOULDER
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
call CopyStandingCoordsTileToNextCoordsTile
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call ObjectMovementByte_IncAnonJumptableIndex
.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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_BigStanding:
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
Clarify big doll-related constants (Snorlax and Lapras are symmetrical, Onix is not)
2018-01-31 03:34:05 +00:00
ld [hl], OBJECT_ACTION_BIG_DOLL_SYM
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_Bouncing:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_STANDING
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_SpinCounterclockwise:
call ObjectMovementByte_AnonJumptable
.anon_dw
dw _MovementSpinInit
dw _MovementSpinRepeat
dw _MovementSpinTurnLeft
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_SpinClockwise:
call ObjectMovementByte_AnonJumptable
.anon_dw
dw _MovementSpinInit
dw _MovementSpinRepeat
dw _MovementSpinTurnRight
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
_MovementSpinInit:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call ObjectMovementByte_IncAnonJumptableIndex
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
; fallthrough
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_SLEEP
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call ObjectMovementByte_IncAnonJumptableIndex
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
_MovementSpinTurnLeft:
ld de, .facings_counterclockwise
call _MovementSpinNextFacing
jr MovementFunction_SpinCounterclockwise
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
.facings_counterclockwise:
db OW_RIGHT
db OW_LEFT
db OW_DOWN
db OW_UP
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
_MovementSpinTurnRight:
ld de, .facings_clockwise
call _MovementSpinNextFacing
jr MovementFunction_SpinClockwise
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
.facings_clockwise:
db OW_LEFT
db OW_RIGHT
db OW_UP
db OW_DOWN
Split out map object code.
2015-02-11 22:13:22 +00:00
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call ObjectMovementByte_DecAnonJumptableIndex
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_Shadow:
call InitMovementField1dField1e
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]
Avoid "+- 1" at every maskbits
2018-01-16 22:27:50 +00:00
maskbits NUM_DIRECTIONS
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
jr z, .ok
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
cp UP
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
jr z, .ok
Movement etc.
2015-12-17 20:14:51 +00:00
ld d, 1 * 8 + 4
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
.ok
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_Emote:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call InitMovementField1dField1e
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_BoulderDust:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call InitMovementField1dField1e
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
ld hl, .dust_coords
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
.dust_coords:
Split out map object code.
2015-02-11 22:13:22 +00:00
; x, y
db 0, -4
db 0, 8
db 6, 2
db -6, 2
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_ShakingGrass:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call InitMovementField1dField1e
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
InitMovementField1dField1e:
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
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1D
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], e
inc hl
ld [hl], d
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
MovementFunction_ScreenShake:
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]
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call .GetDurationAndField1e
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], e
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1E
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_SCREENSHAKE
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
.GetDurationAndField1e:
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
_RandomWalkContinue:
Movement etc.
2015-12-17 20:14:51 +00:00
call InitStep
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
call CanObjectMoveInDirection
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
jr c, .new_duration
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
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh a, [hMapObjectIndex]
Split out map object code.
2015-02-11 22:13:22 +00:00
cp [hl]
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
jr z, .centered
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_CONTINUE_WALK
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
.centered
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
.new_duration:
Movement etc.
2015-12-17 20:14:51 +00:00
call EndSpriteMovement
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
call CopyStandingCoordsTileToNextCoordsTile
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
RandomStepDuration_Slow:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %01111111
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
jr _SetRandomStepDuration
Split out map object code.
2015-02-11 22:13:22 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
RandomStepDuration_Fast:
Split out map object code.
2015-02-11 22:13:22 +00:00
call Random
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hRandomAdd]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00011111
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
_SetRandomStepDuration:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_SLEEP
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
StepTypesJumptable:
Verify data table sizes with table_width and assert_table_length macros This was discussed in #706 It also uncovered some off-by-one issues with defining some constants. A few structs now use rsreset/_RS to define their offset constants, as discussed in #739
2021-03-04 03:22:41 +00:00
; entries correspond to STEP_TYPE_* constants (see constants/map_object_constants.asm)
table_width 2, StepTypesJumptable
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
dw StepFunction_Reset ; 00
dw StepFunction_FromMovement ; 01
dw StepFunction_NPCWalk ; 02
dw StepFunction_Sleep ; 03
dw StepFunction_Standing ; 04
dw StepFunction_Restore ; 05
dw StepFunction_PlayerWalk ; 06
dw StepFunction_ContinueWalk ; 07
dw StepFunction_NPCJump ; 08
dw StepFunction_PlayerJump ; 09
dw StepFunction_Turn ; 0a
dw StepFunction_Bump ; 0b
dw StepFunction_TeleportFrom ; 0c
dw StepFunction_TeleportTo ; 0d
dw StepFunction_Skyfall ; 0e
dw StepFunction_StrengthBoulder ; 0f
dw StepFunction_GotBite ; 10
dw StepFunction_RockSmash ; 11
dw StepFunction_DigTo ; 12
dw StepFunction_TrackingObject ; 13
dw StepFunction_14 ; 14
dw StepFunction_ScreenShake ; 15
dw StepFunction_16 ; 16
dw StepFunction_17 ; 17
dw StepFunction_Delete ; 18
dw StepFunction_SkyfallTop ; 19
Verify data table sizes with table_width and assert_table_length macros This was discussed in #706 It also uncovered some off-by-one issues with defining some constants. A few structs now use rsreset/_RS to define their offset constants, as discussed in #739
2021-03-04 03:22:41 +00:00
assert_table_length NUM_STEP_TYPES
Split out map object code.
2015-02-11 22:13:22 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
WaitStep_InPlace:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_NPCJump:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
res OVERHEAD_F, [hl]
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_PlayerJump:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
set PLAYERSTEP_START_F, [hl]
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
res OVERHEAD_F, [hl]
More map object, swap StandingTile and NextTile
2015-11-15 04:02:38 +00:00
ld hl, wPlayerStepFlags
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
set PLAYERSTEP_STOP_F, [hl]
set PLAYERSTEP_MIDAIR_F, [hl]
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
set PLAYERSTEP_START_F, [hl]
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
set PLAYERSTEP_STOP_F, [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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_TeleportFrom:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_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
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1F
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
res OVERHEAD_F, [hl]
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1F
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_TeleportTo:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_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
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
.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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1F
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
.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
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1F
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
.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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_Skyfall:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_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
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1F
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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:
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1F
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_GotBite:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_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
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_RockSmash:
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
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_DigTo:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_Sleep:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_Delete:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_Bump:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_Restore:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_dw
More movement stuff
2015-12-29 18:15:58 +00:00
dw .Reset
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
dw StepFunction_Standing
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
; fallthrough
StepFunction_Standing:
call Stubbed_UpdateYOffset
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_NPCWalk:
call Stubbed_UpdateYOffset
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_ContinueWalk:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_PlayerWalk:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
set PLAYERSTEP_START_F, [hl]
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
set PLAYERSTEP_STOP_F, [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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_Turn:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
More movement stuff
2015-12-29 18:15:58 +00:00
.init2
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1D ; 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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_StrengthBoulder:
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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
res OBJ_FLAGS2_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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_TrackingObject:
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1D
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_14:
StepFunction_ScreenShake:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_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
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1D
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld [hl], a
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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:
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1D
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1D
Split out map object code.
2015-02-11 22:13:22 +00:00
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:
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1E
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
and 1
ld a, [hl]
ret z
cpl
inc a
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_16:
Resolve some "???" comments
2020-11-17 16:09:02 +00:00
call Field1c_AnonJumptable
; jumptable was dummied out here
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_17:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
.anon_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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
StepFunction_SkyfallTop:
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_AnonJumptable
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
.anon_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
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
call Field1c_IncAnonJumptableIndex
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_FROM_MOVEMENT
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
Stubbed_UpdateYOffset:
; dummied out
No more mobile EQUS ret (replace with Stubbed_ + ret)
2018-01-02 19:00:14 +00:00
ret
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1D
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld de, .y_offsets
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
ld a, [hl]
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], a
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
.y_offsets:
Split out map object code.
2015-02-11 22:13:22 +00:00
db 0, -1, -2, -3, -4, -3, -2, -1
Identify more sprite graphics and map object labels, and have consistent anonymous jumptable labels
2020-10-22 14:54:53 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
UpdateJumpPosition:
Split out map object code.
2015-02-11 22:13:22 +00:00
call GetStepVector
ld a, h
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 15:19:51 +00:00
ld hl, OBJECT_1F
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld e, [hl]
add e
ld [hl], a
nop
srl e
ld d, 0
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld hl, .y_offsets
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, de
ld a, [hl]
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], a
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
.y_offsets:
Split out map object code.
2015-02-11 22:13:22 +00:00
db -4, -6, -8, -10, -11, -12, -12, -12
db -11, -10, -9, -8, -6, -4, 0, 0
Formatting and comments
2018-12-09 23:13:37 +00:00
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
GetPlayerNextMovementByte:
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
More movement stuff
2015-12-29 18:15:58 +00:00
GetMovementByte:
Identify some more WRAM labels
2019-04-19 15:35:27 +00:00
ld hl, wMovementDataBank
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
GetIndexedMovementByte1:
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
Harmonize engine/overworld with pokegold
2020-06-18 02:12:04 +00:00
ld hl, wMovementObject
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
GetIndexedMovementByte2:
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
ld hl, wIndexedMovement2Pointer
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
Remove all address comments
2018-06-24 14:09:41 +00:00
_GetMovementObject:
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, 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
Remove all address comments
2018-06-24 14:09:41 +00:00
GetMovementObject:
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, [wMovementObject]
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
HandleMovementData:
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
Remove all address comments
2018-06-24 14:09:41 +00:00
JumpMovementPointer:
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
Remove all address comments
2018-06-24 14:09:41 +00:00
ContinueReadingMovement:
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
Remove all address comments
2018-06-24 14:09:41 +00:00
DoMovementFunction:
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
Organize the engine/ directory This is an informed attempt at reorganizing the engine/ directory by creating categorized subdirectories, in order to make it easier to navigate and find things. The directories created are as follows: * engine/game: Contains all "minigames", things like the unown puzzle and slot machine. * engine/gfx: Contains all handling of graphics. From loading palettes to playing animations. * engine/link: Contains all multiplayer functionality. * engine/menu: Contains all generic/misc. menus and menu code. Other, more specialized menus are in their own subdirectories (pokedex, pokegear, party menu, etc). * engine/overworld: Contains all handling of the overworld. From loading and connecting maps to wild encounters and the scripting engine. * engine/pokegear: In the same vein as engine/pokedex, except it could use some more splitting up. * engine/pokemon: Contains everything related to manipulating pokemon data. From the pokemon storage system to evolution and mail. * engine/printer: Contains everything related to printing things as well as the printer communication. * engine/title: Contains intro sequences, title screens and credits.
2018-03-13 12:07:16 +00:00
INCLUDE "engine/overworld/movement.asm"
Split out map object code.
2015-02-11 22:13:22 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
ApplyMovementToFollower:
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
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh a, [hMapObjectIndex]
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
Remove all address comments
2018-06-24 14:09:41 +00:00
GetFollowerNextMovementByte:
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
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
Remove all address comments
2018-06-24 14:09:41 +00:00
SpawnShadow:
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
More constants, related to map objects
2018-01-18 20:58:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
SpawnStrengthBoulderDust:
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:
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
; vtile, palette, movement
More map object work
2015-11-14 19:41:47 +00:00
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_BOULDERDUST
More constants, related to map objects
2018-01-18 20:58:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
SpawnEmote:
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:
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
; vtile, palette, movement
More map object work
2015-11-14 19:41:47 +00:00
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_EMOTE
More constants, related to map objects
2018-01-18 20:58:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
ShakeGrass:
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
Miscellaneous fixes in the use of _command constants.
2018-06-01 07:04:36 +00:00
ld de, .GrassObject
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
.GrassObject:
; vtile, palette, movement
More map object work
2015-11-14 19:41:47 +00:00
db $00, PAL_OW_TREE, SPRITEMOVEDATA_GRASS
More constants, related to map objects
2018-01-18 20:58:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
ShakeScreen:
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:
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
; vtile, palette, movement
More map object work
2015-11-14 19:41:47 +00:00
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE
Miscellaneous fixes in the use of _command constants.
2018-06-01 07:04:36 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
DespawnEmote:
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh a, [hMapObjectIndex]
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:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld de, wObjectStructs
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
Use known sprite movement data flag constants
2018-05-23 17:15:07 +00:00
bit EMOTE_OBJECT_F, [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
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld bc, OBJECT_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
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld hl, OBJECT_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
Remove all address comments
2018-06-24 14:09:41 +00:00
InitTempObject:
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
Remove all address comments
2018-06-24 14:09:41 +00:00
CopyTempObjectData:
More map object work
2015-11-14 19:41:47 +00:00
; load into wTempObjectCopy:
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
; -1, -1, [de], [de + 1], [de + 2], [hMapObjectIndex], [NextMapX], [NextMapY], -1
More map object work
2015-11-14 19:41:47 +00:00
; 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
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh a, [hMapObjectIndex]
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
UpdateAllObjectsFrozen::
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wVramState]
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 0, a
ret z
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld bc, wObjectStructs
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
.loop
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh [hMapObjectIndex], 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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call UpdateObjectFrozen
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld hl, OBJECT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh a, [hMapObjectIndex]
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
RespawnPlayerAndOpponent:
Remove more address comments
2018-06-25 01:39:23 +00:00
; called at battle start
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call HideAllObjects
Movement constants, script stack
2015-11-16 16:53:26 +00:00
ld a, PLAYER
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call RespawnObject
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
jr z, .skip_opponent
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hLastTalked]
Split out map object code.
2015-02-11 22:13:22 +00:00
and a
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
jr z, .skip_opponent
call RespawnObject
.skip_opponent
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
RespawnPlayer:
call HideAllObjects
Movement constants, script stack
2015-11-16 16:53:26 +00:00
ld a, PLAYER
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call RespawnObject
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
RespawnObject:
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call UpdateRespawnedObjectFrozen
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
HideAllObjects:
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld bc, wObjectStructs
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh [hMapObjectIndex], a
Movement constants, script stack
2015-11-16 16:53:26 +00:00
call SetFacing_Standing
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld hl, OBJECT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh a, [hMapObjectIndex]
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
UpdateObjectFrozen:
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call CheckObjectCoveredByTextbox
Split out map object code.
2015-02-11 22:13:22 +00:00
pop bc
Movement constants, script stack
2015-11-16 16:53:26 +00:00
jr c, SetFacing_Standing
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call CheckObjectOnScreen
Movement constants, script stack
2015-11-16 16:53:26 +00:00
jr c, SetFacing_Standing
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call UpdateObjectNextTile
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
farcall HandleFrozenObjectAction ; no need to farcall
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
ret
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
UpdateRespawnedObjectFrozen:
call CheckObjectOnScreen
Movement constants, script stack
2015-11-16 16:53:26 +00:00
jr c, SetFacing_Standing
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
farcall HandleFrozenObjectAction ; no need to farcall
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
SetFacing_Standing:
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
UpdateObjectNextTile:
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 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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
CheckObjectOnScreen:
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
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wXCoord]
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 z, .equal_x
jr nc, .nope
More constants, related to map objects
2018-01-18 20:58:55 +00:00
add MAPOBJECT_SCREEN_WIDTH - 1
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 c, .nope
.equal_x
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wYCoord]
Split out map object code.
2015-02-11 22:13:22 +00:00
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
More constants, related to map objects
2018-01-18 20:58:55 +00:00
add MAPOBJECT_SCREEN_HEIGHT - 1
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
CheckObjectCoveredByTextbox:
; Check whether the object fits in the screen width.
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
cp SCREEN_WIDTH_PX
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jp nc, .nope
.ok1
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
; Account for objects currently moving left/right.
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000111
ld d, 2
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
cp TILE_WIDTH / 2
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .ok2
ld d, 3
.ok2
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
; Convert pixels to tiles.
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
More constants, related to map objects
2018-01-18 20:58:55 +00:00
sub BG_MAP_WIDTH
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok3
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh [hCurSpriteXCoord], a
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
; Check whether the object fits in the screen height.
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
cp SCREEN_HEIGHT_PX
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr nc, .nope
.ok4
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
; Account for objects currently moving up/down.
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
and %00000111
ld e, 2
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
cp TILE_WIDTH / 2
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .ok5
ld e, 3
.ok5
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
; Convert pixels to tiles.
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hl]
srl a
srl a
srl a
More constants, related to map objects
2018-01-18 20:58:55 +00:00
cp SCREEN_HEIGHT
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr c, .ok6
More constants, related to map objects
2018-01-18 20:58:55 +00:00
sub BG_MAP_HEIGHT
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok6
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh [hCurSpriteYCoord], a
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
; Account for big objects that are twice as wide and high.
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_PALETTE
add hl, bc
More sprite movement data flag constants
2018-05-23 23:06:04 +00:00
bit BIG_OBJECT_F, [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
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh [hCurSpriteXPixel], a
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh a, [hCurSpriteXPixel]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh a, [hCurSpriteYCoord]
Split out map object code.
2015-02-11 22:13:22 +00:00
add e
dec a
More constants, related to map objects
2018-01-18 20:58:55 +00:00
cp SCREEN_HEIGHT
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
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh a, [hCurSpriteXCoord]
Split out map object code.
2015-02-11 22:13:22 +00:00
add d
dec a
More constants, related to map objects
2018-01-18 20:58:55 +00:00
cp SCREEN_WIDTH
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
More charmap and home/text.asm documentation for JP chars
2018-01-18 23:34:20 +00:00
; NPCs disappear if standing on tile $60-$7f (or $e0-$ff),
; since those IDs are for text characters and textbox frames.
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hl]
More charmap and home/text.asm documentation for JP chars
2018-01-18 23:34:20 +00:00
cp FIRST_REGULAR_TEXT_CHAR
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
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
Remove all address comments
2018-06-24 14:09:41 +00:00
HandleNPCStep::
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call ResetStepVector
call DoStepsForAllObjects
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify remaining map object labels
2020-10-23 01:25:40 +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
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
ld a, STANDING
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
DoStepsForAllObjects:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld bc, wObjectStructs
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
.loop
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh [hMapObjectIndex], 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
Identify more unnamed labels
2020-10-05 20:15:57 +00:00
call HandleObjectStep
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.next
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld hl, OBJECT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
add hl, bc
ld b, h
ld c, l
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh a, [hMapObjectIndex]
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
Remove all address comments
2018-06-24 14:09:41 +00:00
RefreshPlayerSprite:
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
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wPlayerObjectStepFrame], a
Identify remaining map object labels
2020-10-23 01:25:40 +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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call SpawnInCustomFacing
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
TryResetPlayerAction:
About time I got to these functions
2015-10-24 14:34:19 +00:00
ld hl, wPlayerSpriteSetupFlags
More engine flag constants
2018-01-22 19:34:55 +00:00
bit PLAYERSPRITESETUP_RESET_ACTION_F, [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
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wPlayerAction], a
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
SpawnInCustomFacing:
About time I got to these functions
2015-10-24 14:34:19 +00:00
ld hl, wPlayerSpriteSetupFlags
More engine flag constants
2018-01-22 19:34:55 +00:00
bit PLAYERSPRITESETUP_CUSTOM_FACING_F, [hl]
Split out map object code.
2015-02-11 22:13:22 +00:00
ret z
About time I got to these functions
2015-10-24 14:34:19 +00:00
ld a, [wPlayerSpriteSetupFlags]
More engine flag constants
2018-01-22 19:34:55 +00:00
and PLAYERSPRITESETUP_FACING_MASK
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
jr _ContinueSpawnFacing
Split out map object code.
2015-02-11 22:13:22 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
SpawnInFacingDown:
Misc fixes
2019-08-21 12:43:21 +00:00
ld a, DOWN
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
_ContinueSpawnFacing:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld bc, wPlayerStruct
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
Remove all address comments
2018-06-24 14:09:41 +00:00
_SetPlayerPalette:
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, d
Use constants more
2018-05-24 02:13:46 +00:00
and 1 << 7
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
Use constants more
2018-05-24 02:13:46 +00:00
and PALETTE_MASK
Split out map object code.
2015-02-11 22:13:22 +00:00
ld d, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld bc, wPlayerStruct
Split out map object code.
2015-02-11 22:13:22 +00:00
ld hl, OBJECT_PALETTE
add hl, bc
ld a, [hl]
Use ~X instead of $ff ^ X
2021-11-24 01:37:18 +00:00
and ~PALETTE_MASK
Split out map object code.
2015-02-11 22:13:22 +00:00
or d
ld [hl], a
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
StartFollow::
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
Remove all address comments
2018-06-24 14:09:41 +00:00
SetLeaderIfVisible:
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
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh a, [hObjectStructIndex]
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
Remove all address comments
2018-06-24 14:09:41 +00:00
StopFollow::
object_struct
2015-11-02 16:15:32 +00:00
call ResetLeader
call ResetFollower
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
ResetLeader:
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
Remove all address comments
2018-06-24 14:09:41 +00:00
SetFollowerIfVisible:
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_RESET
Remove "Buffer" suffix from two HRAM labels
2020-12-23 21:54:28 +00:00
ldh a, [hObjectStructIndex]
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
Remove all address comments
2018-06-24 14:09:41 +00:00
ResetFollower:
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
farcall ResetObject ; no need to farcall
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
FreezeAllOtherObjects::
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
call FreezeAllObjects
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
res FROZEN_F, [hl]
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
ret
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
FreezeObject: ; unreferenced
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
set FROZEN_F, [hl]
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
ret
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
FreezeAllObjects:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld bc, wObjectStructs
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
.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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
set FROZEN_F, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.next
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld hl, OBJECT_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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
_UnfreezeFollowerObject::
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
res FROZEN_F, [hl]
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
UnfreezeAllObjects::
Split out map object code.
2015-02-11 22:13:22 +00:00
push bc
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld bc, wObjectStructs
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
.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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
res FROZEN_F, [hl]
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.next
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld hl, OBJECT_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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
UnfreezeObject: ; unreferenced
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
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
res FROZEN_F, [hl]
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
ResetObject:
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
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 21:12:02 +00:00
jp z, .set_standing
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_RESET
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify remaining map object labels
2020-10-23 01:25:40 +00:00
.set_standing:
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
ld [hl], STEP_TYPE_RESET
Split out map object code.
2015-02-11 22:13:22 +00:00
ret
Identify some more map object labels and constants
2020-10-22 21:41:48 +00:00
.standing_movefns:
SPRITEMOVEDATA
2015-11-01 01:05:02 +00:00
db SPRITEMOVEDATA_STANDING_DOWN
db SPRITEMOVEDATA_STANDING_UP
db SPRITEMOVEDATA_STANDING_LEFT
db SPRITEMOVEDATA_STANDING_RIGHT
Resolve #461
2018-01-10 18:47:57 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
_UpdateSprites::
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wVramState]
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 0, a
ret z
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hUsedSpriteIndex], a
ldh a, [hOAMUpdate]
Split out map object code.
2015-02-11 22:13:22 +00:00
push af
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
ld a, 1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [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
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hOAMUpdate], a
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
.fill
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wVramState]
Split out map object code.
2015-02-11 22:13:22 +00:00
bit 1, a
Sync some files with pokegold
2021-03-24 14:24:52 +00:00
ld b, NUM_SPRITE_OAM_STRUCTS * SPRITEOAMSTRUCT_LENGTH
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .ok
Sync some files with pokegold
2021-03-24 14:24:52 +00:00
ld b, (NUM_SPRITE_OAM_STRUCTS - 12) * SPRITEOAMSTRUCT_LENGTH
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.ok
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hUsedSpriteIndex]
Split out map object code.
2015-02-11 22:13:22 +00:00
cp b
ret nc
ld l, a
wVirtualOAM -> wShadowOAM and hTransferVirtualOAM -> hTransferShadowOAM (#971)
2022-07-09 21:18:22 +00:00
ld h, HIGH(wShadowOAM)
Resolve #461
2018-01-10 18:47:57 +00:00
ld de, SPRITEOAMSTRUCT_LENGTH
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, b
Resolve #461
2018-01-10 18:47:57 +00:00
ld c, SCREEN_HEIGHT_PX + 2 * TILE_WIDTH
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
.loop
Resolve #461
2018-01-10 18:47:57 +00:00
ld [hl], c ; y
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Remove all address comments
2018-06-24 14:09:41 +00:00
ApplyBGMapAnchorToObjects:
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
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld bc, wObjectStructs
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
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld hl, OBJECT_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
RGBDS syntax updates (#905) New MACRO and DEF syntax
2022-06-06 21:25:42 +00:00
DEF PRIORITY_LOW EQU $10
DEF PRIORITY_NORM EQU $20
DEF PRIORITY_HIGH EQU $30
More constants, related to map objects
2018-01-18 20:58:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
InitSprites:
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
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
Identify wObjectPriorities
2020-06-16 03:28:24 +00:00
ld hl, wObjectPriorities
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
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld bc, wObjectStructs
Identify wObjectPriorities
2020-06-16 03:28:24 +00:00
ld hl, wObjectPriorities
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
Use known sprite movement data flag constants
2018-05-23 17:15:07 +00:00
bit LOW_PRIORITY_F, [hl]
Split out map object code.
2015-02-11 22:13:22 +00:00
jr nz, .add
Fix some movement macro/function names
2015-11-16 02:28:15 +00:00
ld e, PRIORITY_NORM
Use known sprite movement data flag constants
2018-05-23 17:15:07 +00:00
bit HIGH_PRIORITY_F, [hl]
Split out map object code.
2015-02-11 22:13:22 +00:00
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
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld hl, OBJECT_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
Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH
2019-11-03 17:25:59 +00:00
ld hl, OBJECT_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:
Identify wObjectPriorities
2020-06-16 03:28:24 +00:00
ld hl, wObjectPriorities
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]
Use ~X instead of $ff ^ X
2021-11-24 01:37:18 +00:00
and ~(1 << 7)
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh [hCurSpriteTile], a
Split out map object code.
2015-02-11 22:13:22 +00:00
xor a
bit 7, [hl]
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
jr nz, .not_vram1
Identify USE_OBP1_F
2018-05-24 00:44:32 +00:00
or VRAM_BANK_1
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
.not_vram1
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]
Use and define more WRAM constants
2019-01-25 02:41:14 +00:00
bit OBJ_FLAGS2_7, e
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
jr z, .not_priority
Identify USE_OBP1_F
2018-05-24 00:44:32 +00:00
or PRIORITY
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
.not_priority
Identify USE_OBP1_F
2018-05-24 00:44:32 +00:00
bit USE_OBP1_F, e
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
jr z, .not_obp_num
Identify USE_OBP1_F
2018-05-24 00:44:32 +00:00
or OBP_NUM
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
.not_obp_num
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]
Identify USE_OBP1_F
2018-05-24 00:44:32 +00:00
and PALETTE_MASK
Split out map object code.
2015-02-11 22:13:22 +00:00
or d
ld d, a
xor a
Identify USE_OBP1_F
2018-05-24 00:44:32 +00:00
bit OVERHEAD_F, e
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
jr z, .not_overhead
Identify USE_OBP1_F
2018-05-24 00:44:32 +00:00
or PRIORITY
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
.not_overhead
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh [hCurSpriteOAMFlags], 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
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh [hCurSpriteXPixel], 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
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh [hCurSpriteYPixel], 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
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hUsedSpriteIndex]
Split out map object code.
2015-02-11 22:13:22 +00:00
ld c, a
wVirtualOAM -> wShadowOAM and hTransferVirtualOAM -> hTransferShadowOAM (#971)
2022-07-09 21:18:22 +00:00
ld b, HIGH(wShadowOAM)
Split out map object code.
2015-02-11 22:13:22 +00:00
ld a, [hli]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hUsedSpriteTile], a
Split out map object code.
2015-02-11 22:13:22 +00:00
add c
wVirtualOAM -> wShadowOAM and hTransferVirtualOAM -> hTransferShadowOAM (#971)
2022-07-09 21:18:22 +00:00
cp LOW(wShadowOAMEnd)
Split out map object code.
2015-02-11 22:13:22 +00:00
jr nc, .full
.addsprite
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh a, [hCurSpriteYPixel]
Split out map object code.
2015-02-11 22:13:22 +00:00
add [hl]
inc hl
Resolve #461
2018-01-10 18:47:57 +00:00
ld [bc], a ; y
Split out map object code.
2015-02-11 22:13:22 +00:00
inc c
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh a, [hCurSpriteXPixel]
Split out map object code.
2015-02-11 22:13:22 +00:00
add [hl]
inc hl
Resolve #461
2018-01-10 18:47:57 +00:00
ld [bc], a ; x
Split out map object code.
2015-02-11 22:13:22 +00:00
inc c
ld e, [hl]
inc hl
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh a, [hCurSpriteTile]
Identify more sprite move data flag bits
2018-05-24 02:01:21 +00:00
bit ABSOLUTE_TILE_ID_F, 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
Resolve #461
2018-01-10 18:47:57 +00:00
ld [bc], a ; tile id
Split out map object code.
2015-02-11 22:13:22 +00:00
inc c
ld a, e
Identify more sprite move data flag bits
2018-05-24 02:01:21 +00:00
bit RELATIVE_ATTRIBUTES_F, a
More enumeration of constants, more annotations of scripts.
2015-07-15 19:48:44 +00:00
jr z, .nope2
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
2020-04-18 21:31:51 +00:00
ldh a, [hCurSpriteOAMFlags]
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
More constants, related to map objects
2018-01-18 20:58:55 +00:00
and OBP_NUM | X_FLIP | Y_FLIP | PRIORITY
Split out map object code.
2015-02-11 22:13:22 +00:00
or d
Resolve #461
2018-01-10 18:47:57 +00:00
ld [bc], a ; attributes
Split out map object code.
2015-02-11 22:13:22 +00:00
inc c
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hUsedSpriteTile]
Split out map object code.
2015-02-11 22:13:22 +00:00
dec a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hUsedSpriteTile], a
Split out map object code.
2015-02-11 22:13:22 +00:00
jr nz, .addsprite
ld a, c
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [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
Remove all address comments
2018-06-24 14:09:41 +00:00
.Addresses:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
dw wPlayerStruct
dw wObject1Struct
dw wObject2Struct
dw wObject3Struct
dw wObject4Struct
dw wObject5Struct
dw wObject6Struct
dw wObject7Struct
dw wObject8Struct
dw wObject9Struct
dw wObject10Struct
dw wObject11Struct
dw wObject12Struct