pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Movement etc.

Browse Source
This commit is contained in:
PikalaxALT
2015-12-17 15:14:51 -05:00
parent efee40447e
commit caa83c08a7
6 changed files with 186 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
constants/sprite_constants.asm
View File

@ -269,7 +269,7 @@ MAX_OUTDOOR_SPRITES EQU 23
const_def const_def
const STEP_TYPE_00 const STEP_TYPE_00
const STEP_TYPE_STANDING const STEP_TYPE_SLEEP
const STEP_TYPE_NPC_WALK const STEP_TYPE_NPC_WALK
const STEP_TYPE_03 const STEP_TYPE_03
const STEP_TYPE_04 const STEP_TYPE_04
@ -287,7 +287,7 @@ MAX_OUTDOOR_SPRITES EQU 23
const STEP_TYPE_GOT_BITE const STEP_TYPE_GOT_BITE
const STEP_TYPE_ROCK_SMASH const STEP_TYPE_ROCK_SMASH
const STEP_TYPE_RETURN_DIG const STEP_TYPE_RETURN_DIG
const STEP_TYPE_13 const STEP_TYPE_TRACKING_OBJECT
const STEP_TYPE_14 const STEP_TYPE_14
const STEP_TYPE_15 const STEP_TYPE_15
const STEP_TYPE_16 const STEP_TYPE_16

35
engine/events.asm
View File

