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

Fix some movement macro/function names

Browse Source
This commit is contained in:
PikalaxALT
2015-11-15 21:28:15 -05:00
parent 434c97a146
commit aba038a4a4
12 changed files with 218 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
constants/map_constants.asm
View File

@@ -530,7 +530,7 @@ const_value SET 1
const OBJECT_STEP_TYPE const OBJECT_STEP_TYPE
const OBJECT_STEP_DURATION const OBJECT_STEP_DURATION
const OBJECT_ACTION const OBJECT_ACTION
const OBJECT_12 const OBJECT_STEP_FRAME
const OBJECT_FACING_STEP const OBJECT_FACING_STEP
const OBJECT_NEXT_TILE const OBJECT_NEXT_TILE
const OBJECT_STANDING_TILE const OBJECT_STANDING_TILE
@@ -652,7 +652,10 @@ NUM_SPAWNS EQU const_value
const PALETTE_MORN const PALETTE_MORN
const PALETTE_DARK const PALETTE_DARK
INVISIBLE EQU 0
FIXED_FACING EQU 2 FIXED_FACING EQU 2
SLIDING EQU 3
EMOTE_OBJECT EQU 7
const_def const_def
const PERSONTYPE_SCRIPT const PERSONTYPE_SCRIPT

48
constants/sprite_constants.asm
View File

@@ -269,20 +269,20 @@ MAX_OUTDOOR_SPRITES EQU 23
const_def const_def
const STEP_TYPE_00 const STEP_TYPE_00
const STEP_TYPE_01 ; standing const STEP_TYPE_01
const STEP_TYPE_02 ; walking const STEP_TYPE_02 ; walking
const STEP_TYPE_03 ; bumping const STEP_TYPE_03 ; stationary
const STEP_TYPE_04 const STEP_TYPE_04
const STEP_TYPE_05 const STEP_TYPE_05
const STEP_TYPE_06 const STEP_TYPE_06
const STEP_TYPE_07 const STEP_TYPE_07
const STEP_TYPE_08 const STEP_TYPE_08
const STEP_TYPE_09 const STEP_TYPE_09
const STEP_TYPE_0A const STEP_TYPE_0A ; half step
const STEP_TYPE_0B const STEP_TYPE_0B ; bump
const STEP_TYPE_0C const STEP_TYPE_TELEPORT_FROM
const STEP_TYPE_0D const STEP_TYPE_TELEPORT_TO
const STEP_TYPE_0E const STEP_TYPE_SKYFALL
const STEP_TYPE_0F const STEP_TYPE_0F
const STEP_TYPE_10 const STEP_TYPE_10
const STEP_TYPE_11 const STEP_TYPE_11
@@ -313,3 +313,37 @@ MAX_OUTDOOR_SPRITES EQU 23
const PERSON_ACTION_0E const PERSON_ACTION_0E
const PERSON_ACTION_0F const PERSON_ACTION_0F
const PERSON_ACTION_10 const PERSON_ACTION_10
const_def
const FACING_00
const FACING_01
const FACING_02
const FACING_03
const FACING_04
const FACING_05
const FACING_06
const FACING_07
const FACING_08
const FACING_09
const FACING_0A
const FACING_0B
const FACING_0C
const FACING_0D
const FACING_0E
const FACING_0F
const FACING_10
const FACING_11
const FACING_12
const FACING_13
const FACING_14
const FACING_15
const FACING_16
const FACING_17
const FACING_18
const FACING_19
const FACING_1A
const FACING_1B
const FACING_1C
const FACING_1D
const FACING_1E
const FACING_1F

2
engine/events.asm
View File

@@ -245,7 +245,7 @@ Function967d1: ; 967d1
; 967e1 ; 967e1
Function967e1: ; 967e1 Function967e1: ; 967e1
callba RefreshMapAppearDisappear callba _UpdateSprites
callba Functiond4d2 callba Functiond4d2
callba PlaceMapNameSign callba PlaceMapNameSign
ret ret

4
engine/facings.asm
View File

