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

More map object, swap StandingTile and NextTile

Browse Source
This commit is contained in:
PikalaxALT
2015-11-14 23:02:38 -05:00
parent ed44de4bb4
commit b921226aea
14 changed files with 450 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/events.asm
View File

@@ -252,7 +252,7 @@ Function967e1: ; 967e1
; 967f4
Function967f4: ; 967f4
ld a, [wd150]
ld a, [wPlayerStepFlags]
bit 5, a
jr z, .events
bit 6, a
@@ -273,7 +273,7 @@ Function967f4: ; 967f4
; 96812
Function96812: ; 96812
ld hl, wd150
ld hl, wPlayerStepFlags
bit 6, [hl]
ret z
@@ -396,7 +396,7 @@ CheckTileEvent: ; 96874
ret
.warp_tile
ld a, [PlayerStandingTile]
ld a, [PlayerNextTile]
call CheckPitTile
jr nz, .not_pit
ld a, PLAYEREVENT_FALL

4
engine/events_2.asm
View File

@@ -161,7 +161,7 @@ CanUseSweetScent:: ; 97cfd
jr nc, .no
.ice_check
ld a, [PlayerStandingTile]
ld a, [PlayerNextTile]
call CheckIceTile
jr z, .no
scf
@@ -235,7 +235,7 @@ ChooseWildEncounter_BugContest:: ; 97d31
; 97d64
TryWildEncounter_BugContest: ; 97d64
ld a, [PlayerStandingTile]
ld a, [PlayerNextTile]
call CheckSuperTallGrassTile
ld b, 40 percent
jr z, .ok

38
engine/facings.asm
View File

@@ -50,7 +50,7 @@ BEHIND_BG EQU 1 << OAM_PRIORITY
Facing00:
Facing02:
Facing24:
Facing26: ; 408b
Facing26: ; standing down
db 4 ; #
db 0, 0, 0, $00
db 0, 8, 0, $01
@@ -58,7 +58,7 @@ Facing26: ; 408b
db 8, 8, 2, $03
; 409c
Facing01: ; 409c
Facing01: ; walking down 1
db 4 ; #
db 0, 0, 0, $80
db 0, 8, 0, $81
@@ -66,7 +66,7 @@ Facing01: ; 409c
db 8, 8, 2, $83
; 40ad
Facing03: ; 40ad
Facing03: ; walking down 2
db 4 ; #
db 0, 8, X_FLIP, $80
db 0, 0, X_FLIP, $81
@@ -75,7 +75,7 @@ Facing03: ; 40ad
; 40be
Facing04:
Facing06: ; 40be
Facing06: ; standing up
db 4 ; #
db 0, 0, 0, $04
db 0, 8, 0, $05
@@ -83,7 +83,7 @@ Facing06: ; 40be
db 8, 8, 2, $07
; 40cf
Facing05: ; 40cf
Facing05: ; walking up 1
db 4 ; #
db 0, 0, 0, $84
db 0, 8, 0, $85
@@ -91,7 +91,7 @@ Facing05: ; 40cf
db 8, 8, 2, $87
; 40e0
Facing07: ; 40e0
Facing07: ; walking up 2
db 4 ; #
db 0, 8, X_FLIP, $84
db 0, 0, X_FLIP, $85
@@ -100,7 +100,7 @@ Facing07: ; 40e0
; 40f1
Facing08:
Facing10: ; 40f1
Facing10: ; standing left
db 4 ; #
db 0, 0, 0, $08
db 0, 8, 0, $09
@@ -109,7 +109,7 @@ Facing10: ; 40f1
; 4102
Facing12:
Facing14: ; 4102
Facing14: ; standing right
db 4 ; #
db 0, 8, X_FLIP, $08
db 0, 0, X_FLIP, $09
@@ -118,7 +118,7 @@ Facing14: ; 4102
; 4113
Facing09:
Facing11: ; 4113
Facing11: ; walking left
db 4 ; #
db 0, 0, 0, $88
db 0, 8, 0, $89
@@ -127,7 +127,7 @@ Facing11: ; 4113
; 4124
Facing13:
Facing15: ; 4124
Facing15: ; walking right
db 4 ; #
db 0, 8, X_FLIP, $88
db 0, 0, X_FLIP, $89
@@ -135,7 +135,7 @@ Facing15: ; 4124
db 8, 0, 2 | X_FLIP, $8b
; 4135
Facing16: ; 4135
Facing16: ; fishing down
db 5 ; #
db 0, 0, 0, $00
db 0, 8, 0, $01
@@ -144,7 +144,7 @@ Facing16: ; 4135
db 16, 0, 4, $fc
; 414a
Facing17: ; 414a
Facing17: ; fishing up
db 5 ; #
db 0, 0, 0, $04
db 0, 8, 0, $05
@@ -153,7 +153,7 @@ Facing17: ; 414a
db -8, 0, 4, $fc
; 415f
Facing18: ; 415f
Facing18: ; fishing left
db 5 ; #
db 0, 0, 0, $08
db 0, 8, 0, $09
@@ -162,7 +162,7 @@ Facing18: ; 415f
db 5, -8, 4 | X_FLIP, $fd
; 4174
Facing19: ; 4174
Facing19: ; fishing right
db 5 ; #
db 0, 8, X_FLIP, $08
db 0, 0, X_FLIP, $09
@@ -171,7 +171,7 @@ Facing19: ; 4174
db 5, 16, 4, $fd
; 4189
Facing20: ; 4189
Facing20: ; emote
db 4 ; #
db 0, 0, 4, $f8
db 0, 8, 4, $f9
@@ -179,13 +179,13 @@ Facing20: ; 4189
db 8, 8, 4, $fb
; 419a
Facing21: ; 419a
Facing21: ; shadow
db 2 ; #
db 0, 0, 4, $fc
db 0, 8, 4 | X_FLIP, $fc
; 41a3
Facing23: ; 41a3
Facing23: ; big doll
db 16 ; #
db 0, 0, 0, $00
db 0, 8, 0, $01
@@ -239,7 +239,7 @@ Facing22: ; 4206
db 24, 16, 0, $0b
; 423f
Facing28: ; 423f
Facing28: ; boulder dust 1
db 4 ; #
db 0, 0, 4, $fe
db 0, 8, 4, $fe
@@ -247,7 +247,7 @@ Facing28: ; 423f
db 8, 8, 4, $fe
; 4250
Facing29: ; 4250
Facing29: ; boulder dust 2
db 4 ; #
db 0, 0, 4, $ff
db 0, 8, 4, $ff