@ -1,6 +1,5 @@
INCLUDE "includes.asm" INCLUDE "includes.asm"
SECTION "Events", ROMX, BANK[EVENTS] SECTION "Events", ROMX, BANK[EVENTS]
OverworldLoop:: ; 966b0 OverworldLoop:: ; 966b0
@ -23,7 +22,6 @@ OverworldLoop:: ; 966b0
dw .done dw .done
; 966cb ; 966cb
DisableEvents: ; 966cb DisableEvents: ; 966cb
xor a xor a
ld [ScriptFlags3], a ld [ScriptFlags3], a
@ -114,21 +112,16 @@ CheckWildEncountersScriptFlag: ; 9671e
ret ret
; 96724 ; 96724
StartMap: ; 96724 StartMap: ; 96724
xor a xor a
ld [ScriptVar], a ld [ScriptVar], a
xor a xor a
ld [ScriptRunning], a ld [ScriptRunning], a
ld hl, MapStatus ld hl, MapStatus
ld bc, $3e ; 62 ld bc, wMapStatusEnd - MapStatus
call ByteFill call ByteFill
callba InitCallReceiveDelay callba InitCallReceiveDelay
call ClearJoypad call ClearJoypad
; fallthrough
; 9673e
EnterMap: ; 9673e EnterMap: ; 9673e
xor a xor a
ld [wd453], a ld [wd453], a
@ -157,17 +150,15 @@ EnterMap: ; 9673e
ret ret
; 9676d ; 9676d
UnusedWait30Frames: ; 9676d
Function9676d: ; 9676d
ld c, 30 ld c, 30
call DelayFrames call DelayFrames
ret ret
; 96773 ; 96773
HandleMap: ; 96773 HandleMap: ; 96773
call ResetOverworldDelay call ResetOverworldDelay
call Function967c1 call HandleMapTimeAndJoypad
callba HandleCmdQueue ; no need to farcall callba HandleCmdQueue ; no need to farcall
call MapEvents call MapEvents
@ -183,7 +174,6 @@ HandleMap: ; 96773
ret ret
; 96795 ; 96795
MapEvents: ; 96795 MapEvents: ; 96795
ld a, [MapEventStatus] ld a, [MapEventStatus]
ld hl, .jumps ld hl, .jumps
@ -206,7 +196,6 @@ MapEvents: ; 96795
ret ret
; 967af ; 967af
MaxOverworldDelay: ; 967af MaxOverworldDelay: ; 967af
db 2 db 2
; 967b0 ; 967b0
@ -226,7 +215,7 @@ NextOverworldFrame: ; 967b7
ret ret
; 967c1 ; 967c1
Function967c1: ; 967c1 HandleMapTimeAndJoypad: ; 967c1
ld a, [MapEventStatus] ld a, [MapEventStatus]
cp 1 ; no events cp 1 ; no events
ret z ret z
@ -281,7 +270,6 @@ Function96812: ; 96812
ret ret
; 9681f ; 9681f
PlayerEvents: ; 9681f PlayerEvents: ; 9681f
xor a xor a
@ -313,7 +301,6 @@ PlayerEvents: ; 9681f
xor a xor a
ret ret
.ok .ok
push af push af
callba EnableScriptMode callba EnableScriptMode
@ -335,7 +322,6 @@ PlayerEvents: ; 9681f
ret ret
; 96867 ; 96867
CheckTrainerBattle3: ; 96867 CheckTrainerBattle3: ; 96867
nop nop
nop nop
@ -351,7 +337,6 @@ CheckTrainerBattle3: ; 96867
ret ret
; 96874 ; 96874
CheckTileEvent: ; 96874 CheckTileEvent: ; 96874
; Check for warps, tile triggers or wild battles. ; Check for warps, tile triggers or wild battles.
@ -418,7 +403,6 @@ CheckTileEvent: ; 96874
ret ret
; 968c7 ; 968c7
CheckWildEncounterCooldown:: ; 968c7 CheckWildEncounterCooldown:: ; 968c7
ld hl, wWildEncounterCooldown ld hl, wWildEncounterCooldown
ld a, [hl] ld a, [hl]
@ -543,7 +527,6 @@ CheckTimeEvents: ; 9693a
ret ret
; 96974 ; 96974
OWPlayerInput: ; 96974 OWPlayerInput: ; 96974
call PlayerMovement call PlayerMovement
@ -573,7 +556,6 @@ OWPlayerInput: ; 96974
ret ret
; 96999 ; 96999
CheckAPressOW: ; 96999 CheckAPressOW: ; 96999
ld a, [hJoyPressed] ld a, [hJoyPressed]
and A_BUTTON and A_BUTTON
@ -588,7 +570,6 @@ CheckAPressOW: ; 96999
ret ret
; 969ac ; 969ac
PlayTalkObject: ; 969ac PlayTalkObject: ; 969ac
push de push de
ld de, SFX_READ_TEXT_2 ld de, SFX_READ_TEXT_2
@ -597,7 +578,6 @@ PlayTalkObject: ; 969ac
ret ret
; 969b5 ; 969b5
TryObjectEvent: ; 969b5 TryObjectEvent: ; 969b5
callba CheckFacingObject callba CheckFacingObject
jr c, .IsObject jr c, .IsObject
@ -704,7 +684,6 @@ TryObjectEvent: ; 969b5
ret ret
; 96a38 ; 96a38
TryReadSign: ; 96a38 TryReadSign: ; 96a38
call CheckFacingSign call CheckFacingSign
jr c, .IsSign jr c, .IsSign
@ -810,7 +789,6 @@ endr
ret ret
; 96ad8 ; 96ad8
CheckSignFlag: ; 96ad8 CheckSignFlag: ; 96ad8
ld hl, EngineBuffer4 ld hl, EngineBuffer4
ld a, [hli] ld a, [hli]
@ -829,7 +807,6 @@ CheckSignFlag: ; 96ad8
ret ret
; 96af0 ; 96af0
PlayerMovement: ; 96af0 PlayerMovement: ; 96af0
callba DoPlayerMovement callba DoPlayerMovement
ld a, c ld a, c
@ -896,7 +873,6 @@ PlayerMovement: ; 96af0
ret ret
; 96b30 ; 96b30
CheckMenuOW: ; 96b30 CheckMenuOW: ; 96b30
xor a xor a
ld [hMenuReturn], a ld [hMenuReturn], a
@ -928,7 +904,6 @@ CheckMenuOW: ; 96b30
ret ret
; 96b58 ; 96b58
StartMenuScript: ; 96b58 StartMenuScript: ; 96b58
callasm StartMenu callasm StartMenu
jump StartMenuCallback jump StartMenuCallback
@ -956,7 +931,6 @@ SelectMenuCallback: ; 96b66
end end
; 96b79 ; 96b79
CountStep: ; 96b79 CountStep: ; 96b79
; Don't count steps in link communication rooms. ; Don't count steps in link communication rooms.
ld a, [wLinkMode] ld a, [wLinkMode]
@ -1024,7 +998,6 @@ CountStep: ; 96b79
ret ret
; 96bd3 ; 96bd3
.unreferenced: ; 96bd3 .unreferenced: ; 96bd3
ld a, 7 ld a, 7
scf scf

