mirror of https://github.com/pret/pokecrystal.git
Clarify big doll-related constants (Snorlax and Lapras are symmetrical, Onix is not)
This commit is contained in:
Rangi
parent
cb733954c6
commit
006d9f6441
|
|
@ -102,7 +102,7 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
|
|||
const SPRITEMOVEDATA_12 ; 12
|
||||
const SPRITEMOVEDATA_FOLLOWING ; 13
|
||||
const SPRITEMOVEDATA_SCRIPTED ; 14
|
||||
const SPRITEMOVEDATA_SNORLAX ; 15
|
||||
const SPRITEMOVEDATA_BIGDOLLSYM ; 15
|
||||
const SPRITEMOVEDATA_POKEMON ; 16
|
||||
const SPRITEMOVEDATA_SUDOWOODO ; 17
|
||||
const SPRITEMOVEDATA_SMASHABLE_ROCK ; 18
|
||||
|
|
@ -113,7 +113,7 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
|
|||
const SPRITEMOVEDATA_SCREENSHAKE ; 1d
|
||||
const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e
|
||||
const SPRITEMOVEDATA_SPINCLOCKWISE ; 1f
|
||||
const SPRITEMOVEDATA_20 ; 20
|
||||
const SPRITEMOVEDATA_BIGDOLLASYM ; 20
|
||||
const SPRITEMOVEDATA_BIGDOLL ; 21
|
||||
const SPRITEMOVEDATA_BOULDERDUST ; 22
|
||||
const SPRITEMOVEDATA_GRASS ; 23
|
||||
|
|
@ -192,10 +192,10 @@ SPRITEMOVEDATA_FIELDS EQU 6
|
|||
const OBJECT_ACTION_FISHING ; 06
|
||||
const OBJECT_ACTION_SHADOW ; 07
|
||||
const OBJECT_ACTION_EMOTE ; 08
|
||||
const OBJECT_ACTION_BIG_SNORLAX ; 09
|
||||
const OBJECT_ACTION_BIG_DOLL_SYM ; 09
|
||||
const OBJECT_ACTION_BOUNCE ; 0a
|
||||
const OBJECT_ACTION_WEIRD_TREE ; 0b
|
||||
const OBJECT_ACTION_BIG_LAPRAS ; 0c
|
||||
const OBJECT_ACTION_BIG_DOLL_ASYM ; 0c
|
||||
const OBJECT_ACTION_BIG_DOLL ; 0d
|
||||
const OBJECT_ACTION_BOULDER_DUST ; 0e
|
||||
const OBJECT_ACTION_GRASS_SHAKE ; 0f
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ SpriteMovementData:: ; 4273
|
|||
sprite_movement_data SPRITEMOVEFN_0E, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_12
|
||||
sprite_movement_data SPRITEMOVEFN_FOLLOW, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; SPRITEMOVEDATA_FOLLOWING
|
||||
sprite_movement_data SPRITEMOVEFN_SCRIPTED, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; SPRITEMOVEDATA_SCRIPTED
|
||||
sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX, DOWN, OBJECT_ACTION_BIG_SNORLAX, $2e, $01, %1100 ; SPRITEMOVEDATA_SNORLAX
|
||||
sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX, DOWN, OBJECT_ACTION_BIG_DOLL_SYM, $2e, $01, %1100 ; SPRITEMOVEDATA_BIGDOLLSYM
|
||||
sprite_movement_data SPRITEMOVEFN_BOUNCE, DOWN, OBJECT_ACTION_BOUNCE, $2e, $00, %0000 ; SPRITEMOVEDATA_POKEMON
|
||||
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $0c, $00, %0000 ; SPRITEMOVEDATA_SUDOWOODO
|
||||
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $2e, $10, %0000 ; SPRITEMOVEDATA_SMASHABLE_ROCK
|
||||
|
|
@ -38,7 +38,7 @@ SpriteMovementData:: ; 4273
|
|||
sprite_movement_data SPRITEMOVEFN_SCREENSHAKE, DOWN, OBJECT_ACTION_00, $82, $00, %0000 ; SPRITEMOVEDATA_SCREENSHAKE
|
||||
sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
|
||||
sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE, RIGHT, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_SPINCLOCKWISE
|
||||
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_LAPRAS, $2e, $01, %1100 ; SPRITEMOVEDATA_20
|
||||
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_DOLL_ASYM, $2e, $01, %1100 ; SPRITEMOVEDATA_BIGDOLLASYM
|
||||
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_DOLL, $2e, $01, %1100 ; SPRITEMOVEDATA_BIGDOLL
|
||||
sprite_movement_data SPRITEMOVEFN_BOULDERDUST, DOWN, OBJECT_ACTION_BOULDER_DUST, $8e, $01, %0000 ; SPRITEMOVEDATA_BOULDERDUST
|
||||
sprite_movement_data SPRITEMOVEFN_GRASS, DOWN, OBJECT_ACTION_GRASS_SHAKE, $8e, $02, %0000 ; SPRITEMOVEDATA_GRASS
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ Movement types:
|
|||
|
||||
- `SPRITEMOVEDATA_SPINRANDOM_FAST`
|
||||
|
||||
- `SPRITEMOVEDATA_SNORLAX`
|
||||
- `SPRITEMOVEDATA_BIGDOLLSYM`
|
||||
|
||||
- `SPRITEMOVEDATA_POKEMON`
|
||||
|
||||
|
|
@ -150,6 +150,8 @@ Movement types:
|
|||
|
||||
- `SPRITEMOVEDATA_SPINCLOCKWISE`
|
||||
|
||||
- `SPRITEMOVEDATA_BIGDOLLASYM`
|
||||
|
||||
- `SPRITEMOVEDATA_BIGDOLL`
|
||||
|
||||
- `SPRITEMOVEDATA_LAPRAS`
|
||||
|
|
|
|||
|
|
@ -792,7 +792,7 @@ MapObjectMovementPattern: ; 47dd
|
|||
ld [hl], STANDING
|
||||
ld hl, OBJECT_ACTION
|
||||
add hl, bc
|
||||
ld [hl], OBJECT_ACTION_BIG_SNORLAX
|
||||
ld [hl], OBJECT_ACTION_BIG_DOLL_SYM
|
||||
ld hl, OBJECT_STEP_TYPE
|
||||
add hl, bc
|
||||
ld [hl], STEP_TYPE_04
|
||||
|
|
@ -1103,20 +1103,20 @@ SetRandomStepDuration: ; 4b2d
|
|||
StepTypesJumptable: ; 4b45
|
||||
; entries correspond to STEP_TYPE_* constants
|
||||
dw ObjectMovementReset ; 00
|
||||
dw MapObjectMovementPattern ; unused
|
||||
dw NPCStep ; 02 npc walk
|
||||
dw MapObjectMovementPattern ; 01
|
||||
dw NPCStep ; 02
|
||||
dw StepType03 ; 03
|
||||
dw StepType04 ; 04
|
||||
dw StepType05 ; 05
|
||||
dw PlayerStep ; 06 player walk
|
||||
dw PlayerStep ; 06
|
||||
dw StepType07 ; 07
|
||||
dw NPCJump ; 08 npc jump step
|
||||
dw PlayerJump ; 09 player jump step
|
||||
dw PlayerOrNPCTurnStep ; 0a half step
|
||||
dw NPCJump ; 08
|
||||
dw PlayerJump ; 09
|
||||
dw PlayerOrNPCTurnStep ; 0a
|
||||
dw StepTypeBump ; 0b
|
||||
dw TeleportFrom ; 0c teleport from
|
||||
dw TeleportTo ; 0d teleport to
|
||||
dw Skyfall ; 0e skyfall
|
||||
dw TeleportFrom ; 0c
|
||||
dw TeleportTo ; 0d
|
||||
dw Skyfall ; 0e
|
||||
dw StepType0f ; 0f
|
||||
dw GotBiteStep ; 10
|
||||
dw RockSmashStep ; 11
|
||||
|
|
|
|||
|
|
@ -496,7 +496,7 @@ Unreferenced_Function7113:
|
|||
ld hl, OBJECT_MOVEMENTTYPE
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
cp SPRITEMOVEDATA_SNORLAX
|
||||
cp SPRITEMOVEDATA_BIGDOLLSYM
|
||||
jr nz, .not_snorlax
|
||||
call Function7171
|
||||
jr c, .yes
|
||||
|
|
|
|||
|
|
@ -297,5 +297,5 @@ VermilionCity_MapEvents:
|
|||
object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
|
||||
object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1
|
||||
object_event 14, 16, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1
|
||||
object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
|
||||
object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
|
||||
object_event 31, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1
|
||||
|
|
|
|||
Loading…
Reference in New Issue