342
engine/map_objects.asm
View File

File diff suppressed because it is too large Load Diff

144
engine/movement.asm
View File

@@ -93,30 +93,30 @@ MovementPointers: ; 5075
Movement_teleport_from: ; 5129
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_0C
ld [hl], STEP_TYPE_0C
ret
; 5130
Movement_teleport_to: ; 5130
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_0D
ld [hl], STEP_TYPE_0D
ret
; 5137
Movement_skyfall: ; 5137
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_0E
ld [hl], STEP_TYPE_0E
ret
; 513e
Movement_59: ; 513e
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_19
ld [hl], STEP_TYPE_19
ret
; 5145
@@ -129,14 +129,14 @@ Movement_step_wait5: ; 5145
ld [hl], a
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $4
ld [hl], PERSON_ACTION_04
call GetMovementByte
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_03
ld [hl], STEP_TYPE_03
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], STANDING
@@ -157,19 +157,19 @@ Movement_58: ; 516a
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], STANDING
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_12
ld [hl], STEP_TYPE_12
ret
; 5189
Movement_fish_got_bite: ; 5189
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $6
ld hl, OBJECT_09
ld [hl], PERSON_ACTION_06
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_10
ld [hl], STEP_TYPE_10
ret
; 5196
@@ -180,20 +180,20 @@ Movement_rock_smash: ; 5196
ld [hl], a
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $1
ld hl, OBJECT_09
ld [hl], PERSON_ACTION_01
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_11
ld [hl], STEP_TYPE_11
ret
; 51ab
Movement_fish_cast_rod: ; 51ab
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $6
ld hl, OBJECT_09
ld [hl], PERSON_ACTION_06
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_01
ld [hl], STEP_TYPE_01
ret
; 51b8
@@ -217,9 +217,9 @@ Movement_step_end: ; 51c1
ld hl, VramState
res 7, [hl]
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_01
ld [hl], STEP_TYPE_01
ret
; 51db
@@ -238,9 +238,9 @@ Movement_48: ; 51db
add hl, bc
ld [hl], a
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_03
ld [hl], STEP_TYPE_03
ld hl, VramState
res 7, [hl]
@@ -264,11 +264,11 @@ Movement_remove_person: ; 51fd
Movement_4b: ; 5210
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $1
ld [hl], PERSON_ACTION_01
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_04
ld [hl], STEP_TYPE_04
ld hl, VramState
res 7, [hl]
@@ -319,13 +319,13 @@ Movement_step_sleep_common: ; 5247
add hl, bc
ld [hl], a
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_03
ld [hl], STEP_TYPE_03
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $1
ld [hl], PERSON_ACTION_01
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
@@ -338,12 +338,12 @@ Movement_step_bump: ; 525f
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_0B
ld [hl], STEP_TYPE_0B
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $3
ld [hl], PERSON_ACTION_03
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], STANDING
@@ -351,16 +351,19 @@ Movement_step_bump: ; 525f
; 5279
Movement_56: ; 5279
ld a, $18
ld a, 24
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_03
ld [hl], STEP_TYPE_03
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $b
ld [hl], PERSON_ACTION_0B
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], STANDING
@@ -448,9 +451,11 @@ TurnHead: ; 52ee
ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $1
ld [hl], PERSON_ACTION_01
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], STANDING
@@ -721,12 +726,14 @@ HalfStep: ; 5400
ld hl, OBJECT_29
add hl, bc
ld [hl], a
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $2
ld hl, OBJECT_09
ld [hl], PERSON_ACTION_02
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_0A
ld [hl], STEP_TYPE_0A
ret
; 5412
@@ -735,34 +742,35 @@ NormalStep: ; 5412
call Function463f
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $2
ld hl, OBJECT_STANDING_TILE
ld [hl], PERSON_ACTION_02
ld hl, OBJECT_NEXT_TILE
add hl, bc
ld a, [hl]
call CheckSuperTallGrassTile
jr z, .asm_542d
jr z, .shake_grass
call Function1875
jr c, .asm_5430
jr c, .skip_grass
.asm_542d
.shake_grass
call ShakeGrass
.asm_5430
.skip_grass
ld hl, wd4cf
ld a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .asm_543f
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_02
ld [hl], STEP_TYPE_02
ret
.asm_543f
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_06
ld [hl], STEP_TYPE_06
ret
; 5446
@@ -771,20 +779,20 @@ TurningStep: ; 5446
call Function463f
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $4
ld [hl], PERSON_ACTION_04
ld hl, wd4cf
ld a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .asm_5461
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_02
ld [hl], STEP_TYPE_02
ret
.asm_5461
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_06
ld [hl], STEP_TYPE_06
ret
; 5468
@@ -794,20 +802,20 @@ SlideStep: ; 5468
call Function463f
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $1
ld [hl], PERSON_ACTION_01
ld hl, wd4cf
ld a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .asm_5483
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_02
ld [hl], STEP_TYPE_02
ret
.asm_5483
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_06
ld [hl], STEP_TYPE_06
ret
; 548a
@@ -822,20 +830,20 @@ JumpStep: ; 548a
res 3, [hl]
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], $2
ld [hl], PERSON_ACTION_02
call SpawnShadow
ld hl, wd4cf
ld a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .asm_54b1
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_08
ld [hl], STEP_TYPE_08
ret
.asm_54b1
ld hl, OBJECT_09
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], OBJECT_09_VALUE_09
ld [hl], STEP_TYPE_09
ret
; 54b8