334
engine/map_objects.asm
View File

File diff suppressed because it is too large Load Diff

22
engine/movement.asm
View File

@ -193,7 +193,7 @@ Movement_fish_cast_rod: ; 51ab
ld [hl], PERSON_ACTION_FISHING ld [hl], PERSON_ACTION_FISHING
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_STANDING ld [hl], STEP_TYPE_SLEEP
ret ret
; 51b8 ; 51b8
@ -219,7 +219,7 @@ Movement_step_end: ; 51c1
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_STANDING ld [hl], STEP_TYPE_SLEEP
ret ret
; 51db ; 51db
@ -248,7 +248,7 @@ Movement_48: ; 51db
; 51fd ; 51fd
Movement_remove_person: ; 51fd Movement_remove_person: ; 51fd
call Function4357 call DeleteMapObject
ld hl, wObjectFollow_Leader ld hl, wObjectFollow_Leader
ld a, [hMapObjectIndexBuffer] ld a, [hMapObjectIndexBuffer]
cp [hl] cp [hl]
@ -726,7 +726,7 @@ Movement_half_step_right: ; 53fc
jr HalfStep jr HalfStep
HalfStep: ; 5400 HalfStep: ; 5400
ld hl, OBJECT_29 ld hl, OBJECT_29 ; new facing
add hl, bc add hl, bc
ld [hl], a ld [hl], a
@ -741,8 +741,8 @@ HalfStep: ; 5400
; 5412 ; 5412
NormalStep: ; 5412 NormalStep: ; 5412
call Function4690 call InitStep
call Function463f call UpdateTallGrassFlags
ld hl, OBJECT_ACTION ld hl, OBJECT_ACTION
add hl, bc add hl, bc
ld [hl], PERSON_ACTION_STEP ld [hl], PERSON_ACTION_STEP
@ -778,8 +778,8 @@ NormalStep: ; 5412
; 5446 ; 5446
TurningStep: ; 5446 TurningStep: ; 5446
call Function4690 call InitStep
call Function463f call UpdateTallGrassFlags
ld hl, OBJECT_ACTION ld hl, OBJECT_ACTION
add hl, bc add hl, bc
@ -804,8 +804,8 @@ TurningStep: ; 5446
SlideStep: ; 5468 SlideStep: ; 5468
call Function4690 call InitStep
call Function463f call UpdateTallGrassFlags
ld hl, OBJECT_ACTION ld hl, OBJECT_ACTION
add hl, bc add hl, bc
@ -830,7 +830,7 @@ SlideStep: ; 5468
JumpStep: ; 548a JumpStep: ; 548a
call Function4690 call InitStep
ld hl, OBJECT_31 ld hl, OBJECT_31
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0

4
home/map_objects.asm
View File

@ -369,7 +369,7 @@ Function1967:: ; 1967
call Function1985 call Function1985
pop af pop af
call GetObjectStruct call GetObjectStruct
callba Function4357 callba DeleteMapObject
ret ret
; 1985 ; 1985
@ -435,7 +435,7 @@ Function19b8:: ; 19b8
.ok .ok
ld a, b ld a, b
call GetObjectStruct call GetObjectStruct
callba Function4357 callba DeleteMapObject
ret ret
; 19e9 ; 19e9

3
wram.asm
View File

@ -2417,7 +2417,8 @@ wReceiveCallDelay_StartTime:: ds 3
ds 3 ds 3
wBugContestMinsRemaining:: ds 1 wBugContestMinsRemaining:: ds 1
wBugContestSecsRemaining:: ds 1 wBugContestSecsRemaining:: ds 1
ds 4 ds 2
wMapStatusEnd:: ds 2 ; d470
wCrystalData:: wCrystalData::
PlayerGender:: ; d472 PlayerGender:: ; d472