mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
SPRITEMOVEDATA
This commit is contained in:
PikalaxALT
parent
8153737bae
commit
fda1f7c01a
@ -38,3 +38,5 @@ const_value SET 1
|
||||
const ANIM_GFX_ANGELS
|
||||
const ANIM_GFX_WAVE
|
||||
const ANIM_GFX_AEROBLAST
|
||||
|
||||
TILESIZE EQU $10
|
||||
|
||||
@ -572,10 +572,10 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
|
||||
OBJECT_STRUCT_3_DATA_WIDTH EQU 6
|
||||
OBJECT_STRUCT_3_DATA_HEIGHT EQU 37
|
||||
|
||||
OW_DOWN EQU $0
|
||||
OW_UP EQU $4
|
||||
OW_LEFT EQU $8
|
||||
OW_RIGHT EQU $c
|
||||
OW_DOWN EQU DOWN << 2
|
||||
OW_UP EQU UP << 2
|
||||
OW_LEFT EQU LEFT << 2
|
||||
OW_RIGHT EQU RIGHT << 2
|
||||
|
||||
const_def
|
||||
const EMOTE_SHOCK ; 0
|
||||
@ -586,10 +586,8 @@ OW_RIGHT EQU $c
|
||||
const EMOTE_BOLT ; 5
|
||||
const EMOTE_SLEEP ; 6
|
||||
const EMOTE_FISH ; 7
|
||||
const EMOTE_ROD_DOWN ; 8
|
||||
const EMOTE_ROD_UP ; 9
|
||||
const EMOTE_ROD_LEFT ; a
|
||||
const EMOTE_ROD_RIGHT ; b
|
||||
const EMOTE_ROD ; 8 - add directional constant
|
||||
EMOTE_MEM EQU -1
|
||||
|
||||
const_def
|
||||
const SIGNPOST_READ
|
||||
|
||||
@ -181,7 +181,48 @@ const_value SET 1
|
||||
const PAL_OW_TREE
|
||||
const PAL_OW_ROCK
|
||||
|
||||
; sprite movements
|
||||
; sprite movement data table indices
|
||||
const_def
|
||||
const SPRITEMOVEDATA_00
|
||||
const SPRITEMOVEDATA_01
|
||||
const SPRITEMOVEDATA_02
|
||||
const SPRITEMOVEDATA_03
|
||||
const SPRITEMOVEDATA_WALK_UP_DOWN
|
||||
const SPRITEMOVEDATA_WALK_LEFT_RIGHT
|
||||
const SPRITEMOVEDATA_STANDING_DOWN
|
||||
const SPRITEMOVEDATA_STANDING_UP
|
||||
const SPRITEMOVEDATA_STANDING_LEFT
|
||||
const SPRITEMOVEDATA_STANDING_RIGHT
|
||||
const SPRITEMOVEDATA_0A
|
||||
const SPRITEMOVEDATA_0B
|
||||
const SPRITEMOVEDATA_0C
|
||||
const SPRITEMOVEDATA_0D
|
||||
const SPRITEMOVEDATA_0E
|
||||
const SPRITEMOVEDATA_0F
|
||||
const SPRITEMOVEDATA_10
|
||||
const SPRITEMOVEDATA_11
|
||||
const SPRITEMOVEDATA_12
|
||||
const SPRITEMOVEDATA_13
|
||||
const SPRITEMOVEDATA_14
|
||||
const SPRITEMOVEDATA_15
|
||||
const SPRITEMOVEDATA_16
|
||||
const SPRITEMOVEDATA_17
|
||||
const SPRITEMOVEDATA_18
|
||||
const SPRITEMOVEDATA_19
|
||||
const SPRITEMOVEDATA_1A
|
||||
const SPRITEMOVEDATA_1B
|
||||
const SPRITEMOVEDATA_1C
|
||||
const SPRITEMOVEDATA_1D
|
||||
const SPRITEMOVEDATA_1E
|
||||
const SPRITEMOVEDATA_1F
|
||||
const SPRITEMOVEDATA_20
|
||||
const SPRITEMOVEDATA_21
|
||||
const SPRITEMOVEDATA_22
|
||||
const SPRITEMOVEDATA_23
|
||||
const SPRITEMOVEDATA_24
|
||||
const SPRITEMOVEDATA_25
|
||||
|
||||
; sprite movement functions
|
||||
const_def
|
||||
const SPRITEMOVEFN_00
|
||||
const SPRITEMOVEFN_01
|
||||
@ -211,12 +252,3 @@ const_value SET 1
|
||||
const SPRITEMOVEFN_19
|
||||
const SPRITEMOVEFN_1A
|
||||
const SPRITEMOVEFN_1B
|
||||
const SPRITEMOVEFN_1C
|
||||
const SPRITEMOVEFN_1D
|
||||
const SPRITEMOVEFN_1E
|
||||
const SPRITEMOVEFN_1F
|
||||
const SPRITEMOVEFN_20
|
||||
const SPRITEMOVEFN_21
|
||||
const SPRITEMOVEFN_22
|
||||
const SPRITEMOVEFN_23
|
||||
const SPRITEMOVEFN_24
|
||||
|
||||
@ -2,44 +2,45 @@
|
||||
INCLUDE "engine/facings.asm"
|
||||
|
||||
ObjectStruct3_Data:: ; 4273
|
||||
db $00, $00, $01, $02, $00, $00 ; 00
|
||||
db $06, $00, $01, $0c, $00, $00 ; 01
|
||||
db $03, $00, $01, $00, $00, $00 ; 02
|
||||
db $04, $00, $01, $00, $00, $00 ; 03
|
||||
db $01, $00, $01, $00, $00, $00 ; 04
|
||||
db $02, $00, $01, $00, $00, $00 ; 05
|
||||
db $06, $00, $01, $00, $00, $00 ; 06
|
||||
db $06, $01, $01, $00, $00, $00 ; 07
|
||||
db $06, $02, $01, $00, $00, $00 ; 08
|
||||
db $06, $03, $01, $00, $00, $00 ; 09
|
||||
db $05, $00, $01, $00, $00, $00 ; 0a
|
||||
db $07, $00, $01, $02, $00, $00 ; 0b
|
||||
db $08, $00, $01, $00, $00, $00 ; 0c
|
||||
db $09, $00, $01, $00, $00, $00 ; 0d
|
||||
db $0a, $00, $01, $00, $00, $00 ; 0e
|
||||
db $0b, $00, $01, $00, $00, $00 ; 0f
|
||||
db $0c, $00, $01, $00, $00, $00 ; 10
|
||||
db $0d, $00, $01, $00, $00, $00 ; 11
|
||||
db $0e, $00, $01, $00, $00, $00 ; 12
|
||||
db $0f, $00, $01, $02, $00, $00 ; 13
|
||||
db $10, $00, $01, $02, $00, $00 ; 14
|
||||
db $15, $00, $09, $2e, $01, $c0 ; 15
|
||||
db $16, $00, $0a, $2e, $00, $00 ; 16
|
||||
db $06, $00, $01, $0c, $00, $00 ; 17
|
||||
db $06, $00, $01, $2e, $10, $00 ; 18
|
||||
db $11, $00, $01, $2e, $00, $40 ; 19
|
||||
db $12, $00, $01, $02, $00, $00 ; 1a
|
||||
db $13, $00, $00, $8e, $01, $00 ; 1b
|
||||
db $14, $00, $08, $8e, $02, $00 ; 1c
|
||||
db $17, $00, $00, $82, $00, $00 ; 1d
|
||||
db $19, $02, $01, $00, $00, $00 ; 1e
|
||||
db $18, $03, $01, $00, $00, $00 ; 1f
|
||||
db $11, $00, $0c, $2e, $01, $c0 ; 20
|
||||
db $11, $00, $0d, $2e, $01, $c0 ; 21
|
||||
db $1a, $00, $0e, $8e, $01, $00 ; 22
|
||||
db $1b, $00, $0f, $8e, $02, $00 ; 23
|
||||
db $03, $00, $01, $00, $00, $20 ; 24
|
||||
db $00, $00, $01, $00, $00, $00 ; 25
|
||||
; function, facing, ?, ?, ?, ?
|
||||
db SPRITEMOVEFN_00, DOWN, $01, $02, $00, $00 ; 00
|
||||
db SPRITEMOVEFN_06, DOWN, $01, $0c, $00, $00 ; 01
|
||||
db SPRITEMOVEFN_03, DOWN, $01, $00, $00, $00 ; 02
|
||||
db SPRITEMOVEFN_04, DOWN, $01, $00, $00, $00 ; 03
|
||||
db SPRITEMOVEFN_01, DOWN, $01, $00, $00, $00 ; 04
|
||||
db SPRITEMOVEFN_02, DOWN, $01, $00, $00, $00 ; 05
|
||||
db SPRITEMOVEFN_06, DOWN, $01, $00, $00, $00 ; 06
|
||||
db SPRITEMOVEFN_06, UP, $01, $00, $00, $00 ; 07
|
||||
db SPRITEMOVEFN_06, LEFT, $01, $00, $00, $00 ; 08
|
||||
db SPRITEMOVEFN_06, RIGHT, $01, $00, $00, $00 ; 09
|
||||
db SPRITEMOVEFN_05, DOWN, $01, $00, $00, $00 ; 0a
|
||||
db SPRITEMOVEFN_07, DOWN, $01, $02, $00, $00 ; 0b
|
||||
db SPRITEMOVEFN_08, DOWN, $01, $00, $00, $00 ; 0c
|
||||
db SPRITEMOVEFN_09, DOWN, $01, $00, $00, $00 ; 0d
|
||||
db SPRITEMOVEFN_0A, DOWN, $01, $00, $00, $00 ; 0e
|
||||
db SPRITEMOVEFN_0B, DOWN, $01, $00, $00, $00 ; 0f
|
||||
db SPRITEMOVEFN_0C, DOWN, $01, $00, $00, $00 ; 10
|
||||
db SPRITEMOVEFN_0D, DOWN, $01, $00, $00, $00 ; 11
|
||||
db SPRITEMOVEFN_0E, DOWN, $01, $00, $00, $00 ; 12
|
||||
db SPRITEMOVEFN_0F, DOWN, $01, $02, $00, $00 ; 13
|
||||
db SPRITEMOVEFN_10, DOWN, $01, $02, $00, $00 ; 14
|
||||
db SPRITEMOVEFN_15, DOWN, $09, $2e, $01, $c0 ; 15
|
||||
db SPRITEMOVEFN_16, DOWN, $0a, $2e, $00, $00 ; 16
|
||||
db SPRITEMOVEFN_06, DOWN, $01, $0c, $00, $00 ; 17
|
||||
db SPRITEMOVEFN_06, DOWN, $01, $2e, $10, $00 ; 18
|
||||
db SPRITEMOVEFN_11, DOWN, $01, $2e, $00, $40 ; 19
|
||||
db SPRITEMOVEFN_12, DOWN, $01, $02, $00, $00 ; 1a
|
||||
db SPRITEMOVEFN_13, DOWN, $00, $8e, $01, $00 ; 1b
|
||||
db SPRITEMOVEFN_14, DOWN, $08, $8e, $02, $00 ; 1c
|
||||
db SPRITEMOVEFN_17, DOWN, $00, $82, $00, $00 ; 1d
|
||||
db SPRITEMOVEFN_19, LEFT, $01, $00, $00, $00 ; 1e
|
||||
db SPRITEMOVEFN_18, RIGHT, $01, $00, $00, $00 ; 1f
|
||||
db SPRITEMOVEFN_11, DOWN, $0c, $2e, $01, $c0 ; 20
|
||||
db SPRITEMOVEFN_11, DOWN, $0d, $2e, $01, $c0 ; 21
|
||||
db SPRITEMOVEFN_1A, DOWN, $0e, $8e, $01, $00 ; 22
|
||||
db SPRITEMOVEFN_1B, DOWN, $0f, $8e, $02, $00 ; 23
|
||||
db SPRITEMOVEFN_03, DOWN, $01, $00, $00, $20 ; 24
|
||||
db SPRITEMOVEFN_00, DOWN, $01, $00, $00, $00 ; 25
|
||||
; 4357
|
||||
|
||||
|
||||
@ -158,7 +159,7 @@ Function43f3: ; 43f3
|
||||
ld hl, OBJECT_FLAGS2
|
||||
add hl, bc
|
||||
bit 5, [hl]
|
||||
jr nz, .not_bit5
|
||||
jr nz, .bit5
|
||||
cp 1
|
||||
jr z, .one
|
||||
jr .ok
|
||||
@ -168,7 +169,7 @@ Function43f3: ; 43f3
|
||||
ld hl, OBJECT_FLAGS2
|
||||
add hl, bc
|
||||
bit 5, [hl]
|
||||
jr nz, .not_bit5
|
||||
jr nz, .bit5
|
||||
|
||||
.one
|
||||
call Function47dd
|
||||
@ -185,7 +186,7 @@ Function43f3: ; 43f3
|
||||
rst JumpTable
|
||||
ret
|
||||
|
||||
.not_bit5
|
||||
.bit5
|
||||
ret
|
||||
; 4427
|
||||
|
||||
@ -2690,7 +2691,7 @@ Function5582: ; 5582
|
||||
; 55ac
|
||||
|
||||
Function55ac: ; 55ac
|
||||
call Function1a13
|
||||
call FindFirstEmptyObjectStruct
|
||||
ret nc
|
||||
ld d, h
|
||||
ld e, l
|
||||
@ -3312,7 +3313,7 @@ Function5903: ; 5903
|
||||
rrca
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, .data_591c
|
||||
ld hl, .standing_movefns
|
||||
add hl, de
|
||||
ld a, [hl]
|
||||
ld hl, OBJECT_03
|
||||
@ -3323,8 +3324,11 @@ Function5903: ; 5903
|
||||
ld [hl], 0
|
||||
ret
|
||||
|
||||
.data_591c
|
||||
db 6, 7, 8, 9
|
||||
.standing_movefns
|
||||
db SPRITEMOVEDATA_STANDING_DOWN
|
||||
db SPRITEMOVEDATA_STANDING_UP
|
||||
db SPRITEMOVEDATA_STANDING_LEFT
|
||||
db SPRITEMOVEDATA_STANDING_RIGHT
|
||||
; 5920
|
||||
|
||||
RefreshMapAppearDisappear:: ; 5920
|
||||
|
||||
@ -1417,7 +1417,7 @@ Script_showemote: ; 0x97396
|
||||
; 0x973b6
|
||||
|
||||
ShowEmoteScript: ; 973b6
|
||||
loademote -1
|
||||
loademote EMOTE_MEM
|
||||
applymovement2 .Show
|
||||
pause 0
|
||||
applymovement2 .Hide
|
||||
|
||||
@ -115,7 +115,7 @@ SpecialsPointers:: ; c029
|
||||
add_special RandomPhoneWildMon
|
||||
add_special RandomPhoneMon
|
||||
add_special RunCallback_04
|
||||
add_special Functionfb841
|
||||
add_special PlaySlowCry
|
||||
add_special SpecialSnorlaxAwake
|
||||
add_special Special_YoungerHaircutBrother
|
||||
add_special Special_OlderHaircutBrother
|
||||
|
||||
@ -77,7 +77,7 @@ SpecialBuenaPrize: ; 8afd4
|
||||
|
||||
.asm_8afeb
|
||||
ld hl, UnknownText_0x8b072
|
||||
call Function105a
|
||||
call BuenaPrintText
|
||||
|
||||
.asm_8aff1
|
||||
call DelayFrame
|
||||
@ -91,7 +91,7 @@ SpecialBuenaPrize: ; 8afd4
|
||||
ld [wd265], a
|
||||
call GetItemName
|
||||
ld hl, UnknownText_0x8b077
|
||||
call Function105a
|
||||
call BuenaPrintText
|
||||
call YesNoBox
|
||||
jr c, .asm_8afeb
|
||||
|
||||
@ -135,7 +135,7 @@ SpecialBuenaPrize: ; 8afd4
|
||||
ld hl, UnknownText_0x8b07c
|
||||
|
||||
.asm_8b05a
|
||||
call Function105a
|
||||
call BuenaPrintText
|
||||
jr .asm_8afeb
|
||||
|
||||
.asm_8b05f
|
||||
|
||||
@ -453,7 +453,10 @@ Function19e9:: ; 19e9
|
||||
|
||||
|
||||
|
||||
Function1a13:: ; 1a13
|
||||
FindFirstEmptyObjectStruct:: ; 1a13
|
||||
; Returns the index of the first empty object struct in A and its address in HL, then sets carry.
|
||||
; If all object structs are occupied, A = 0 and Z is set.
|
||||
; Preserves BC and DE.
|
||||
push bc
|
||||
push de
|
||||
ld hl, ObjectStructs
|
||||
@ -462,15 +465,15 @@ Function1a13:: ; 1a13
|
||||
.loop
|
||||
ld a, [hl]
|
||||
and a
|
||||
jr z, .empty
|
||||
jr z, .break
|
||||
add hl, de
|
||||
dec c
|
||||
jr nz, .loop
|
||||
xor a
|
||||
jr .done
|
||||
|
||||
.empty
|
||||
ld a, $d
|
||||
.break
|
||||
ld a, NUM_OBJECT_STRUCTS
|
||||
sub c
|
||||
scf
|
||||
|
||||
@ -547,7 +550,7 @@ Function1a71:: ; 1a71
|
||||
push de
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, ObjectStruct3_Data + 1
|
||||
ld hl, ObjectStruct3_Data + 1 ; facing?
|
||||
rept OBJECT_STRUCT_3_DATA_WIDTH
|
||||
add hl, de
|
||||
endr
|
||||
|
||||
@ -175,7 +175,7 @@ RadioTerminator:: ; 1052
|
||||
|
||||
PrintText:: ; 1057
|
||||
call SetUpTextBox
|
||||
Function105a:: ; 105a
|
||||
BuenaPrintText:: ; 105a
|
||||
push hl
|
||||
hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
|
||||
lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW
|
||||
|
||||
63
main.asm
63
main.asm
@ -1402,8 +1402,9 @@ endr
|
||||
; If bit 2 of [wcf65] is set, get the second dw; else, get the first dw
|
||||
ld a, [wcf65]
|
||||
and %00000100
|
||||
rept 2
|
||||
srl a
|
||||
srl a
|
||||
endr
|
||||
ld e, a
|
||||
ld d, 0
|
||||
rept 2
|
||||
@ -3235,7 +3236,7 @@ PlayerObjectTemplate: ; 8071
|
||||
; A dummy map object used to initialize the player object.
|
||||
; Shorter than the actual amount copied by two bytes.
|
||||
; Said bytes seem to be unused.
|
||||
person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEFN_0B, 15, 15, -1, -1, 0, 0, 0, NONE, -1
|
||||
person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_0B, 15, 15, -1, -1, 0, 0, 0, NONE, -1
|
||||
; 807e
|
||||
|
||||
CopyDECoordsToMapObject:: ; 807e
|
||||
@ -6268,7 +6269,7 @@ Script_NotEvenANibble2: ; 0xd027
|
||||
writetext UnknownText_0xd0a9
|
||||
|
||||
Script_NotEvenANibble_FallThrough: ; 0xd02d
|
||||
loademote $8
|
||||
loademote EMOTE_ROD + DOWN
|
||||
callasm PutTheRodAway
|
||||
loadmovesprites
|
||||
end
|
||||
@ -6337,11 +6338,11 @@ Fishing_CheckFacingUp: ; d06c
|
||||
|
||||
Script_FishCastRod: ; 0xd07c
|
||||
reloadmappart
|
||||
loadvar $ffd4, $0
|
||||
loadvar hBGMapMode, $0
|
||||
special UpdateTimePals
|
||||
loademote $9
|
||||
loademote EMOTE_ROD + UP
|
||||
callasm Functionb84b3
|
||||
loademote $0
|
||||
loademote EMOTE_SHOCK
|
||||
applymovement PLAYER, MovementData_0xd093
|
||||
pause 40
|
||||
end
|
||||
@ -16728,32 +16729,32 @@ GetSpriteLength: ; 14386
|
||||
Function1439b: ; 1439b
|
||||
ld hl, UsedSprites
|
||||
ld c, SPRITE_GFX_LIST_CAPACITY
|
||||
.asm_143a0
|
||||
.loop
|
||||
ld a, [wd13e]
|
||||
res 5, a
|
||||
ld [wd13e], a
|
||||
ld a, [hli]
|
||||
and a
|
||||
jr z, .asm_143c7
|
||||
jr z, .done
|
||||
ld [$ffbd], a
|
||||
ld a, [hli]
|
||||
ld [$ffbe], a
|
||||
bit 7, a
|
||||
jr z, .asm_143bd
|
||||
jr z, .dont_set
|
||||
ld a, [wd13e]
|
||||
set 5, a
|
||||
ld [wd13e], a
|
||||
|
||||
.asm_143bd
|
||||
.dont_set
|
||||
push bc
|
||||
push hl
|
||||
call Function143c8
|
||||
pop hl
|
||||
pop bc
|
||||
dec c
|
||||
jr nz, .asm_143a0
|
||||
jr nz, .loop
|
||||
|
||||
.asm_143c7
|
||||
.done
|
||||
ret
|
||||
; 143c8
|
||||
|
||||
@ -16800,17 +16801,17 @@ endr
|
||||
; 14406
|
||||
|
||||
Function14406: ; 14406
|
||||
and $7f
|
||||
and (VTiles1 - VTiles0) / $10 - 1
|
||||
ld l, a
|
||||
ld h, $0
|
||||
ld h, 0
|
||||
rept 4
|
||||
add hl, hl
|
||||
endr
|
||||
ld a, l
|
||||
add $0
|
||||
add VTiles0 % $100
|
||||
ld l, a
|
||||
ld a, h
|
||||
adc $80
|
||||
adc VTiles0 / $100
|
||||
ld h, a
|
||||
ret
|
||||
; 14418
|
||||
@ -16868,51 +16869,51 @@ EmotesPointers: ; 144d
|
||||
; dw dest address
|
||||
|
||||
dw ShockEmote
|
||||
db $40, BANK(ShockEmote)
|
||||
db 4 * $10, BANK(ShockEmote)
|
||||
dw VTiles1 tile $78
|
||||
|
||||
dw QuestionEmote
|
||||
db $40, BANK(QuestionEmote)
|
||||
db 4 * $10, BANK(QuestionEmote)
|
||||
dw VTiles1 tile $78
|
||||
|
||||
dw HappyEmote
|
||||
db $40, BANK(HappyEmote)
|
||||
db 4 * $10, BANK(HappyEmote)
|
||||
dw VTiles1 tile $78
|
||||
|
||||
dw SadEmote
|
||||
db $40, BANK(SadEmote)
|
||||
db 4 * $10, BANK(SadEmote)
|
||||
dw VTiles1 tile $78
|
||||
|
||||
dw HeartEmote
|
||||
db $40, BANK(HeartEmote)
|
||||
db 4 * $10, BANK(HeartEmote)
|
||||
dw VTiles1 tile $78
|
||||
|
||||
dw BoltEmote
|
||||
db $40, BANK(BoltEmote)
|
||||
db 4 * $10, BANK(BoltEmote)
|
||||
dw VTiles1 tile $78
|
||||
|
||||
dw SleepEmote
|
||||
db $40, BANK(SleepEmote)
|
||||
db 4 * $10, BANK(SleepEmote)
|
||||
dw VTiles1 tile $78
|
||||
|
||||
dw FishEmote
|
||||
db $40, BANK(FishEmote)
|
||||
db 4 * $10, BANK(FishEmote)
|
||||
dw VTiles1 tile $78
|
||||
|
||||
dw FishingRodGFX + $00
|
||||
db $10, BANK(FishingRodGFX)
|
||||
db 1 * $10, BANK(FishingRodGFX)
|
||||
dw VTiles1 tile $7c
|
||||
|
||||
dw FishingRodGFX + $10
|
||||
db $20, BANK(FishingRodGFX)
|
||||
db 2 * $10, BANK(FishingRodGFX)
|
||||
dw VTiles1 tile $7c
|
||||
|
||||
dw FishingRodGFX + $30
|
||||
db $20, BANK(FishingRodGFX)
|
||||
db 2 * $10, BANK(FishingRodGFX)
|
||||
dw VTiles1 tile $7e
|
||||
|
||||
dw FishingRodGFX + $50
|
||||
db $10, BANK(FishingRodGFX)
|
||||
db 1 * $10, BANK(FishingRodGFX)
|
||||
dw VTiles1 tile $7e
|
||||
|
||||
; 14495
|
||||
@ -23215,18 +23216,16 @@ Function2471a: ; 2471a
|
||||
ld a, [wcf95]
|
||||
call GetFarByte
|
||||
ld [wd144], a
|
||||
; Store [wcf92] + [wd0e4] in c
|
||||
; if ([wd144] + 1) < [wcf92] + [wd0e4]: [wd0e4] = max(([wd144] + 1) - [wcf92], 0)
|
||||
ld a, [wcf92]
|
||||
ld c, a
|
||||
ld a, [wd0e4]
|
||||
add c
|
||||
ld c, a
|
||||
; If [wd144] > c, skip this next part.
|
||||
ld a, [wd144]
|
||||
inc a
|
||||
cp c
|
||||
jr nc, .skip
|
||||
; If [wd144] > [wcf92], store ([wd144] - [wcf92]) in [wd0e4]. Else, store 0 in [wd0e4].
|
||||
ld a, [wcf92]
|
||||
ld c, a
|
||||
ld a, [wd144]
|
||||
@ -76007,7 +76006,7 @@ KantoMonSpecials: ; fb656
|
||||
INCLUDE "event/name_rater.asm"
|
||||
|
||||
|
||||
Functionfb841: ; fb841
|
||||
PlaySlowCry: ; fb841
|
||||
ld a, [ScriptVar]
|
||||
call LoadCryHeader
|
||||
jr c, .done
|
||||
|
||||
@ -371,10 +371,10 @@ AzaleaGym_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 7
|
||||
person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript, -1
|
||||
person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherbenny, -1
|
||||
person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
|
||||
person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
|
||||
person_event SPRITE_TWIN, 10, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
|
||||
person_event SPRITE_TWIN, 10, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
|
||||
person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1
|
||||
person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript, -1
|
||||
person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherbenny, -1
|
||||
person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
|
||||
person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
|
||||
person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
|
||||
person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
|
||||
person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1
|
||||
|
||||
@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 3
|
||||
person_event SPRITE_CLERK, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
|
||||
person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEFN_07, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
|
||||
person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEFN_05, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1
|
||||
person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
|
||||
person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
|
||||
person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1
|
||||
|
||||
@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 4
|
||||
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
|
||||
person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
|
||||
person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
|
||||
person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1
|
||||
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
|
||||
person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
|
||||
person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
|
||||
person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_02, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1
|
||||
|
||||
@ -481,15 +481,15 @@ AzaleaTown_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 12
|
||||
person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
|
||||
person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEFN_02, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
|
||||
person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEFN_04, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
|
||||
person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
|
||||
person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||
person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||
person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||
person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||
person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
|
||||
person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
|
||||
person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
|
||||
person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
|
||||
person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
|
||||
person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_02, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
|
||||
person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
|
||||
person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
|
||||
person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||
person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||
person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||
person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||
person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
|
||||
person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
|
||||
person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
|
||||
person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
|
||||
|
||||
@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 5
|
||||
person_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
|
||||
person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
|
||||
person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEFN_05, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
|
||||
person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
|
||||
person_event SPRITE_GRANNY, 3, 14, SPRITEMOVEFN_04, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1
|
||||
person_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
|
||||
person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
|
||||
person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
|
||||
person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
|
||||
person_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1
|
||||
|
||||
@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 2
|
||||
person_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
|
||||
person_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
|
||||
person_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
|
||||
person_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
|
||||
|
||||
@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 1
|
||||
person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1
|
||||
person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1
|
||||
|
||||
@ -98,4 +98,4 @@ BattleTowerHallway_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 1
|
||||
person_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1
|
||||
person_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1
|
||||
|
||||
@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 4
|
||||
person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
|
||||
person_event SPRITE_BUENA, 11, 13, SPRITEMOVEFN_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
|
||||
person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEFN_05, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
|
||||
person_event SPRITE_LASS, 24, 12, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
|
||||
person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
|
||||
person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
|
||||
person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
|
||||
person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
|
||||
|
||||
@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 1
|
||||
person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEFN_07, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1
|
||||
person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user