60
engine/overworld.asm
View File

@@ -13,11 +13,11 @@ _ReplaceKrisSprite:: ; 14135
ld [hUsedSpriteIndex], a
ld a, [UsedSprites + 1]
ld [hUsedSpriteTile], a
call Function143c8
call GetUsedSprite
ret
; 14146
Function14146: ; 14146
Function14146: ; mobile
ld hl, wSpriteFlags
ld a, [hl]
push af
@@ -29,7 +29,7 @@ Function14146: ; 14146
ret
; 14157
Function14157: ; 14157
Function14157: ; mobile
ld hl, wSpriteFlags
ld a, [hl]
push af
@@ -168,23 +168,23 @@ endr
RunCallback_04: ; 14209
ld a, $4
call RunMapCallback
call Function1439b
call Function14215
call GetUsedSprites
call .LoadMiscTiles
ret
; 14215
Function14215: ; 14215
.LoadMiscTiles: ; 14215
ld a, [wSpriteFlags]
bit 6, a
ret nz
ld c, EMOTE_08
ld c, EMOTE_SHADOW
callba LoadEmote
call GetMapPermission
call CheckOutdoorMap
ld c, EMOTE_0B
jr z, .outdoor
ld c, EMOTE_0A
ld c, EMOTE_BOULDER_DUST
.outdoor
callba LoadEmote
ret
@@ -575,29 +575,34 @@ GetSpriteLength: ; 14386
; 1439b
Function1439b: ; 1439b
GetUsedSprites: ; 1439b
ld hl, UsedSprites
ld c, SPRITE_GFX_LIST_CAPACITY
.loop
ld a, [wSpriteFlags]
res 5, a
ld [wSpriteFlags], a
ld a, [hli]
and a
jr z, .done
ld [hUsedSpriteIndex], a
ld a, [hli]
ld [hUsedSpriteTile], a
bit 7, a
jr z, .dont_set
ld a, [wSpriteFlags]
set 5, a
set 5, a ; load VBank0
ld [wSpriteFlags], a
.dont_set
push bc
push hl
call Function143c8
call GetUsedSprite
pop hl
pop bc
dec c
@@ -607,7 +612,7 @@ Function1439b: ; 1439b
ret
; 143c8
Function143c8: ; 143c8
GetUsedSprite: ; 143c8
ld a, [hUsedSpriteIndex]
call SafeGetSprite
ld a, [hUsedSpriteTile]
@@ -632,14 +637,17 @@ endr
ld d, h
ld e, l
pop hl
ld a, [wSpriteFlags]
bit 5, a
jr nz, .done
bit 6, a
jr nz, .done
ld a, [hUsedSpriteIndex]
call _DoesSpriteHaveFacings
jr c, .done
ld a, h
add $8
ld h, a
@@ -716,7 +724,7 @@ LoadEmote:: ; 1442f
emote_header: MACRO
dw \1
db \2 tiles, BANK(\1)
dw \3
dw VTiles1 tile \3
ENDM
EmotesPointers: ; 144d
@@ -724,18 +732,18 @@ EmotesPointers: ; 144d
; db length, bank
; dw dest address
emote_header ShockEmote, 4, VTiles1 tile $78
emote_header QuestionEmote, 4, VTiles1 tile $78
emote_header HappyEmote, 4, VTiles1 tile $78
emote_header SadEmote, 4, VTiles1 tile $78
emote_header HeartEmote, 4, VTiles1 tile $78
emote_header BoltEmote, 4, VTiles1 tile $78
emote_header SleepEmote, 4, VTiles1 tile $78
emote_header FishEmote, 4, VTiles1 tile $78
emote_header JumpShadowGFX, 1, VTiles1 tile $7c
emote_header FishingRodGFX2, 2, VTiles1 tile $7c
emote_header BoulderDustGFX, 2, VTiles1 tile $7e
emote_header FishingRodGFX4, 1, VTiles1 tile $7e
emote_header ShockEmote, 4, $78
emote_header QuestionEmote, 4, $78
emote_header HappyEmote, 4, $78
emote_header SadEmote, 4, $78
emote_header HeartEmote, 4, $78
emote_header BoltEmote, 4, $78
emote_header SleepEmote, 4, $78
emote_header FishEmote, 4, $78
emote_header JumpShadowGFX, 1, $7c
emote_header FishingRodGFX2, 2, $7c
emote_header BoulderDustGFX, 2, $7e
emote_header FishingRodGFX4, 1, $7e
; 14495