@@ -185,7 +185,7 @@ Facing21: ; shadow
db 0, 8, 4 | X_FLIP, $fc db 0, 8, 4 | X_FLIP, $fc
; 41a3 ; 41a3
Facing23: ; big doll Facing23: ; big snorlax or lapras doll
db 16 ; # db 16 ; #
db 0, 0, 0, $00 db 0, 0, 0, $00
db 0, 8, 0, $01 db 0, 8, 0, $01
@@ -221,7 +221,7 @@ Facing27: ; 41f5
db 8, 0, X_FLIP, $07 db 8, 0, X_FLIP, $07
; 4206 ; 4206
Facing22: ; 4206 Facing22: ; big doll other than snorlax or lapras
db 14 ; # db 14 ; #
db 0, 0, 0, $00 db 0, 0, 0, $00
db 0, 8, 0, $01 db 0, 8, 0, $01

228
engine/map_objects.asm
View File

File diff suppressed because it is too large Load Diff

64
engine/movement.asm
View File

@@ -59,7 +59,7 @@ MovementPointers: ; 5075
dw Movement_39 ; 39 dw Movement_39 ; 39
dw Movement_remove_fixed_facing ; 3a dw Movement_remove_fixed_facing ; 3a
dw Movement_fix_facing ; 3b dw Movement_fix_facing ; 3b
dw Movement_3c ; 3c dw Movement_show_person ; 3c
dw Movement_hide_person ; 3d dw Movement_hide_person ; 3d
dw Movement_step_sleep_1 ; 3e dw Movement_step_sleep_1 ; 3e
dw Movement_step_sleep_2 ; 3f dw Movement_step_sleep_2 ; 3f
@@ -78,8 +78,8 @@ MovementPointers: ; 5075
dw Movement_teleport_from ; 4c dw Movement_teleport_from ; 4c
dw Movement_teleport_to ; 4d dw Movement_teleport_to ; 4d
dw Movement_skyfall ; 4e dw Movement_skyfall ; 4e
dw Movement_step_wait5 ; 4f dw Movement_step_dig ; 4f
dw Movement_step_bump ; 50 dw Movement_step_bump ; 50
dw Movement_fish_got_bite ; 51 dw Movement_fish_got_bite ; 51
dw Movement_fish_cast_rod ; 52 dw Movement_fish_cast_rod ; 52
dw Movement_hide_emote ; 53 dw Movement_hide_emote ; 53
@@ -87,7 +87,7 @@ MovementPointers: ; 5075
dw Movement_step_shake ; 55 dw Movement_step_shake ; 55
dw Movement_56 ; 56 dw Movement_56 ; 56
dw Movement_rock_smash ; 57 dw Movement_rock_smash ; 57
dw Movement_58 ; 58 dw Movement_return_dig ; 58
dw Movement_59 ; 59 dw Movement_59 ; 59
; 5129 ; 5129
@@ -95,21 +95,21 @@ MovementPointers: ; 5075
Movement_teleport_from: ; 5129 Movement_teleport_from: ; 5129
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_0C ld [hl], STEP_TYPE_TELEPORT_FROM
ret ret
; 5130 ; 5130
Movement_teleport_to: ; 5130 Movement_teleport_to: ; 5130
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_0D ld [hl], STEP_TYPE_TELEPORT_TO
ret ret
; 5137 ; 5137
Movement_skyfall: ; 5137 Movement_skyfall: ; 5137
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_0E ld [hl], STEP_TYPE_SKYFALL
ret ret
; 513e ; 513e
@@ -120,11 +120,11 @@ Movement_59: ; 513e
ret ret
; 5145 ; 5145
Movement_step_wait5: ; 5145 Movement_step_dig: ; 5145
call GetSpriteDirection call GetSpriteDirection
rlca rlca
rlca rlca
ld hl, OBJECT_12 ld hl, OBJECT_STEP_FRAME
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ld hl, OBJECT_ACTION ld hl, OBJECT_ACTION
@@ -143,11 +143,11 @@ Movement_step_wait5: ; 5145
ret ret
; 516a ; 516a
Movement_58: ; 516a Movement_return_dig: ; 516a
call GetSpriteDirection call GetSpriteDirection
rlca rlca
rlca rlca
ld hl, OBJECT_12 ld hl, OBJECT_STEP_FRAME
add hl, bc add hl, bc
ld [hl], a ld [hl], a
call GetMovementByte call GetMovementByte
@@ -334,16 +334,19 @@ Movement_step_sleep_common: ; 5247
; 525f ; 525f
Movement_step_bump: ; 525f Movement_step_bump: ; 525f
ld a, $1 ld a, 1
ld hl, OBJECT_STEP_DURATION ld hl, OBJECT_STEP_DURATION
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_0B ld [hl], STEP_TYPE_0B
ld hl, OBJECT_ACTION ld hl, OBJECT_ACTION
add hl, bc add hl, bc
ld [hl], PERSON_ACTION_03 ld [hl], PERSON_ACTION_03
ld hl, OBJECT_DIRECTION_WALKING ld hl, OBJECT_DIRECTION_WALKING
add hl, bc add hl, bc
ld [hl], STANDING ld [hl], STANDING
@@ -373,14 +376,14 @@ Movement_56: ; 5279
Movement_38: ; 5293 Movement_38: ; 5293
ld hl, OBJECT_FLAGS1 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
res 3, [hl] res SLIDING, [hl]
jp ContinueReadingMovement jp ContinueReadingMovement
; 529c ; 529c
Movement_39: ; 529c Movement_39: ; 529c
ld hl, OBJECT_FLAGS1 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
set 3, [hl] set SLIDING, [hl]
jp ContinueReadingMovement jp ContinueReadingMovement
; 52a5 ; 52a5
@@ -398,17 +401,17 @@ Movement_fix_facing: ; 52ae
jp ContinueReadingMovement jp ContinueReadingMovement
; 52b7 ; 52b7
Movement_3c: ; 52b7 Movement_show_person: ; 52b7
ld hl, OBJECT_FLAGS1 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
res 0, [hl] res INVISIBLE, [hl]
jp ContinueReadingMovement jp ContinueReadingMovement
; 52c0 ; 52c0
Movement_hide_person: ; 52c0 Movement_hide_person: ; 52c0
ld hl, OBJECT_FLAGS1 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
set 0, [hl] set INVISIBLE, [hl]
jp ContinueReadingMovement jp ContinueReadingMovement
; 52c9 ; 52c9
@@ -760,14 +763,14 @@ NormalStep: ; 5412
ld hl, wd4cf ld hl, wd4cf
ld a, [hMapObjectIndexBuffer] ld a, [hMapObjectIndexBuffer]
cp [hl] cp [hl]
jr z, .asm_543f jr z, .step_type_06
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_02 ld [hl], STEP_TYPE_02
ret ret
.asm_543f .step_type_06
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_06 ld [hl], STEP_TYPE_06
@@ -777,19 +780,22 @@ NormalStep: ; 5412
TurningStep: ; 5446 TurningStep: ; 5446
call Function4690 call Function4690
call Function463f call Function463f
ld hl, OBJECT_ACTION ld hl, OBJECT_ACTION
add hl, bc add hl, bc
ld [hl], PERSON_ACTION_04 ld [hl], PERSON_ACTION_04
ld hl, wd4cf ld hl, wd4cf
ld a, [hMapObjectIndexBuffer] ld a, [hMapObjectIndexBuffer]
cp [hl] cp [hl]
jr z, .asm_5461 jr z, .step_type_06
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_02 ld [hl], STEP_TYPE_02
ret ret
.asm_5461 .step_type_06
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_06 ld [hl], STEP_TYPE_06
@@ -800,19 +806,22 @@ TurningStep: ; 5446
SlideStep: ; 5468 SlideStep: ; 5468
call Function4690 call Function4690
call Function463f call Function463f
ld hl, OBJECT_ACTION ld hl, OBJECT_ACTION
add hl, bc add hl, bc
ld [hl], PERSON_ACTION_01 ld [hl], PERSON_ACTION_01
ld hl, wd4cf ld hl, wd4cf
ld a, [hMapObjectIndexBuffer] ld a, [hMapObjectIndexBuffer]
cp [hl] cp [hl]
jr z, .asm_5483 jr z, .step_type_06
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_02 ld [hl], STEP_TYPE_02
ret ret
.asm_5483 .step_type_06
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_06 ld [hl], STEP_TYPE_06
@@ -825,23 +834,28 @@ JumpStep: ; 548a
ld hl, OBJECT_31 ld hl, OBJECT_31
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
ld hl, OBJECT_FLAGS2 ld hl, OBJECT_FLAGS2
add hl, bc add hl, bc
res 3, [hl] res 3, [hl]
ld hl, OBJECT_ACTION ld hl, OBJECT_ACTION
add hl, bc add hl, bc
ld [hl], PERSON_ACTION_02 ld [hl], PERSON_ACTION_02
call SpawnShadow call SpawnShadow
ld hl, wd4cf ld hl, wd4cf
ld a, [hMapObjectIndexBuffer] ld a, [hMapObjectIndexBuffer]
cp [hl] cp [hl]
jr z, .asm_54b1 jr z, .step_type_09
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_08 ld [hl], STEP_TYPE_08
ret ret
.asm_54b1 .step_type_09
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_09 ld [hl], STEP_TYPE_09

