You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Reworked person_event arguments
This commit is contained in:
PikalaxALT
@@ -805,7 +805,7 @@ LoadNote: ; e83d1
|
|||||||
|
|
||||||
Functione8466: ; e8466
|
Functione8466: ; e8466
|
||||||
; handle vibrato and other things
|
; handle vibrato and other things
|
||||||
; unknowns: wc292, $c294
|
; unknowns: wc292, wc294
|
||||||
ld hl, Channel1Flags2 - Channel1
|
ld hl, Channel1Flags2 - Channel1
|
||||||
add hl, bc
|
add hl, bc
|
||||||
bit 2, [hl]
|
bit 2, [hl]
|
||||||
|
|||||||
@@ -709,8 +709,8 @@ const_value SET 1
|
|||||||
const MAPOBJECT_SPRITE ; 1
|
const MAPOBJECT_SPRITE ; 1
|
||||||
const MAPOBJECT_Y_COORD ; 2
|
const MAPOBJECT_Y_COORD ; 2
|
||||||
const MAPOBJECT_X_COORD ; 3
|
const MAPOBJECT_X_COORD ; 3
|
||||||
const MAPOBJECT_FACING ; 4
|
const MAPOBJECT_MOVEMENT ; 4
|
||||||
const MAPOBJECT_MOVEMENT ; 5
|
const MAPOBJECT_RADIUS ; 5
|
||||||
const MAPOBJECT_HOUR ; 6
|
const MAPOBJECT_HOUR ; 6
|
||||||
const MAPOBJECT_TIMEOFDAY ; 7
|
const MAPOBJECT_TIMEOFDAY ; 7
|
||||||
const MAPOBJECT_COLOR ; 8
|
const MAPOBJECT_COLOR ; 8
|
||||||
@@ -794,3 +794,39 @@ const_value = -1
|
|||||||
const SPAWN_MT_SILVER
|
const SPAWN_MT_SILVER
|
||||||
const SPAWN_FAST_SHIP
|
const SPAWN_FAST_SHIP
|
||||||
NUM_SPAWNS EQU const_value
|
NUM_SPAWNS EQU const_value
|
||||||
|
|
||||||
|
const_def
|
||||||
|
const SPRITEMOVEFN_00
|
||||||
|
const SPRITEMOVEFN_01
|
||||||
|
const SPRITEMOVEFN_02
|
||||||
|
const SPRITEMOVEFN_03
|
||||||
|
const SPRITEMOVEFN_04
|
||||||
|
const SPRITEMOVEFN_05
|
||||||
|
const SPRITEMOVEFN_06
|
||||||
|
const SPRITEMOVEFN_07
|
||||||
|
const SPRITEMOVEFN_08
|
||||||
|
const SPRITEMOVEFN_09
|
||||||
|
const SPRITEMOVEFN_0A
|
||||||
|
const SPRITEMOVEFN_0B
|
||||||
|
const SPRITEMOVEFN_0C
|
||||||
|
const SPRITEMOVEFN_0D
|
||||||
|
const SPRITEMOVEFN_0E
|
||||||
|
const SPRITEMOVEFN_0F
|
||||||
|
const SPRITEMOVEFN_10
|
||||||
|
const SPRITEMOVEFN_11
|
||||||
|
const SPRITEMOVEFN_12
|
||||||
|
const SPRITEMOVEFN_13
|
||||||
|
const SPRITEMOVEFN_14
|
||||||
|
const SPRITEMOVEFN_15
|
||||||
|
const SPRITEMOVEFN_16
|
||||||
|
const SPRITEMOVEFN_17
|
||||||
|
const SPRITEMOVEFN_18
|
||||||
|
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
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
PARTYMON EQU 0
|
PARTYMON EQU 0
|
||||||
OTPARTYMON EQU 1
|
OTPARTYMON EQU 1
|
||||||
BOXMON EQU 2
|
BOXMON EQU 2
|
||||||
|
BREEDMON EQU 3
|
||||||
WILDMON EQU 4
|
WILDMON EQU 4
|
||||||
|
|
||||||
; Options: ; cfcc
|
; Options: ; cfcc
|
||||||
|
|||||||
@@ -2,44 +2,44 @@
|
|||||||
INCLUDE "engine/facings.asm"
|
INCLUDE "engine/facings.asm"
|
||||||
|
|
||||||
ObjectStruct3_Data:: ; 4273
|
ObjectStruct3_Data:: ; 4273
|
||||||
db $00, $00, $01, $02, $00, $00
|
db $00, $00, $01, $02, $00, $00 ; 00
|
||||||
db $06, $00, $01, $0c, $00, $00
|
db $06, $00, $01, $0c, $00, $00 ; 01
|
||||||
db $03, $00, $01, $00, $00, $00
|
db $03, $00, $01, $00, $00, $00 ; 02
|
||||||
db $04, $00, $01, $00, $00, $00
|
db $04, $00, $01, $00, $00, $00 ; 03
|
||||||
db $01, $00, $01, $00, $00, $00
|
db $01, $00, $01, $00, $00, $00 ; 04
|
||||||
db $02, $00, $01, $00, $00, $00
|
db $02, $00, $01, $00, $00, $00 ; 05
|
||||||
db $06, $00, $01, $00, $00, $00
|
db $06, $00, $01, $00, $00, $00 ; 06
|
||||||
db $06, $01, $01, $00, $00, $00
|
db $06, $01, $01, $00, $00, $00 ; 07
|
||||||
db $06, $02, $01, $00, $00, $00
|
db $06, $02, $01, $00, $00, $00 ; 08
|
||||||
db $06, $03, $01, $00, $00, $00
|
db $06, $03, $01, $00, $00, $00 ; 09
|
||||||
db $05, $00, $01, $00, $00, $00
|
db $05, $00, $01, $00, $00, $00 ; 0a
|
||||||
db $07, $00, $01, $02, $00, $00
|
db $07, $00, $01, $02, $00, $00 ; 0b
|
||||||
db $08, $00, $01, $00, $00, $00
|
db $08, $00, $01, $00, $00, $00 ; 0c
|
||||||
db $09, $00, $01, $00, $00, $00
|
db $09, $00, $01, $00, $00, $00 ; 0d
|
||||||
db $0a, $00, $01, $00, $00, $00
|
db $0a, $00, $01, $00, $00, $00 ; 0e
|
||||||
db $0b, $00, $01, $00, $00, $00
|
db $0b, $00, $01, $00, $00, $00 ; 0f
|
||||||
db $0c, $00, $01, $00, $00, $00
|
db $0c, $00, $01, $00, $00, $00 ; 10
|
||||||
db $0d, $00, $01, $00, $00, $00
|
db $0d, $00, $01, $00, $00, $00 ; 11
|
||||||
db $0e, $00, $01, $00, $00, $00
|
db $0e, $00, $01, $00, $00, $00 ; 12
|
||||||
db $0f, $00, $01, $02, $00, $00
|
db $0f, $00, $01, $02, $00, $00 ; 13
|
||||||
db $10, $00, $01, $02, $00, $00
|
db $10, $00, $01, $02, $00, $00 ; 14
|
||||||
db $15, $00, $09, $2e, $01, $c0
|
db $15, $00, $09, $2e, $01, $c0 ; 15
|
||||||
db $16, $00, $0a, $2e, $00, $00
|
db $16, $00, $0a, $2e, $00, $00 ; 16
|
||||||
db $06, $00, $01, $0c, $00, $00
|
db $06, $00, $01, $0c, $00, $00 ; 17
|
||||||
db $06, $00, $01, $2e, $10, $00
|
db $06, $00, $01, $2e, $10, $00 ; 18
|
||||||
db $11, $00, $01, $2e, $00, $40
|
db $11, $00, $01, $2e, $00, $40 ; 19
|
||||||
db $12, $00, $01, $02, $00, $00
|
db $12, $00, $01, $02, $00, $00 ; 1a
|
||||||
db $13, $00, $00, $8e, $01, $00
|
db $13, $00, $00, $8e, $01, $00 ; 1b
|
||||||
db $14, $00, $08, $8e, $02, $00
|
db $14, $00, $08, $8e, $02, $00 ; 1c
|
||||||
db $17, $00, $00, $82, $00, $00
|
db $17, $00, $00, $82, $00, $00 ; 1d
|
||||||
db $19, $02, $01, $00, $00, $00
|
db $19, $02, $01, $00, $00, $00 ; 1e
|
||||||
db $18, $03, $01, $00, $00, $00
|
db $18, $03, $01, $00, $00, $00 ; 1f
|
||||||
db $11, $00, $0c, $2e, $01, $c0
|
db $11, $00, $0c, $2e, $01, $c0 ; 20
|
||||||
db $11, $00, $0d, $2e, $01, $c0
|
db $11, $00, $0d, $2e, $01, $c0 ; 21
|
||||||
db $1a, $00, $0e, $8e, $01, $00
|
db $1a, $00, $0e, $8e, $01, $00 ; 22
|
||||||
db $1b, $00, $0f, $8e, $02, $00
|
db $1b, $00, $0f, $8e, $02, $00 ; 23
|
||||||
db $03, $00, $01, $00, $00, $20
|
db $03, $00, $01, $00, $00, $20 ; 24
|
||||||
db $00, $00, $01, $00, $00, $00
|
db $00, $00, $01, $00, $00, $00 ; 25
|
||||||
; 4357
|
; 4357
|
||||||
|
|
||||||
|
|
||||||
@@ -238,40 +238,40 @@ endr
|
|||||||
; 445f
|
; 445f
|
||||||
|
|
||||||
Pointers445f: ; 445f
|
Pointers445f: ; 445f
|
||||||
dw Function44a3
|
dw Function44a3 ; 00
|
||||||
dw Function44a3
|
dw Function44a3 ; 01
|
||||||
dw Function44b5
|
dw Function44b5 ; 02
|
||||||
dw Function44aa
|
dw Function44aa ; 03
|
||||||
dw Function44c1
|
dw Function44c1 ; 04
|
||||||
dw Function44aa
|
dw Function44aa ; 05
|
||||||
dw Function4508
|
dw Function4508 ; 06
|
||||||
dw Function44aa
|
dw Function44aa ; 07
|
||||||
dw Function4529
|
dw Function4529 ; 08
|
||||||
dw Function44aa
|
dw Function44aa ; 09
|
||||||
dw Function4539
|
dw Function4539 ; 0a
|
||||||
dw Function44a3
|
dw Function44a3 ; 0b
|
||||||
dw Function456e
|
dw Function456e ; 0c
|
||||||
dw Function456e
|
dw Function456e ; 0d
|
||||||
dw Function457b
|
dw Function457b ; 0e
|
||||||
dw Function44a3
|
dw Function44a3 ; 0f
|
||||||
dw Function4582
|
dw Function4582 ; 10
|
||||||
dw Function4582
|
dw Function4582 ; 11
|
||||||
dw Function4589
|
dw Function4589 ; 12
|
||||||
dw Function4589
|
dw Function4589 ; 13
|
||||||
dw Function4590
|
dw Function4590 ; 14
|
||||||
dw Function45a4
|
dw Function45a4 ; 15
|
||||||
dw Function45ab
|
dw Function45ab ; 16
|
||||||
dw Function44aa
|
dw Function44aa ; 17
|
||||||
dw Function45be
|
dw Function45be ; 18
|
||||||
dw Function45be
|
dw Function45be ; 19
|
||||||
dw Function45c5
|
dw Function45c5 ; 1a
|
||||||
dw Function45c5
|
dw Function45c5 ; 1b
|
||||||
dw Function45da
|
dw Function45da ; 1c
|
||||||
dw Function44a3
|
dw Function44a3 ; 1d
|
||||||
dw Function45ed
|
dw Function45ed ; 1e
|
||||||
dw Function44a3
|
dw Function44a3 ; 1f
|
||||||
dw Function44e4
|
dw Function44e4 ; 20
|
||||||
dw Function44aa
|
dw Function44aa ; 21
|
||||||
; 44a3
|
; 44a3
|
||||||
|
|
||||||
Function44a3: ; 44a3
|
Function44a3: ; 44a3
|
||||||
@@ -835,7 +835,7 @@ Function4769: ; 4769
|
|||||||
jr z, .ok
|
jr z, .ok
|
||||||
push bc
|
push bc
|
||||||
call GetMapObject
|
call GetMapObject
|
||||||
ld hl, MAPOBJECT_FACING
|
ld hl, MAPOBJECT_MOVEMENT
|
||||||
add hl, bc
|
add hl, bc
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
pop bc
|
pop bc
|
||||||
@@ -944,34 +944,34 @@ Function47dd: ; 47dd
|
|||||||
; 47e9
|
; 47e9
|
||||||
|
|
||||||
.Pointers ; 47e9
|
.Pointers ; 47e9
|
||||||
dw Function4821
|
dw Function4821 ; 00
|
||||||
dw Function4822
|
dw Function4822 ; 01
|
||||||
dw Function482c
|
dw Function482c ; 02
|
||||||
dw Function4838
|
dw Function4838 ; 03
|
||||||
dw Function4842
|
dw Function4842 ; 04
|
||||||
dw Function4851
|
dw Function4851 ; 05
|
||||||
dw Function4869
|
dw Function4869 ; 06
|
||||||
dw Function487c
|
dw Function487c ; 07
|
||||||
dw Function4882
|
dw Function4882 ; 08
|
||||||
dw Function4888
|
dw Function4888 ; 09
|
||||||
dw Function488e
|
dw Function488e ; 0a
|
||||||
dw Function4891
|
dw Function4891 ; 0b
|
||||||
dw Function4894
|
dw Function4894 ; 0c
|
||||||
dw Function4897
|
dw Function4897 ; 0d
|
||||||
dw Function489d
|
dw Function489d ; 0e
|
||||||
dw Function48a0
|
dw Function48a0 ; 0f
|
||||||
dw Function48a6
|
dw Function48a6 ; 10
|
||||||
dw Function48ac
|
dw Function48ac ; 11
|
||||||
dw Function48ff
|
dw Function48ff ; 12
|
||||||
dw Function49e5
|
dw Function49e5 ; 13
|
||||||
dw Function4a21
|
dw Function4a21 ; 14
|
||||||
dw Function4958
|
dw Function4958 ; 15
|
||||||
dw Function496e
|
dw Function496e ; 16
|
||||||
dw Function4abc
|
dw Function4abc ; 17
|
||||||
dw Function498d
|
dw Function498d ; 18
|
||||||
dw Function4984
|
dw Function4984 ; 19
|
||||||
dw Function4a46
|
dw Function4a46 ; 1a
|
||||||
dw Function4a89
|
dw Function4a89 ; 1b
|
||||||
; 4821
|
; 4821
|
||||||
|
|
||||||
Function4821: ; 4821
|
Function4821: ; 4821
|
||||||
@@ -3293,7 +3293,7 @@ Function58e3: ; 58e3
|
|||||||
jp z, Function5903
|
jp z, Function5903
|
||||||
push bc
|
push bc
|
||||||
call GetMapObject
|
call GetMapObject
|
||||||
ld hl, MAPOBJECT_FACING
|
ld hl, MAPOBJECT_MOVEMENT
|
||||||
add hl, bc
|
add hl, bc
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
pop bc
|
pop bc
|
||||||
|
|||||||
@@ -549,7 +549,7 @@ Function1a71:: ; 1a71
|
|||||||
ld d, 0
|
ld d, 0
|
||||||
ld hl, ObjectStruct3_Data + 1
|
ld hl, ObjectStruct3_Data + 1
|
||||||
rept OBJECT_STRUCT_3_DATA_WIDTH
|
rept OBJECT_STRUCT_3_DATA_WIDTH
|
||||||
add hl,de
|
add hl, de
|
||||||
endr
|
endr
|
||||||
ld b, h
|
ld b, h
|
||||||
ld c, l
|
ld c, l
|
||||||
|
|||||||
@@ -2,11 +2,11 @@ map: MACRO
|
|||||||
; This is a silly hack to get around an rgbds bug.
|
; This is a silly hack to get around an rgbds bug.
|
||||||
|
|
||||||
; Ideally:
|
; Ideally:
|
||||||
; db GROUP_\1, MAP_\1
|
db GROUP_\1, MAP_\1
|
||||||
|
|
||||||
\1\@ EQUS "GROUP_\1"
|
; \1\@ EQUS "GROUP_\1"
|
||||||
\1\@_2 EQUS "MAP_\1"
|
; \1\@_2 EQUS "MAP_\1"
|
||||||
db \1\@, \1\@_2
|
; db \1\@, \1\@_2
|
||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
roam_map: MACRO
|
roam_map: MACRO
|
||||||
@@ -23,16 +23,16 @@ roam_map: MACRO
|
|||||||
db 0
|
db 0
|
||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
|
|
||||||
person_event: macro
|
person_event: macro
|
||||||
db \1 ; sprite
|
db \1 ; sprite
|
||||||
db \2 ; y
|
db \2 ; y
|
||||||
db \3 ; x
|
db \3 ; x
|
||||||
db \4 ; facing
|
db \4 ; movement function
|
||||||
db \5 ; movement
|
dn \5, \6 ; radius: y, x
|
||||||
db \6 ; clock_hour
|
db \7 ; clock_hour
|
||||||
db \7 ; clock_daytime
|
db \8 ; clock_daytime
|
||||||
db \8 ; color_function
|
db \9 ; color_function
|
||||||
|
shift
|
||||||
db \9 ; sight_range
|
db \9 ; sight_range
|
||||||
shift
|
shift
|
||||||
dw \9 ; pointer
|
dw \9 ; pointer
|
||||||
@@ -163,14 +163,16 @@ endc
|
|||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
mapgroup: MACRO
|
mapgroup: MACRO
|
||||||
; map id, height, width
|
GROUP_\1 EQU const_value
|
||||||
\1\@ EQUS "GROUP_\1"
|
enum MAP_\1
|
||||||
\1\@_2 EQUS "MAP_\1"
|
|
||||||
\1\@ EQU const_value
|
|
||||||
enum \1\@_2
|
|
||||||
\1_HEIGHT EQU \2
|
\1_HEIGHT EQU \2
|
||||||
\1_WIDTH EQU \3
|
\1_WIDTH EQU \3
|
||||||
ENDM
|
ENDM
|
||||||
|
; map id, height, width
|
||||||
|
; \1\@ EQUS "GROUP_\1"
|
||||||
|
; \1\@_2 EQUS "MAP_\1"
|
||||||
|
; \1\@ EQU const_value
|
||||||
|
; enum \1\@_2
|
||||||
|
|
||||||
newgroup: MACRO
|
newgroup: MACRO
|
||||||
const_value = const_value + 1
|
const_value = const_value + 1
|
||||||
|
|||||||
88
main.asm
88
main.asm
@@ -3221,7 +3221,7 @@ PlayerObjectTemplate: ; 8071
|
|||||||
; A dummy map object used to initialize the player object.
|
; A dummy map object used to initialize the player object.
|
||||||
; Shorter than the actual amount copied by two bytes.
|
; Shorter than the actual amount copied by two bytes.
|
||||||
; Said bytes seem to be unused.
|
; Said bytes seem to be unused.
|
||||||
person_event SPRITE_CHRIS, 0, 0, OW_LEFT | $3, $ff, -1, -1, $0, 0, $0000, -1
|
person_event SPRITE_CHRIS, 0, 0, $0b, 15, 15, -1, -1, $0, 0, $0000, -1
|
||||||
; db $01, $00, $00, $0b, $ff, $ff, $ff, $00, $00, $00, $00, $ff, $ff
|
; db $01, $00, $00, $0b, $ff, $ff, $ff, $00, $00, $00, $00, $ff, $ff
|
||||||
; 807e
|
; 807e
|
||||||
|
|
||||||
@@ -3365,7 +3365,7 @@ Function811d: ; 811d
|
|||||||
ld [wc2f3], a
|
ld [wc2f3], a
|
||||||
|
|
||||||
.no_color
|
.no_color
|
||||||
ld hl, MAPOBJECT_FACING
|
ld hl, MAPOBJECT_MOVEMENT
|
||||||
add hl, bc
|
add hl, bc
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
ld [wc2f4], a
|
ld [wc2f4], a
|
||||||
@@ -3381,7 +3381,7 @@ Function811d: ; 811d
|
|||||||
add hl, bc
|
add hl, bc
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
ld [wc2f7], a
|
ld [wc2f7], a
|
||||||
ld hl, MAPOBJECT_MOVEMENT
|
ld hl, MAPOBJECT_RADIUS
|
||||||
add hl, bc
|
add hl, bc
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
ld [wc2f8], a
|
ld [wc2f8], a
|
||||||
@@ -6060,7 +6060,7 @@ GetFacingObject: ; cf0d
|
|||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
ld [hLastTalked], a
|
ld [hLastTalked], a
|
||||||
call GetMapObject
|
call GetMapObject
|
||||||
ld hl, MAPOBJECT_FACING
|
ld hl, MAPOBJECT_MOVEMENT
|
||||||
add hl, bc
|
add hl, bc
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
ld d, a
|
ld d, a
|
||||||
@@ -9508,7 +9508,7 @@ GivePoke:: ; e277
|
|||||||
call GetPokemonName
|
call GetPokemonName
|
||||||
ld hl, StringBuffer1
|
ld hl, StringBuffer1
|
||||||
ld de, wd050
|
ld de, wd050
|
||||||
ld bc, $000b
|
ld bc, PKMN_NAME_LENGTH
|
||||||
call CopyBytes
|
call CopyBytes
|
||||||
pop af
|
pop af
|
||||||
and a
|
and a
|
||||||
@@ -9520,7 +9520,7 @@ GivePoke:: ; e277
|
|||||||
push hl
|
push hl
|
||||||
ld a, [ScriptBank]
|
ld a, [ScriptBank]
|
||||||
call GetFarHalfword
|
call GetFarHalfword
|
||||||
ld bc, $000b
|
ld bc, PKMN_NAME_LENGTH
|
||||||
ld a, [ScriptBank]
|
ld a, [ScriptBank]
|
||||||
call FarCopyBytes
|
call FarCopyBytes
|
||||||
pop hl
|
pop hl
|
||||||
@@ -9548,7 +9548,7 @@ endr
|
|||||||
ld [de], a
|
ld [de], a
|
||||||
inc hl
|
inc hl
|
||||||
inc de
|
inc de
|
||||||
cp $50
|
cp "@"
|
||||||
jr nz, .asm_e32f
|
jr nz, .asm_e32f
|
||||||
ld a, [ScriptBank]
|
ld a, [ScriptBank]
|
||||||
call GetFarByte
|
call GetFarByte
|
||||||
@@ -49524,7 +49524,7 @@ Function50753: ; 50753
|
|||||||
jr c, .asm_50774
|
jr c, .asm_50774
|
||||||
|
|
||||||
ld a, d
|
ld a, d
|
||||||
cp 23
|
cp $17
|
||||||
jr nz, .asm_50774
|
jr nz, .asm_50774
|
||||||
|
|
||||||
ld a, $1
|
ld a, $1
|
||||||
@@ -49539,6 +49539,7 @@ Function50753: ; 50753
|
|||||||
|
|
||||||
|
|
||||||
_CardKey: ; 50779
|
_CardKey: ; 50779
|
||||||
|
; Are we even in the right map to use this?
|
||||||
ld a, [MapGroup]
|
ld a, [MapGroup]
|
||||||
cp GROUP_RADIO_TOWER_3F
|
cp GROUP_RADIO_TOWER_3F
|
||||||
jr nz, .nope
|
jr nz, .nope
|
||||||
@@ -49546,7 +49547,7 @@ _CardKey: ; 50779
|
|||||||
ld a, [MapNumber]
|
ld a, [MapNumber]
|
||||||
cp MAP_RADIO_TOWER_3F
|
cp MAP_RADIO_TOWER_3F
|
||||||
jr nz, .nope
|
jr nz, .nope
|
||||||
|
; Are we facing the slot?
|
||||||
ld a, [PlayerDirection]
|
ld a, [PlayerDirection]
|
||||||
and $c
|
and $c
|
||||||
cp OW_UP
|
cp OW_UP
|
||||||
@@ -49559,8 +49560,8 @@ _CardKey: ; 50779
|
|||||||
ld a, e
|
ld a, e
|
||||||
cp 6
|
cp 6
|
||||||
jr nz, .nope
|
jr nz, .nope
|
||||||
|
; Let's use the Card Key.
|
||||||
ld hl, UnknownScript_0x507af
|
ld hl, .CardKeyScript
|
||||||
call ExitMenuCallScript
|
call ExitMenuCallScript
|
||||||
ld a, $1
|
ld a, $1
|
||||||
ld [wd0ec], a
|
ld [wd0ec], a
|
||||||
@@ -49572,13 +49573,14 @@ _CardKey: ; 50779
|
|||||||
ret
|
ret
|
||||||
; 507af
|
; 507af
|
||||||
|
|
||||||
UnknownScript_0x507af: ; 0x507af
|
.CardKeyScript: ; 0x507af
|
||||||
loadmovesprites
|
loadmovesprites
|
||||||
farjump MapRadioTower3FSignpost2Script
|
farjump MapRadioTower3FSignpost2Script
|
||||||
; 0x507b4
|
; 0x507b4
|
||||||
|
|
||||||
|
|
||||||
_BasementKey: ; 507b4
|
_BasementKey: ; 507b4
|
||||||
|
; Are we even in the right map to use this?
|
||||||
ld a, [MapGroup]
|
ld a, [MapGroup]
|
||||||
cp GROUP_WAREHOUSE_ENTRANCE
|
cp GROUP_WAREHOUSE_ENTRANCE
|
||||||
jr nz, .nope
|
jr nz, .nope
|
||||||
@@ -49586,7 +49588,7 @@ _BasementKey: ; 507b4
|
|||||||
ld a, [MapNumber]
|
ld a, [MapNumber]
|
||||||
cp MAP_WAREHOUSE_ENTRANCE
|
cp MAP_WAREHOUSE_ENTRANCE
|
||||||
jr nz, .nope
|
jr nz, .nope
|
||||||
|
; Are we on the tile in front of the door?
|
||||||
call GetFacingTileCoord
|
call GetFacingTileCoord
|
||||||
ld a, d
|
ld a, d
|
||||||
cp 22
|
cp 22
|
||||||
@@ -49594,8 +49596,8 @@ _BasementKey: ; 507b4
|
|||||||
ld a, e
|
ld a, e
|
||||||
cp 10
|
cp 10
|
||||||
jr nz, .nope
|
jr nz, .nope
|
||||||
|
; Let's use the Basement Key
|
||||||
ld hl, UnlockBasementDoorScript
|
ld hl, .BasementKeyScript
|
||||||
call ExitMenuCallScript
|
call ExitMenuCallScript
|
||||||
ld a, 1
|
ld a, 1
|
||||||
ld [wd0ec], a
|
ld [wd0ec], a
|
||||||
@@ -49607,7 +49609,7 @@ _BasementKey: ; 507b4
|
|||||||
ret
|
ret
|
||||||
; 507e1
|
; 507e1
|
||||||
|
|
||||||
UnlockBasementDoorScript: ; 0x507e1
|
.BasementKeyScript: ; 0x507e1
|
||||||
loadmovesprites
|
loadmovesprites
|
||||||
farjump BasementDoorScript
|
farjump BasementDoorScript
|
||||||
; 0x507e6
|
; 0x507e6
|
||||||
@@ -49699,23 +49701,23 @@ Function5084a: ; 5084a
|
|||||||
ld hl, PartyMon1Species
|
ld hl, PartyMon1Species
|
||||||
ld bc, PartyMon2 - PartyMon1
|
ld bc, PartyMon2 - PartyMon1
|
||||||
and a
|
and a
|
||||||
jr z, .asm_5087b
|
jr z, .copywholestruct
|
||||||
ld hl, OTPartyMon1Species
|
ld hl, OTPartyMon1Species
|
||||||
ld bc, OTPartyMon2 - OTPartyMon1
|
ld bc, OTPartyMon2 - OTPartyMon1
|
||||||
cp $1
|
cp OTPARTYMON
|
||||||
jr z, .asm_5087b
|
jr z, .copywholestruct
|
||||||
ld bc, $0020
|
ld bc, BOXMON_STRUCT_LENGTH
|
||||||
callab Functione5bb
|
callab Functione5bb
|
||||||
jr .asm_5088a
|
jr .done
|
||||||
|
|
||||||
.asm_5087b
|
.copywholestruct
|
||||||
ld a, [CurPartyMon]
|
ld a, [CurPartyMon]
|
||||||
call AddNTimes
|
call AddNTimes
|
||||||
ld de, TempMonSpecies
|
ld de, TempMonSpecies
|
||||||
ld bc, PartyMon2 - PartyMon1
|
ld bc, PartyMon2 - PartyMon1
|
||||||
call CopyBytes
|
call CopyBytes
|
||||||
|
|
||||||
.asm_5088a
|
.done
|
||||||
ret
|
ret
|
||||||
; 5088b
|
; 5088b
|
||||||
|
|
||||||
@@ -49778,41 +49780,41 @@ Function50893: ; 50893
|
|||||||
Function508d5: ; 508d5
|
Function508d5: ; 508d5
|
||||||
ld a, [MonType]
|
ld a, [MonType]
|
||||||
and a ; PARTYMON
|
and a ; PARTYMON
|
||||||
jr z, .asm_508e7
|
jr z, .partymon
|
||||||
cp OTPARTYMON
|
cp OTPARTYMON
|
||||||
jr z, .asm_508ec
|
jr z, .otpartymon
|
||||||
cp BOXMON
|
cp BOXMON
|
||||||
jr z, .asm_508f1
|
jr z, .boxmon
|
||||||
cp $3
|
cp BREEDMON
|
||||||
jr z, .asm_50900
|
jr z, .breedmon
|
||||||
; WILDMON
|
; WILDMON
|
||||||
|
|
||||||
.asm_508e7
|
.partymon
|
||||||
ld hl, PartySpecies
|
ld hl, PartySpecies
|
||||||
jr .asm_50905
|
jr .done
|
||||||
|
|
||||||
.asm_508ec
|
.otpartymon
|
||||||
ld hl, OTPartySpecies
|
ld hl, OTPartySpecies
|
||||||
jr .asm_50905
|
jr .done
|
||||||
|
|
||||||
.asm_508f1
|
.boxmon
|
||||||
ld a, 1 ; BANK(sBoxSpecies)
|
ld a, 1 ; BANK(sBoxSpecies)
|
||||||
call GetSRAMBank
|
call GetSRAMBank
|
||||||
ld hl, sBoxSpecies
|
ld hl, sBoxSpecies
|
||||||
call .asm_50905
|
call .done
|
||||||
call CloseSRAM
|
call CloseSRAM
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.asm_50900
|
.breedmon
|
||||||
ld a, [wBreedMon1Species]
|
ld a, [wBreedMon1Species]
|
||||||
jr .asm_50909
|
jr .done2
|
||||||
|
|
||||||
.asm_50905
|
.done
|
||||||
ld d, 0
|
ld d, 0
|
||||||
add hl, de
|
add hl, de
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
|
|
||||||
.asm_50909
|
.done2
|
||||||
ld [CurPartySpecies], a
|
ld [CurPartySpecies], a
|
||||||
ret
|
ret
|
||||||
; 5090d
|
; 5090d
|
||||||
@@ -73073,10 +73075,12 @@ Flypoints: ; 91c5e
|
|||||||
const_def
|
const_def
|
||||||
|
|
||||||
flypoint: MACRO
|
flypoint: MACRO
|
||||||
\1\@FLY EQUS "FLY_\1"
|
; \1\@FLY EQUS "FLY_\1"
|
||||||
\1\@SPAWN EQUS "SPAWN_\1"
|
; \1\@SPAWN EQUS "SPAWN_\1"
|
||||||
const \1\@FLY
|
; const \1\@FLY
|
||||||
db \2, \1\@SPAWN
|
; db \2, \1\@SPAWN
|
||||||
|
const FLY_\1
|
||||||
|
db \2, SPAWN_\1
|
||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
; Johto
|
; Johto
|
||||||
|
|||||||
@@ -371,10 +371,10 @@ AzaleaGym_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 7
|
db 7
|
||||||
person_event SPRITE_BUGSY, 11, 9, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugsyScript_0x18ec1e, -1
|
person_event SPRITE_BUGSY, 11, 9, $3, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugsyScript_0x18ec1e, -1
|
||||||
person_event SPRITE_BUG_CATCHER, 7, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherBug_catcher_benny, -1
|
person_event SPRITE_BUG_CATCHER, 7, 9, $a, 0, 0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherBug_catcher_benny, -1
|
||||||
person_event SPRITE_BUG_CATCHER, 12, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherAl, -1
|
person_event SPRITE_BUG_CATCHER, 12, 12, $6, 0, 0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherAl, -1
|
||||||
person_event SPRITE_BUG_CATCHER, 6, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherJosh, -1
|
person_event SPRITE_BUG_CATCHER, 6, 4, $6, 0, 0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherJosh, -1
|
||||||
person_event SPRITE_TWIN, 14, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay1, -1
|
person_event SPRITE_TWIN, 14, 8, $6, 0, 0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay1, -1
|
||||||
person_event SPRITE_TWIN, 14, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay2, -1
|
person_event SPRITE_TWIN, 14, 9, $6, 0, 0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay2, -1
|
||||||
person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, AzaleaGymGuyScript, -1
|
person_event SPRITE_GYM_GUY, 17, 11, $6, 0, 0, -1, -1, (PAL_OW_RED << 4) | $80, 0, AzaleaGymGuyScript, -1
|
||||||
|
|||||||
@@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 3
|
db 3
|
||||||
person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x18e040, -1
|
person_event SPRITE_CLERK, 7, 5, $9, 0, 0, -1, -1, $0, 0, ClerkScript_0x18e040, -1
|
||||||
person_event SPRITE_COOLTRAINER_M, 9, 6, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x18e047, -1
|
person_event SPRITE_COOLTRAINER_M, 9, 6, $7, 0, 0, -1, -1, $0, 0, CooltrainerMScript_0x18e047, -1
|
||||||
person_event SPRITE_BUG_CATCHER, 6, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18e04a, -1
|
person_event SPRITE_BUG_CATCHER, 6, 11, $5, 0, 2, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18e04a, -1
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 4
|
db 4
|
||||||
person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18db28, -1
|
person_event SPRITE_NURSE, 5, 7, $6, 0, 0, -1, -1, $0, 0, NurseScript_0x18db28, -1
|
||||||
person_event SPRITE_GENTLEMAN, 10, 13, OW_UP | $0, $10, -1, -1, $0, 0, GentlemanScript_0x18db2b, -1
|
person_event SPRITE_GENTLEMAN, 10, 13, $4, 1, 0, -1, -1, $0, 0, GentlemanScript_0x18db2b, -1
|
||||||
person_event SPRITE_FISHING_GURU, 5, 10, OW_UP | $2, $0, -1, -1, $0, 0, FishingGuruScript_0x18db2e, -1
|
person_event SPRITE_FISHING_GURU, 5, 10, $6, 0, 0, -1, -1, $0, 0, FishingGuruScript_0x18db2e, -1
|
||||||
person_event SPRITE_POKEFAN_F, 8, 5, OW_DOWN | $2, $21, -1, -1, $0, 0, PokefanFScript_0x18db31, -1
|
person_event SPRITE_POKEFAN_F, 8, 5, $2, 2, 1, -1, -1, $0, 0, PokefanFScript_0x18db31, -1
|
||||||
|
|||||||
@@ -481,15 +481,15 @@ AzaleaTown_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 12
|
db 12
|
||||||
person_event SPRITE_AZALEA_ROCKET, 13, 35, OW_UP | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
|
person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, 0, 0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
|
||||||
person_event SPRITE_GRAMPS, 13, 25, OW_DOWN | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1
|
person_event SPRITE_GRAMPS, 13, 25, $2, 2, 1, -1, -1, $0, 0, GrampsScript_0x1980b1, -1
|
||||||
person_event SPRITE_TEACHER, 17, 19, OW_UP | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1
|
person_event SPRITE_TEACHER, 17, 19, $4, 2, 0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1
|
||||||
person_event SPRITE_YOUNGSTER, 13, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1
|
person_event SPRITE_YOUNGSTER, 13, 11, $5, 0, 1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1
|
||||||
person_event SPRITE_SLOWPOKE, 21, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
person_event SPRITE_SLOWPOKE, 21, 12, $1, 0, 0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||||
person_event SPRITE_SLOWPOKE, 13, 22, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
person_event SPRITE_SLOWPOKE, 13, 22, $1, 0, 0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||||
person_event SPRITE_SLOWPOKE, 13, 33, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
person_event SPRITE_SLOWPOKE, 13, 33, $1, 0, 0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||||
person_event SPRITE_SLOWPOKE, 19, 19, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
person_event SPRITE_SLOWPOKE, 19, 19, $1, 0, 0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
|
||||||
person_event SPRITE_FRUIT_TREE, 6, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, WhiteApricornTree, -1
|
person_event SPRITE_FRUIT_TREE, 6, 12, $1, 0, 0, -1, -1, $0, 0, WhiteApricornTree, -1
|
||||||
person_event SPRITE_AZALEA_ROCKET, 14, 15, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
|
person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, 0, 0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
|
||||||
person_event SPRITE_AZALEA_ROCKET, 20, 14, OW_UP | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
|
person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, 0, 0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
|
||||||
person_event SPRITE_KURT_OUTSIDE, 9, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
|
person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, 0, 0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
|
||||||
|
|||||||
@@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 5
|
db 5
|
||||||
person_event SPRITE_RECEPTIONIST, 10, 11, OW_UP | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x9e3e2, -1
|
person_event SPRITE_RECEPTIONIST, 10, 11, $6, 0, 0, -1, -1, $0, 0, ReceptionistScript_0x9e3e2, -1
|
||||||
person_event SPRITE_YOUNGSTER, 13, 18, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x9e55d, -1
|
person_event SPRITE_YOUNGSTER, 13, 18, $9, 0, 0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x9e55d, -1
|
||||||
person_event SPRITE_COOLTRAINER_F, 13, 8, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x9e568, -1
|
person_event SPRITE_COOLTRAINER_F, 13, 8, $5, 0, 1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x9e568, -1
|
||||||
person_event SPRITE_BUG_CATCHER, 7, 5, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BugCatcherScript_0x9e56b, -1
|
person_event SPRITE_BUG_CATCHER, 7, 5, $2, 1, 1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BugCatcherScript_0x9e56b, -1
|
||||||
person_event SPRITE_GRANNY, 7, 18, OW_UP | $0, $10, -1, -1, $0, 0, GrannyScript_0x9e56e, -1
|
person_event SPRITE_GRANNY, 7, 18, $4, 1, 0, -1, -1, $0, 0, GrannyScript_0x9e56e, -1
|
||||||
|
|||||||
@@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 2
|
db 2
|
||||||
person_event SPRITE_YOUNGSTER, 4, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
|
person_event SPRITE_YOUNGSTER, 4, 8, $6, 0, 0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
|
||||||
person_event SPRITE_RECEPTIONIST, 10, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, -1
|
person_event SPRITE_RECEPTIONIST, 10, 5, $9, 0, 0, -1, -1, $0, 0, ObjectEvent, -1
|
||||||
|
|||||||
@@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 1
|
db 1
|
||||||
person_event SPRITE_RECEPTIONIST, 6, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, MovementData_0x9f58f, -1
|
person_event SPRITE_RECEPTIONIST, 6, 5, $9, 0, 0, -1, -1, $0, 0, MovementData_0x9f58f, -1
|
||||||
|
|||||||
@@ -96,4 +96,4 @@ BattleTowerHallway_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 1
|
db 1
|
||||||
person_event SPRITE_RECEPTIONIST, 6, 15, OW_UP | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1
|
person_event SPRITE_RECEPTIONIST, 6, 15, $6, 0, 0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 4
|
db 4
|
||||||
person_event SPRITE_STANDING_YOUNGSTER, 16, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x9f85f, -1
|
person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, 0, 0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x9f85f, -1
|
||||||
person_event SPRITE_BUENA, 15, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x9f862, -1
|
person_event SPRITE_BUENA, 15, 17, $2, 1, 1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x9f862, -1
|
||||||
person_event SPRITE_SAILOR, 22, 16, OW_UP | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
|
person_event SPRITE_SAILOR, 22, 16, $5, 0, 1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
|
||||||
person_event SPRITE_LASS, 28, 16, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1
|
person_event SPRITE_LASS, 28, 16, $3, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1
|
||||||
|
|||||||
@@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 1
|
db 1
|
||||||
person_event SPRITE_GRAMPS, 7, 6, OW_UP | $3, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x189538, -1
|
person_event SPRITE_GRAMPS, 7, 6, $7, 2, 0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x189538, -1
|
||||||
|
|||||||
@@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 9
|
db 9
|
||||||
person_event SPRITE_SUPER_NERD, 16, 22, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
|
person_event SPRITE_SUPER_NERD, 16, 22, $6, 0, 0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
|
||||||
person_event SPRITE_SUPER_NERD, 16, 23, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
|
person_event SPRITE_SUPER_NERD, 16, 23, $6, 0, 0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
|
||||||
person_event SPRITE_GRAMPS, 6, 24, OW_UP | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
|
person_event SPRITE_GRAMPS, 6, 24, $6, 0, 0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
|
||||||
person_event SPRITE_GRAMPS, 6, 25, OW_LEFT | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
|
person_event SPRITE_GRAMPS, 6, 25, $8, 0, 0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
|
||||||
person_event SPRITE_BLACK_BELT, 35, 28, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x1a470e, -1
|
person_event SPRITE_BLACK_BELT, 35, 28, $5, 0, 1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x1a470e, -1
|
||||||
person_event SPRITE_COOLTRAINER_F, 29, 13, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1a4722, -1
|
person_event SPRITE_COOLTRAINER_F, 29, 13, $5, 0, 2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1a4722, -1
|
||||||
person_event SPRITE_YOUNGSTER, 19, 17, OW_UP | $1, $1, -1, -1, $0, 0, YoungsterScript_0x1a4725, -1
|
person_event SPRITE_YOUNGSTER, 19, 17, $5, 0, 1, -1, -1, $0, 0, YoungsterScript_0x1a4725, -1
|
||||||
person_event SPRITE_YOUNGSTER, 24, 26, OW_UP | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
|
person_event SPRITE_YOUNGSTER, 24, 26, $6, 0, 0, -1, -1, $0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
|
||||||
person_event SPRITE_COOLTRAINER_F, 23, 39, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1a4728, -1
|
person_event SPRITE_COOLTRAINER_F, 23, 39, $7, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1a4728, -1
|
||||||
|
|||||||
@@ -35,4 +35,4 @@ BlackthornDodrioTradeHouse_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 1
|
db 1
|
||||||
person_event SPRITE_LASS, 7, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Emy, -1
|
person_event SPRITE_LASS, 7, 6, $3, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Emy, -1
|
||||||
|
|||||||
@@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader:
|
|||||||
|
|
||||||
.PersonEvents:
|
.PersonEvents:
|
||||||
db 2
|
db 2
|
||||||
person_event SPRITE_GRANNY, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, GrannyScript_0x195949, -1
|
person_event SPRITE_GRANNY, 7, 6, $3, 0, 0, -1, -1, $0, 0, GrannyScript_0x195949, -1
|
||||||
person_event SPRITE_EKANS, 9, 9, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, EkansScript_0x19594c, -1
|
person_event SPRITE_EKANS, 9, 9, $16, 0, 0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, EkansScript_0x19594c, -1
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user