Merge pull request #154 from yenatch/movement

Movement.
This commit is contained in:
Bryan Bishop 2013-06-26 21:45:44 -07:00
commit 34c8cb8077
3 changed files with 1009 additions and 59 deletions

View File

@ -283,6 +283,30 @@ D_UP EQU %01000000
D_DOWN EQU %10000000 D_DOWN EQU %10000000
; movement
STANDING EQU -1
DOWN EQU 0
UP EQU 1
LEFT EQU 2
RIGHT EQU 3
STEP_SLOW EQU 0
STEP_WALK EQU 1
STEP_BIKE EQU 2
STEP_LEDGE EQU 3
STEP_ICE EQU 4
STEP_TURN EQU 5
STEP_BACK_LEDGE EQU 6
STEP_WALK_IN_PLACE EQU 7
; facing
FACE_CURRENT EQU 0
FACE_DOWN EQU 8
FACE_UP EQU 4
FACE_LEFT EQU 2
FACE_RIGHT EQU 1
; Provisional wram bank 5 labels: ; Provisional wram bank 5 labels:
; 8 4-color palettes ; 8 4-color palettes

980
main.asm

File diff suppressed because it is too large Load Diff

View File

@ -921,15 +921,34 @@ StartFlypoint: ; d005
EndFlypoint: ; d006 EndFlypoint: ; d006
ds 1 ds 1
MovementBuffer: ; d007
ds 55 ds 55
MenuItemsList: MenuItemsList:
CurFruitTree: ; d03e CurFruitTree:
CurInput:
EngineBuffer1: ; d03e
ds 1 ds 1
CurFruit: ; d03f CurFruit: ; d03f
ds 1 ds 1
ds 51 ds 2
MovementAnimation: ; d042
ds 1
WalkingDirection: ; d043
ds 1
FacingDirection: ; d044
ds 1
WalkingX: ; d045
ds 1
WalkingY: ; d046
ds 1
WalkingTile: ; d047
ds 1
ds 43
StringBuffer1: ; d073 StringBuffer1: ; d073
ds 19 ds 19
@ -1167,6 +1186,7 @@ EvolvableFlags: ; d1e8
Buffer1: Buffer1:
MagikarpLength: ; d1ea MagikarpLength: ; d1ea
ds 1 ds 1
MovementType:
Buffer2: ; d1eb Buffer2: ; d1eb
ds 1 ds 1
@ -1566,6 +1586,32 @@ PlayerDirection: ; d4de
; $11 right ; $11 right
ds 1 ds 1
SECTION "MapEngine",BSS[$d4e4]
StandingTile: ; d4e4
ds 1
StandingTile2: ; d4e5
ds 1
; relative to the map struct including borders
MapX: ; d4e6
ds 1
MapY: ; d4e7
ds 1
MapX2: ; d4e8
ds 1
MapY2: ; d4e9
ds 1
ds 3
; relative to the bg map, in px
PlayerSpriteX: ; d4ed
ds 1
PlayerSpriteY: ; d4ee
ds 1
SECTION "Status",BSS[$d841] SECTION "Status",BSS[$d841]
TimeOfDayPal: ; d841 TimeOfDayPal: ; d841
ds 1 ds 1
@ -1673,6 +1719,12 @@ Box13Name: ; dbe1
Box14Name: ; dbea Box14Name: ; dbea
ds 9 ds 9
SECTION "bike", BSS[$dbf5]
BikeFlags: ; dbf5
; bit 1: always on bike
; bit 2: downhill
ds 1
SECTION "decorations", BSS[$dc0f] SECTION "decorations", BSS[$dc0f]
; Sprite id of each decoration ; Sprite id of each decoration
Bed: ; dc0f Bed: ; dc0f