2
engine/scripting.asm
View File

@@ -1284,7 +1284,7 @@ Script_disappear: ; 0x972ee
ld a, [hMapObjectIndexBuffer] ld a, [hMapObjectIndexBuffer]
ld b, 1 ; set ld b, 1 ; set
call ApplyEventActionAppearDisappear call ApplyEventActionAppearDisappear
callba RefreshMapAppearDisappear callba _UpdateSprites
ret ret
; 0x9730b ; 0x9730b

24
event/forced_movement.asm
View File

@@ -28,41 +28,33 @@ Script_ForcedMovement:: ; 0x1253d
; 0x12564 ; 0x12564
.MovementData_up: ; 0x12564 .MovementData_up: ; 0x12564
step_wait5 step_dig 16
big_step_down
turn_in_down turn_in_down
step_wait5 step_dig 16
big_step_down
turn_head_down turn_head_down
step_end step_end
; 0x1256b ; 0x1256b
.MovementData_down: ; 0x1256b .MovementData_down: ; 0x1256b
step_wait5 step_dig 16
big_step_down
turn_in_up turn_in_up
step_wait5 step_dig 16
big_step_down
turn_head_up turn_head_up
step_end step_end
; 0x12572 ; 0x12572
.MovementData_right: ; 0x12572 .MovementData_right: ; 0x12572
step_wait5 step_dig 16
big_step_down
turn_in_left turn_in_left
step_wait5 step_dig 16
big_step_down
turn_head_left turn_head_left
step_end step_end
; 0x12579 ; 0x12579
.MovementData_left: ; 0x12579 .MovementData_left: ; 0x12579
step_wait5 step_dig 16
big_step_down
turn_in_right turn_in_right
step_wait5 step_dig 16
big_step_down
turn_head_right turn_head_right
step_end step_end
; 0x12580 ; 0x12580

2
home/map_objects.asm
View File

@@ -649,7 +649,7 @@ UpdateSprites:: ; 1ad2
bit 0, a bit 0, a
ret z ret z
callba Function55e0 callba Function55e0
callba RefreshMapAppearDisappear callba _UpdateSprites
ret ret
; 1ae5 ; 1ae5

22
macros/movement.asm
View File

@@ -292,10 +292,9 @@ fix_facing: macro
db movement_fix_facing ; $3b db movement_fix_facing ; $3b
endm endm
enum movement_return_dig enum movement_show_person
return_dig: macro show_person: macro
db movement_return_dig db movement_show_person ; $3c
db \1
endm endm
enum movement_hide_person enum movement_hide_person
@@ -354,6 +353,8 @@ step_end: macro
db movement_step_end ; $47 db movement_step_end ; $47
endm endm
; Whatever Movement_48 is, it takes a one-byte parameter
__enum__ = $49 __enum__ = $49
enum movement_remove_person enum movement_remove_person
@@ -383,9 +384,10 @@ skyfall: macro
db movement_skyfall ; $4e db movement_skyfall ; $4e
endm endm
enum movement_step_wait5 enum movement_step_dig
step_wait5: macro step_dig: macro
db movement_step_wait5 ; $4f db movement_step_dig ; $4f
db \1
endm endm
enum movement_step_bump enum movement_step_bump
@@ -425,3 +427,9 @@ rock_smash: macro
db movement_rock_smash ; $57 db movement_rock_smash ; $57
db \1 db \1
endm endm
enum movement_return_dig
return_dig: macro
db movement_return_dig ; $58
db \1
endm

27
main.asm
View File

@@ -1522,7 +1522,7 @@ Function6473: ; 6473
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld [hWY], a ld [hWY], a
callba Function64db ; no need to callba callba Function64db ; no need to farcall
ld a, VBGMap0 / $100 ld a, VBGMap0 / $100
call Function64b9 call Function64b9
xor a xor a
@@ -5571,26 +5571,25 @@ UsedDigOrEscapeRopeScript: ; 0xcc3c
closetext closetext
loadmovesprites loadmovesprites
playsound SFX_WARP_TO playsound SFX_WARP_TO
applymovement PLAYER, MovementData_0xcc59 applymovement PLAYER, .DigOut
farscall Script_AbortBugContest farscall Script_AbortBugContest
special WarpToSpawnPoint special WarpToSpawnPoint
writecode VAR_MOVEMENT, $0 writecode VAR_MOVEMENT, $0
newloadmap MAPSETUP_DOOR newloadmap MAPSETUP_DOOR
playsound SFX_WARP_FROM playsound SFX_WARP_FROM
applymovement PLAYER, MovementData_0xcc5d applymovement PLAYER, .DigReturn
end end
; 0xcc59 ; 0xcc59
MovementData_0xcc59: ; 0xcc59 .DigOut: ; 0xcc59
step_wait5 step_dig 32
turn_away_down
hide_person hide_person
step_end step_end
; 0xcc5d ; 0xcc5d
MovementData_0xcc5d: ; 0xcc5d .DigReturn: ; 0xcc5d
return_dig $58 show_person
turn_away_down return_dig 32
step_end step_end
; 0xcc61 ; 0xcc61
@@ -5669,22 +5668,22 @@ Script_UsedTeleport: ; 0xccbb
reloadmappart reloadmappart
loadmovesprites loadmovesprites
playsound SFX_WARP_TO playsound SFX_WARP_TO
applymovement PLAYER, MovementData_0xcce1 applymovement PLAYER, .TeleportFrom
farscall Script_AbortBugContest farscall Script_AbortBugContest
special WarpToSpawnPoint special WarpToSpawnPoint
writecode VAR_MOVEMENT, $0 writecode VAR_MOVEMENT, $0
newloadmap MAPSETUP_TELEPORT newloadmap MAPSETUP_TELEPORT
playsound SFX_WARP_FROM playsound SFX_WARP_FROM
applymovement PLAYER, MovementData_0xcce3 applymovement PLAYER, .TeleportTo
end end
; 0xcce1 ; 0xcce1
MovementData_0xcce1: ; cce1 .TeleportFrom: ; cce1
teleport_from teleport_from
step_end step_end
; cce3 ; cce3
MovementData_0xcce3: ; cce3 .TeleportTo: ; cce3
teleport_to teleport_to
step_end step_end
; cce5 ; cce5
@@ -50690,7 +50689,7 @@ LoadMapTimeOfDay: ; 104750
ret ret
Function104770: ; 104770 (41:4770) Function104770: ; 104770 (41:4770)
ld a, $98 ld a, VBGMap0 / $100
ld [wBGMapAnchor + 1], a ld [wBGMapAnchor + 1], a
xor a xor a
ld [wBGMapAnchor], a ld [wBGMapAnchor], a

3
wram.asm
View File

@@ -325,6 +325,7 @@ wMovementPerson:: ds 1
wMovementDataPointer:: ds 3 ; dba wMovementDataPointer:: ds 3 ; dba
wc2e6:: ds 4 wc2e6:: ds 4
wc2ea:: ds 1 wc2ea:: ds 1
wc2eb::
wMovementPointer:: ds 2 ; c2eb wMovementPointer:: ds 2 ; c2eb
ds 3 ds 3
@@ -2219,7 +2220,7 @@ object_struct: MACRO
\1StepType:: ds 1 \1StepType:: ds 1
\1StepDuration:: ds 1 \1StepDuration:: ds 1
\1Action:: ds 1 \1Action:: ds 1
\1Object12:: ds 1 \1ObjectStepFrame:: ds 1
\1Facing:: ds 1 \1Facing:: ds 1
\1NextTile:: ds 1 ; collision \1NextTile:: ds 1 ; collision
\1StandingTile:: ds 1 ; collision \1StandingTile:: ds 1 ; collision