Finished the decoration attributes table

Interpretation of the Decoration Attributes table is complete.

Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
This commit is contained in:
PikalaxALT 2015-07-19 04:58:31 -04:00
parent 60cd04b023
commit 94129b6b45
364 changed files with 1961 additions and 1899 deletions

View File

@ -7607,7 +7607,7 @@ Function3ee3b: ; 3ee3b
ld [hBGMapMode], a
.asm_3f035
callba Function2709e
callba LevelUpHappinessMod
ld a, [CurBattleMon]
ld b, a
ld a, [CurPartyMon]

View File

@ -24,3 +24,4 @@ INCLUDE "constants/gfx_constants.asm"
INCLUDE "constants/pokemon_data_constants.asm"
INCLUDE "constants/misc_constants.asm"
INCLUDE "constants/std_constants.asm"
INCLUDE "constants/deco_constants.asm"

View File

@ -0,0 +1,105 @@
const_value = 1
const DECO_PLANT
const DECO_BED
const DECO_CARPET
const DECO_POSTER
const DECO_DOLL
const DECO_BIGDOLL
const_value = 1
const PUT_IT_AWAY
const MAGNAPLANT
const TROPICPLANT
const JUMBOPLANT
const TOWN_MAP_D
const FAMICOM
const SUPER_NES
const NINTENDO_64
const VIRTUAL_BOY
const GOLD_TROPHY
const SILVER_TROPHY
const SURF_PIKA_DOLL
const _BED
const _CARPET
const _POSTER
const _DOLL
const BIG_
const FEATHERY_BED
const PIKACHU_BED
const PINK_BED
const POLKADOT_BED
const RED_CARPET
const BLUE_CARPET
const YELLOW_CARPET
const GREEN_CARPET
const_value = 1
const SET_UP_BED
const PUT_AWAY_BED
const SET_UP_CARPET
const PUT_AWAY_CARPET
const SET_UP_PLANT
const PUT_AWAY_PLANT
const SET_UP_POSTER
const PUT_AWAY_POSTER
const SET_UP_CONSOLE
const PUT_AWAY_CONSOLE
const SET_UP_BIG_DOLL
const PUT_AWAY_BIG_DOLL
const SET_UP_DOLL
const PUT_AWAY_DOLL
const SET_UP_ORNAMENT
const PUT_AWAY_ORNAMENT
const_value = 2
const DECO_FEATHERY_BED ; 2
const DECO_PINK_BED ; 3
const DECO_POLKADOT_BED ; 4
const DECO_PIKACHU_BED ; 5
const_value = const_value + 1
const DECO_RED_CARPET ; 7
const DECO_BLUE_CARPET ; 8
const DECO_YELLOW_CARPET ; 9
const DECO_GREEN_CARPET ; a
const_value = const_value + 1
const DECO_MAGNAPLANT ; c
const DECO_TROPICPLANT ; d
const DECO_JUMBOPLANT ; e
const_value = const_value + 1
const DECO_TOWN_MAP ; 10
const DECO_PIKACHU_POSTER ; 11
const DECO_CLEFAIRY_POSTER ; 12
const DECO_JIGGLYPUFF_POSTER ; 13
const_value = const_value + 1
const DECO_FAMICOM ; 15
const DECO_SNES ; 16
const DECO_N64 ; 17
const DECO_VIRTUAL_BOY ; 18
const_value = const_value + 1
const DECO_BIG_SNORLAX_DOLL ; 1a
const DECO_BIG_ONIX_DOLL ; 1b
const DECO_BIG_LAPRAS_DOLL ; 1c
const_value = const_value + 1
const DECO_PIKACHU_DOLL ; 1e
const DECO_SURF_PIKACHU_DOLL ; 1f
const DECO_CLEFAIRY_DOLL ; 20
const DECO_JIGGLYPUFF_DOLL ; 21
const DECO_BULBASAUR_DOLL ; 22
const DECO_CHARMANDER_DOLL ; 23
const DECO_SQUIRTLE_DOLL ; 24
const DECO_POLIWAG_DOLL ; 25
const DECO_DIGLETT_DOLL ; 26
const DECO_STARMIE_DOLL ; 27
const DECO_MAGIKARP_DOLL ; 28
const DECO_ODDISH_DOLL ; 29
const DECO_GENGAR_DOLL ; 2a
const DECO_SHELLDER_DOLL ; 2b
const DECO_GRIMER_DOLL ; 2c
const DECO_VOLTORB_DOLL ; 2d
const DECO_WEEDLE_DOLL ; 2e
const DECO_UNOWN_DOLL ; 2f
const DECO_GEODUDE_DOLL ; 30
const DECO_MACHOP_DOLL ; 31
const DECO_TENTACOOL_DOLL ; 32
const DECO_GOLD_TROPHY_DOLL ; 33
const DECO_SILVER_TROPHY_DOLL ; 34

View File

@ -55,7 +55,7 @@
const EVENT_033
const EVENT_034
const EVENT_035
const EVENT_036
const EVENT_INITIALIZED_EVENTS
const EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
const EVENT_038
const EVENT_039
@ -642,7 +642,7 @@
const EVENT_TODD_ASKED_FOR_PHONE_NUMBER
const EVENT_27E
const EVENT_GINA_ASKED_FOR_PHONE_NUMBER
const EVENT_280
const EVENT_280 ; 280
const EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER
const EVENT_282
const EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER
@ -658,7 +658,7 @@
const EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
const EVENT_28E
const EVENT_TULLY_ASKED_FOR_PHONE_NUMBER
const EVENT_290
const EVENT_290 ; 290
const EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
const EVENT_292
const EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
@ -674,56 +674,56 @@
const EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
const EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
const EVENT_29F
const EVENT_2A0
const EVENT_2A0 ; 2a0
const EVENT_2A1
const EVENT_2A2
const EVENT_2A3
const EVENT_2A4
const EVENT_2A5
const EVENT_2A6
const EVENT_2A7
const EVENT_2A8
const EVENT_2A9
const EVENT_2AA
const EVENT_2AB
const EVENT_2AC
const EVENT_2AD
const EVENT_2AE
const EVENT_2AF
const EVENT_2B0
const EVENT_2B1
const EVENT_2B2
const EVENT_2B3
const EVENT_2B4
const EVENT_2B5
const EVENT_2B6
const EVENT_2B7
const EVENT_2B8
const EVENT_2B9
const EVENT_2BA
const EVENT_2BB
const EVENT_2BC
const EVENT_2BD
const EVENT_2BE
const EVENT_2BF
const EVENT_2C0
const EVENT_2C1
const EVENT_2C2
const EVENT_2C3
const EVENT_2C4
const EVENT_2C5
const EVENT_2C6
const EVENT_2C7
const EVENT_2C8
const EVENT_2C9
const EVENT_2CA
const EVENT_2CB
const EVENT_DECO_BED_1
const EVENT_DECO_BED_2
const EVENT_DECO_BED_3
const EVENT_DECO_BED_4
const EVENT_DECO_CARPET_1
const EVENT_DECO_CARPET_2
const EVENT_DECO_CARPET_3
const EVENT_DECO_CARPET_4
const EVENT_DECO_PLANT_1
const EVENT_DECO_PLANT_2
const EVENT_DECO_PLANT_3
const EVENT_DECO_PLANT_4
const EVENT_DECO_POSTER_1 ; 2b0
const EVENT_DECO_POSTER_2
const EVENT_DECO_POSTER_3
const EVENT_DECO_FAMICOM
const EVENT_DECO_SNES
const EVENT_DECO_N64
const EVENT_DECO_VIRTUAL_BOY
const EVENT_DECO_PIKACHU_DOLL
const EVENT_DECO_SURFING_PIKACHU_DOLL
const EVENT_DECO_CLEFAIRY_DOLL
const EVENT_DECO_JIGGLYPUFF_DOLL
const EVENT_DECO_BULBASAUR_DOLL
const EVENT_DECO_CHARMANDER_DOLL
const EVENT_DECO_SQUIRTLE_DOLL
const EVENT_DECO_POLIWAG_DOLL
const EVENT_DECO_DIGLETT_DOLL
const EVENT_DECO_STARMIE_DOLL ; 2c0
const EVENT_DECO_MAGIKARP_DOLL
const EVENT_DECO_ODDISH_DOLL
const EVENT_DECO_GENGAR_DOLL
const EVENT_DECO_SHELLDER_DOLL
const EVENT_DECO_GRIMER_DOLL
const EVENT_DECO_VOLTORB_DOLL
const EVENT_DECO_WEEDLE_DOLL
const EVENT_DECO_UNOWN_DOLL
const EVENT_DECO_GEODUDE_DOLL
const EVENT_DECO_MACHOP_DOLL
const EVENT_DECO_TENTACOOL_DOLL
const EVENT_KRISS_ROOM_POSTER
const EVENT_2CD
const EVENT_2CE
const EVENT_2CF
const EVENT_2D0 ; 2d0
const EVENT_2D1
const EVENT_DECO_GOLD_TROPHY
const EVENT_DECO_SILVER_TROPHY
const EVENT_DECO_BIG_SNORLAX_DOLL
const EVENT_DECO_BIG_ONIX_DOLL ; 2d0
const EVENT_DECO_BIG_LAPRAS_DOLL
const EVENT_2D2
const EVENT_SWITCH_1
const EVENT_SWITCH_2

View File

@ -718,17 +718,16 @@ const_value SET 1
const MAPOBJECT_FLAG_HI ; d
const MAPOBJECT_E ; unused
const MAPOBJECT_F ; unused
MAPOBJECT_NOT_VISIBLE EQU -1
MAPOBJECT_SCREEN_HEIGHT EQU 11
MAPOBJECT_SCREEN_WIDTH EQU 12
OBJECT_STRUCT_3_DATA_WIDTH EQU 6
OBJECT_STRUCT_3_DATA_HEIGHT EQU 37
OW_DOWN EQU $0
OW_RIGHT EQU $4
OW_UP EQU $8
OW_LEFT EQU $c
OW_UP EQU $4
OW_LEFT EQU $8
OW_RIGHT EQU $c
const_def
const EMOTE_SHOCK ; 0

View File

@ -103,66 +103,3 @@ const_value = 1
const MOM_ITEM
const MOM_DOLL
const_def
const DECO_BED
const DECO_CARPET
const DECO_PLANT
const DECO_POSTER
const DECO_CONSOLE
const DECO_ORNAMENT
const DECO_BIGDOLL
const_def
const CARPET_00
const CARPET_01
const PLANT_02
const PLANT_03
const PLANT_04
const PLANT_05
const CARPET_06
const POSTER_07
const POSTER_08
const POSTER_09
const POSTER_0A
const CARPET_0B
const CARPET_0C
const CARPET_0D
const CARPET_0E
const CARPET_0F
const CARPET_10
const CONSOLE_11
const CONSOLE_12
const CONSOLE_13
const CARPET_14
const CARPET_FAMICOM
const CONSTENT_SNES
const CARPET_N64
const CARPET_VIRTUAL_BOY
const CARPET_19
const BIGDOLL_SNORLAX
const BIGDOLL_ONIX
const BIGDOLL_LAPRAS
const CARPET_1D
const DOLL_PIKACHU
const DOLL_SURFING_PIKACHU
const DOLL_CLEFAIRY
const DOLL_JIGGLYPUFF
const DOLL_BULBASAUR
const DOLL_CHARMANDER
const DOLL_SQUIRTLE
const DOLL_POLIWAG
const DOLL_DIGLETT
const DOLL_STARMIE
const DOLL_MAGIKARP
const DOLL_ODDISH
const DOLL_GENGAR
const DOLL_SHELLDER
const DOLL_GRIMER
const DOLL_VOLTORM
const DOLL_WEEDLE
const DOLL_UNOWN
const DOLL_GEODUDE
const DOLL_MACHOP
const DOLL_TENTACOOL
const CARPET_GOLD_TROPHY
const CARPET_SILVER_TROPHY

View File

@ -2780,7 +2780,7 @@ Function5629: ; 5629
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
cp -1
ret z
cp $d
ret nc

View File

@ -91,7 +91,7 @@ SpecialsPointers:: ; c029
add_special Function17440
add_special Special_SelectRandomBugContestContestants
add_special Functionc3fc
add_special Function26feb
add_special ToggleMaptileDecorations
add_special ToggleDecorationsVisibility
add_special SpecialGiveShuckle
add_special SpecialReturnShuckle
@ -265,7 +265,7 @@ Functionc298: ; c298
SpecialNameRival: ; 0xc29d
ld b, $2 ; rival
ld de, RivalName
callba Function116b7
callba _NamingScreen
; default to "SILVER"
ld hl, RivalName
ld de, DefaultRivalName

View File

@ -542,8 +542,8 @@ InitializeEventsScript:
setevent EVENT_KRISS_HOUSE_2F_DOLL_1
setevent EVENT_KRISS_HOUSE_2F_DOLL_2
setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL
setevent EVENT_2A4
setevent EVENT_2AF
setevent EVENT_DECO_BED_1
setevent EVENT_DECO_PLANT_4
setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
setevent EVENT_OLIVINE_GYM_JASMINE
setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
@ -617,7 +617,7 @@ InitializeEventsScript:
setevent EVENT_MT_MOON_SQUARE_CLEFAIRY
setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION
setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
setevent EVENT_036
setevent EVENT_INITIALIZED_EVENTS
return
AskNumber1MScript:

View File

@ -5,7 +5,7 @@ MoveDeletion:
jr c, .asm_2c5c3
ld hl, UnknownText_0x2c5f4
call PrintText
callba Function50000
callba SelectMonFromParty
jr c, .asm_2c5c3
ld a, [CurPartySpecies]
cp EGG

View File

@ -1,24 +1,31 @@
NameRater: ; fb6ed
ld hl, UnknownText_0xfb80f
; Introduce himself
ld hl, NameRaterIntroText
call PrintText
call YesNoBox
jp c, .asm_fb77e
ld hl, UnknownText_0xfb814
jp c, .cancel
; Select a Pokemon from your party
ld hl, NameRaterWhichMonText
call PrintText
callba Function50000
jr c, .asm_fb77e
callba SelectMonFromParty
jr c, .cancel
; He can't rename an egg...
ld a, [CurPartySpecies]
cp EGG
jr z, .asm_fb783
jr z, .egg
; ... or a Pokemon you got from a trade.
call GetCurNick
call Functionfb78a
jr c, .asm_fb779
ld hl, UnknownText_0xfb819
call CheckIfMonIsYourOT
jr c, .traded
; This name is good, but we can do better. How about it?
ld hl, NameRaterIsGoodText
call PrintText
call YesNoBox
jr c, .asm_fb77e
ld hl, UnknownText_0xfb81e
jr c, .cancel
; What name shall I give it then?
ld hl, NameRaterWhichNameText
call PrintText
; Load the new nickname into StringBuffer2
xor a
ld [MonType], a
ld a, [CurPartySpecies]
@ -27,148 +34,156 @@ NameRater: ; fb6ed
call GetBaseData
ld b, 0
ld de, StringBuffer2
callba Function116b7
call Functionfb7be
ld hl, UnknownText_0xfb837
jr c, .asm_fb76c
call Functionfb7d3
ld hl, UnknownText_0xfb837
jr c, .asm_fb76c
callba _NamingScreen
; If the new name is empty, treat it as unchanged.
call IsNewNameEmpty
ld hl, NameRaterSameAsBeforeText
jr c, .samename
; If the new name is the same as the old name, treat it as unchanged.
call CompareNewToOld
ld hl, NameRaterSameAsBeforeText
jr c, .samename
; Copy the new name from StringBuffer2
ld hl, PartyMonNicknames
ld bc, $000b
ld bc, PKMN_NAME_LENGTH
ld a, [CurPartyMon]
call AddNTimes
ld e, l
ld d, h
ld hl, StringBuffer2
ld bc, $000b
ld bc, PKMN_NAME_LENGTH
call CopyBytes
ld hl, UnknownText_0xfb823
ld hl, NameRaterEvenBetterText
.asm_fb76c
.samename
push hl
call GetCurNick
ld hl, UnknownText_0xfb83c
ld hl, NameRaterDoneText
call PrintText
pop hl
jr .asm_fb786
jr .done
.asm_fb779
ld hl, UnknownText_0xfb82d
jr .asm_fb786
.traded
ld hl, NameRaterTradedText
jr .done
.asm_fb77e
ld hl, UnknownText_0xfb828
jr .asm_fb786
.cancel
ld hl, NameRaterCancelText
jr .done
.asm_fb783
ld hl, UnknownText_0xfb832
.egg
ld hl, NameRaterEggText
.asm_fb786
.done
call PrintText
ret
; fb78a
Functionfb78a: ; fb78a
CheckIfMonIsYourOT: ; fb78a
; Checks to see if the partymon loaded in [CurPartyMon] has the different OT as you. Returns carry if not.
ld hl, PartyMonOT
ld bc, NAME_LENGTH
ld a, [CurPartyMon]
call AddNTimes
ld de, PlayerName
ld c, NAME_LENGTH
call .asm_fb7b1
jr c, .asm_fb7bc
call .loop
jr c, .nope
ld hl, PartyMon1ID
ld bc, PartyMon2 - PartyMon1
ld a, [CurPartyMon]
call AddNTimes
ld de, PlayerID
ld c, $2
.asm_fb7b1
ld c, 2 ; number of bytes in which your ID is stored
.loop
ld a, [de]
cp [hl]
jr nz, .asm_fb7bc
jr nz, .nope
inc hl
inc de
dec c
jr nz, .asm_fb7b1
jr nz, .loop
and a
ret
.asm_fb7bc
.nope
scf
ret
; fb7be
Functionfb7be: ; fb7be
IsNewNameEmpty: ; fb7be
; Checks to see if the nickname loaded in StringBuffer2 is empty. If so, return carry.
ld hl, StringBuffer2
ld c, 10
.asm_fb7c3
ld c, PKMN_NAME_LENGTH - 1
.loop
ld a, [hli]
cp "@"
jr z, .asm_fb7cf
jr z, .terminator
cp " "
jr nz, .asm_fb7d1
jr nz, .nonspace
dec c
jr nz, .asm_fb7c3
jr nz, .loop
.asm_fb7cf
.terminator
scf
ret
.asm_fb7d1
.nonspace
and a
ret
; fb7d3
Functionfb7d3: ; fb7d3
CompareNewToOld: ; fb7d3
; Compares the nickname in StringBuffer2 to the previous nickname. If they are the same, return carry.
ld hl, PartyMonNicknames
ld bc, $000b
ld bc, PKMN_NAME_LENGTH
ld a, [CurPartyMon]
call AddNTimes
push hl
call Functionfb802
call GetNicknameLength
ld b, c
ld hl, StringBuffer2
call Functionfb802
call GetNicknameLength
pop hl
ld a, c
cp b
jr nz, .asm_fb7fe
jr nz, .different
ld de, StringBuffer2
.asm_fb7f2
.loop
ld a, [de]
cp "@"
jr z, .asm_fb800
jr z, .terminator
cp [hl]
jr nz, .asm_fb7fe
jr nz, .different
inc hl
inc de
jr .asm_fb7f2
jr .loop
.asm_fb7fe
.different
and a
ret
.asm_fb800
.terminator
scf
ret
; fb802
Functionfb802: ; fb802
GetNicknameLength: ; fb802
; Gets the length of the name starting at hl and returns it in c.
ld c, 0
.asm_fb804
.loop
ld a, [hli]
cp "@"
ret z
inc c
ld a, c
cp 10
jr nz, .asm_fb804
cp PKMN_NAME_LENGTH - 1
jr nz, .loop
ret
; fb80f
UnknownText_0xfb80f: ; 0xfb80f
NameRaterIntroText: ; 0xfb80f
; Hello, hello! I'm the NAME RATER.
; I rate the names of #MON.
; Would you like me to rate names?
@ -176,13 +191,13 @@ UnknownText_0xfb80f: ; 0xfb80f
db "@"
; 0xfb814
UnknownText_0xfb814: ; 0xfb814
NameRaterWhichMonText: ; 0xfb814
; Which #MON's nickname should I rate for you?
text_jump UnknownText_0x1c00a0
db "@"
; 0xfb819
UnknownText_0xfb819: ; 0xfb819
NameRaterIsGoodText: ; 0xfb819
; Hm… @ … That's a fairly decent name.
; But, how about a slightly better nickname?
; Want me to give it a better name?
@ -190,45 +205,45 @@ UnknownText_0xfb819: ; 0xfb819
db "@"
; 0xfb81e
UnknownText_0xfb81e: ; 0xfb81e
NameRaterWhichNameText: ; 0xfb81e
; All right. What name should we give it, then?
text_jump UnknownText_0x1c0142
db "@"
; 0xfb823
UnknownText_0xfb823: ; 0xfb823
NameRaterEvenBetterText: ; 0xfb823
; That's a better name than before! Well done!
text_jump UnknownText_0x1c0171
db "@"
; 0xfb828
UnknownText_0xfb828: ; 0xfb828
NameRaterCancelText: ; 0xfb828
; OK, then. Come again sometime.
text_jump UnknownText_0x1c019e
db "@"
; 0xfb82d
UnknownText_0xfb82d: ; 0xfb82d
NameRaterTradedText: ; 0xfb82d
; Hm… @ ? What a great name! It's perfect.
; Treat @ with loving care.
text_jump UnknownText_0x1c01be
db "@"
; 0xfb832
UnknownText_0xfb832: ; 0xfb832
NameRaterEggText: ; 0xfb832
; Whoa… That's just an EGG.
text_jump UnknownText_0x1c0208
db "@"
; 0xfb837
UnknownText_0xfb837: ; 0xfb837
; It might look the same as before,
NameRaterSameAsBeforeText: ; 0xfb837
; It might look the different as before,
; but this new name is much better! Well done!
text_jump UnknownText_0x1c0222
db "@"
; 0xfb83c
UnknownText_0xfb83c: ; 0xfb83c
NameRaterDoneText: ; 0xfb83c
; All right. This #MON is now named @ .
text_jump UnknownText_0x1c0272
db "@"

View File

@ -14,7 +14,7 @@ SpecialPokeSeer: ; 4f0bc
call Functiona36
ld b, $6
callba Function50000
callba SelectMonFromParty
jr c, .cancel
ld a, [CurPartySpecies]

View File

@ -238,7 +238,7 @@ Function18de:: ; 18de
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
cp -1
jr z, .not_visible
ld [hConnectedMapWidth], a
call GetObjectStruct
@ -348,9 +348,9 @@ Function1967:: ; 1967
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
cp -1
ret z
ld [hl], MAPOBJECT_NOT_VISIBLE
ld [hl], -1
push af
call Function1985
pop af
@ -386,7 +386,7 @@ Function19a6:: ; 19a6
call GetMapObject
ld d, b
ld e, c
ld a, MAPOBJECT_NOT_VISIBLE
ld a, -1
ld [de], a
inc de
pop hl
@ -401,13 +401,13 @@ Function19b8:: ; 19b8
add hl, bc
ld a, [hl]
push af
ld [hl], MAPOBJECT_NOT_VISIBLE
ld [hl], -1
inc hl
ld bc, OBJECT_LENGTH - 1
xor a
call ByteFill
pop af
cp MAPOBJECT_NOT_VISIBLE
cp -1
ret z
cp $d
ret nc

View File

@ -95,7 +95,7 @@ InterpretMenu2:: ; 0x1d81
ret
; 0x1dab
Function1dab:: ; 1dab
GetMenu2:: ; 1dab
call LoadMenuDataHeader
call InterpretMenu2
call WriteBackup

View File

@ -1415,7 +1415,7 @@ RareCandy: ; ef14
ld a, [hl]
adc b
ld [hl], a
callba Function2709e
callba LevelUpHappinessMod
ld a, $f8
call Functionf24a

407
main.asm
View File

@ -842,7 +842,7 @@ NamePlayer: ; 0x6074
ld a, [wcfa9]
dec a
jr z, .NewName
call Function60fa
call StorePlayerName
callba Function8c1d
callba MovePlayerPicLeft
ret
@ -892,9 +892,9 @@ Function60e9: ; 60e9
ret
; 60fa
Function60fa: ; 60fa
ld a, $50
ld bc, $000b
StorePlayerName: ; 60fa
ld a, "@"
ld bc, NAME_LENGTH
ld hl, PlayerName
call ByteFill
ld hl, PlayerName
@ -2390,9 +2390,9 @@ Function7021: ; 7021
call GetSpriteDirection
and a
jr z, .down
cp UP << 2
cp OW_UP
jr z, .up
cp LEFT << 2
cp OW_LEFT
jr z, .left
inc d
ret
@ -2790,7 +2790,7 @@ ChangeHappiness: ; 71c2
db -10, -10, -15 ; Used Energy Root (bitter)
db -15, -15, -20 ; Used Revival Herb (bitter)
db +3, +3, +1
db +10, +6, +4
db +10, +6, +4 ; Gained a level in the place where it was caught
; 725a
@ -2987,7 +2987,7 @@ SpecialShuckleNick:
SpecialReturnShuckle: ; 737e
callba Function50000
callba SelectMonFromParty
jr c, .asm_73e6
ld a, [CurPartySpecies]
@ -3059,7 +3059,7 @@ SpecialReturnShuckle: ; 737e
; 73f7
Function73f7: ; 73f7
callba Function50000
callba SelectMonFromParty
jr c, .asm_740e
ld a, [CurPartySpecies]
ld [ScriptVar], a
@ -3086,9 +3086,9 @@ Function741d: ; 741d
Function7420: ; 7420
push hl
callba Function50000
callba SelectMonFromParty
pop hl
jr c, .asm_744e
jr c, .nope
ld a, [CurPartySpecies]
cp EGG
jr z, .egg
@ -3113,7 +3113,7 @@ Function7420: ; 7420
call ChangeHappiness
ret
.asm_744e
.nope
xor a
ld [ScriptVar], a
ret
@ -3188,13 +3188,13 @@ Function8029: ; 8029
ld e, $80
ld a, [wd45b]
bit 2, a
jr nz, .asm_8059
jr nz, .ok
ld a, [PlayerGender]
bit 0, a
jr z, .asm_8059
ld e, $90
jr z, .ok
ld e, (PAL_OW_BLUE << 4) | $80
.asm_8059
.ok
ld [hl], e
ld a, $0
ld [$ffaf], a
@ -3212,7 +3212,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, 0, 0, LEFT << 2 | $3, $ff, -1, -1, $0, 0, $0000, -1
person_event SPRITE_CHRIS, 0, 0, OW_LEFT | $3, $ff, -1, -1, $0, 0, $0000, -1
; db $01, $00, $00, $0b, $ff, $ff, $ff, $00, $00, $00, $00, $ff, $ff
; 807e
@ -3392,7 +3392,7 @@ Function8177: ; 8177
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
cp -1
jr nz, .next
ld a, [XCoord]
ld d, a
@ -3482,7 +3482,7 @@ Function81ea: ; 81ea
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
cp -1
jr nz, .next
ld hl, MAPOBJECT_X_COORD
add hl, bc
@ -3540,7 +3540,7 @@ Function823e: ; 823e
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
cp -1
jr nz, .next
ld hl, MAPOBJECT_Y_COORD
add hl, bc
@ -10929,7 +10929,7 @@ TMHMMoves: ; 1167a
db 0 ; end
; 116b7
Function116b7: ; 0x116b7
_NamingScreen: ; 0x116b7
call Function2ed3
call Function116c1
call Function2b74
@ -23005,7 +23005,7 @@ Function16dac: ; 16dac
Function16dc7: ; 16dc7
ld hl, UnknownText_0x16e04
call PrintText
callba Function50000
callba SelectMonFromParty
jr c, .asm_16df8
ld a, [CurPartySpecies]
cp EGG
@ -25010,19 +25010,19 @@ Function243e8:: ; 243e8
call Function1c47
ld a, [wcf81]
bit 0, a
jr z, .asm_24411
jr z, .next
ld d, h
ld e, l
call Function1c23
.asm_24411
.next
call Function1c7e
ld a, h
or l
jr z, .asm_2441b
jr z, .next2
call Function1c47
.asm_2441b
.next2
pop af
ld [rSVBK], a
ld hl, wcf78
@ -28398,7 +28398,7 @@ GetDecorationData: ; 269dd
GetDecorationName: ; 269e7
push hl
call GetDecorationData
call GetDecorationType
call GetDecoName
pop hl
call CopyName2
ret
@ -28408,7 +28408,7 @@ DecorationMenuFunction: ; 269f3
ld a, [MenuSelection]
push de
call GetDecorationData
call GetDecorationType
call GetDecoName
pop hl
call PlaceString
ret
@ -28473,66 +28473,66 @@ GetDecorationSprite: ; 26a44
; 26a4f
decoration: MACRO
; type, name function, ?? function, event flag, sprite
; type, name, command, event flag, tile/sprite
db \1, \2, \3
dw \4
db \5
ENDM
DecorationAttributes: ; 26a4f
decoration DECO_CARPET, $00, 0, EVENT_000, SPRITE_NONE ; 00
decoration DECO_CARPET, $01, 2, EVENT_000, SPRITE_NONE ; 01
decoration DECO_PLANT, $12, 1, EVENT_2A4, $1b ; 02
decoration DECO_PLANT, $14, 1, EVENT_2A5, $1c ; 03
decoration DECO_PLANT, $15, 1, EVENT_2A6, $1d ; 04
decoration DECO_PLANT, $13, 1, EVENT_2A7, $1e ; 05
decoration DECO_CARPET, $01, 4, EVENT_000, SPRITE_NONE ; 06
decoration DECO_POSTER, $16, 3, EVENT_2A8, $08 ; 07
decoration DECO_POSTER, $17, 3, EVENT_2A9, $0b ; 08
decoration DECO_POSTER, $18, 3, EVENT_2AA, $0e ; 09
decoration DECO_POSTER, $19, 3, EVENT_2AB, $11 ; 0a
decoration DECO_CARPET, $01, 6, EVENT_000, SPRITE_NONE ; 0b
decoration DECO_CARPET, $02, 5, EVENT_2AC, SPRITE_ERIKA ; 0c
decoration DECO_CARPET, $03, 5, EVENT_2AD, SPRITE_KOGA ; 0d
decoration DECO_CARPET, $04, 5, EVENT_2AE, SPRITE_SABRINA ; 0e
decoration DECO_CARPET, $01, 8, EVENT_000, SPRITE_NONE ; 0f
decoration DECO_CARPET, $05, 7, EVENT_2AF, SPRITE_SURGE ; 10
decoration DECO_CONSOLE, $19, 7, EVENT_2B0, SPRITE_COOLTRAINER_M ; 11
decoration DECO_CONSOLE, $23, 7, EVENT_2B1, SPRITE_COOLTRAINER_F ; 12
decoration DECO_CONSOLE, $27, 7, EVENT_2B2, SPRITE_BUG_CATCHER ; 13
decoration DECO_CARPET, $01, 10, EVENT_000, SPRITE_NONE ; 14
decoration DECO_CARPET, $06, 9, EVENT_2B3, SPRITE_FAMICOM ; 15
decoration DECO_CARPET, $07, 9, EVENT_2B4, SPRITE_SNES ; 16
decoration DECO_CARPET, $08, 9, EVENT_2B5, SPRITE_N64 ; 17
decoration DECO_CARPET, $09, 9, EVENT_2B6, SPRITE_VIRTUAL_BOY ; 18
decoration DECO_CARPET, $01, 12, EVENT_000, SPRITE_NONE ; 19
decoration DECO_BIGDOLL, $8f, 11, EVENT_2CF, SPRITE_BIG_SNORLAX ; 1a
decoration DECO_BIGDOLL, $5f, 11, EVENT_2D0, SPRITE_BIG_ONIX ; 1b
decoration DECO_BIGDOLL, $83, 11, EVENT_2D1, SPRITE_BIG_LAPRAS ; 1c
decoration DECO_CARPET, $01, 14, EVENT_000, SPRITE_NONE ; 1d
decoration DECO_ORNAMENT, $19, 13, EVENT_2B7, SPRITE_PIKACHU ; 1e
decoration DECO_CARPET, $0c, 13, EVENT_2B8, SPRITE_SURFING_PIKACHU ; 1f
decoration DECO_ORNAMENT, $23, 13, EVENT_2B9, SPRITE_CLEFAIRY ; 20
decoration DECO_ORNAMENT, $27, 13, EVENT_2BA, SPRITE_JIGGLYPUFF ; 21
decoration DECO_ORNAMENT, $01, 13, EVENT_2BB, SPRITE_BULBASAUR ; 22
decoration DECO_ORNAMENT, $04, 13, EVENT_2BC, SPRITE_CHARMANDER ; 23
decoration DECO_ORNAMENT, $07, 13, EVENT_2BD, SPRITE_SQUIRTLE ; 24
decoration DECO_ORNAMENT, $3c, 13, EVENT_2BE, SPRITE_POLIWAG ; 25
decoration DECO_ORNAMENT, $32, 13, EVENT_2BF, SPRITE_DIGLETT ; 26
decoration DECO_ORNAMENT, $78, 13, EVENT_2C0, SPRITE_STARMIE ; 27
decoration DECO_ORNAMENT, $81, 13, EVENT_2C1, SPRITE_MAGIKARP ; 28
decoration DECO_ORNAMENT, $2b, 13, EVENT_2C2, SPRITE_ODDISH ; 29
decoration DECO_ORNAMENT, $5e, 13, EVENT_2C3, SPRITE_GENGAR ; 2a
decoration DECO_ORNAMENT, $5a, 13, EVENT_2C4, SPRITE_SHELLDER ; 2b
decoration DECO_ORNAMENT, $58, 13, EVENT_2C5, SPRITE_GRIMER ; 2c
decoration DECO_ORNAMENT, $64, 13, EVENT_2C6, SPRITE_VOLTORB ; 2d
decoration DECO_ORNAMENT, $0d, 13, EVENT_2C7, SPRITE_WEEDLE ; 2e
decoration DECO_ORNAMENT, $c9, 13, EVENT_2C8, SPRITE_UNOWN ; 2f
decoration DECO_ORNAMENT, $4a, 13, EVENT_2C9, SPRITE_GEODUDE ; 30
decoration DECO_ORNAMENT, $42, 13, EVENT_2CA, SPRITE_MACHOP; 31
decoration DECO_ORNAMENT, $48, 13, EVENT_2CB, SPRITE_TENTACOOL; 32
decoration DECO_CARPET, $0a, 13, EVENT_2CD, SPRITE_GOLD_TROPHY; 33
decoration DECO_CARPET, $0b, 13, EVENT_2CE, SPRITE_SILVER_TROPHY; 34
decoration DECO_PLANT, $00, $0, EVENT_000, $00
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_000, $00
decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b
decoration DECO_BED, PINK_BED, SET_UP_BED, EVENT_DECO_BED_2, $1c
decoration DECO_BED, POLKADOT_BED, SET_UP_BED, EVENT_DECO_BED_3, $1d
decoration DECO_BED, PIKACHU_BED, SET_UP_BED, EVENT_DECO_BED_4, $1e
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_000, $00
decoration DECO_CARPET, RED_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_1, $08
decoration DECO_CARPET, BLUE_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_2, $0b
decoration DECO_CARPET, YELLOW_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_3, $0e
decoration DECO_CARPET, GREEN_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_4, $11
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_000, $00
decoration DECO_PLANT, MAGNAPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_1, $20
decoration DECO_PLANT, TROPICPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_2, $21
decoration DECO_PLANT, JUMBOPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_3, $22
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_000, $00
decoration DECO_PLANT, TOWN_MAP_D, SET_UP_POSTER, EVENT_DECO_PLANT_4, $1f
decoration DECO_POSTER, PIKACHU, SET_UP_POSTER, EVENT_DECO_POSTER_1, $23
decoration DECO_POSTER, CLEFAIRY, SET_UP_POSTER, EVENT_DECO_POSTER_2, $24
decoration DECO_POSTER, JIGGLYPUFF, SET_UP_POSTER, EVENT_DECO_POSTER_3, $25
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_000, $00
decoration DECO_PLANT, FAMICOM, SET_UP_CONSOLE, EVENT_DECO_FAMICOM, SPRITE_FAMICOM
decoration DECO_PLANT, SUPER_NES, SET_UP_CONSOLE, EVENT_DECO_SNES, SPRITE_SNES
decoration DECO_PLANT, NINTENDO_64, SET_UP_CONSOLE, EVENT_DECO_N64, SPRITE_N64
decoration DECO_PLANT, VIRTUAL_BOY, SET_UP_CONSOLE, EVENT_DECO_VIRTUAL_BOY, SPRITE_VIRTUAL_BOY
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_000, $00
decoration DECO_BIGDOLL, SNORLAX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_SNORLAX_DOLL, SPRITE_BIG_SNORLAX
decoration DECO_BIGDOLL, ONIX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_ONIX_DOLL, SPRITE_BIG_ONIX
decoration DECO_BIGDOLL, LAPRAS, SET_UP_BIG_DOLL, EVENT_DECO_BIG_LAPRAS_DOLL, SPRITE_BIG_LAPRAS
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_000, $00
decoration DECO_DOLL, PIKACHU, SET_UP_DOLL, EVENT_DECO_PIKACHU_DOLL, SPRITE_PIKACHU
decoration DECO_PLANT, SURF_PIKA_DOLL, SET_UP_DOLL, EVENT_DECO_SURFING_PIKACHU_DOLL, SPRITE_SURFING_PIKACHU
decoration DECO_DOLL, CLEFAIRY, SET_UP_DOLL, EVENT_DECO_CLEFAIRY_DOLL, SPRITE_CLEFAIRY
decoration DECO_DOLL, JIGGLYPUFF, SET_UP_DOLL, EVENT_DECO_JIGGLYPUFF_DOLL, SPRITE_JIGGLYPUFF
decoration DECO_DOLL, BULBASAUR, SET_UP_DOLL, EVENT_DECO_BULBASAUR_DOLL, SPRITE_BULBASAUR
decoration DECO_DOLL, CHARMANDER, SET_UP_DOLL, EVENT_DECO_CHARMANDER_DOLL, SPRITE_CHARMANDER
decoration DECO_DOLL, SQUIRTLE, SET_UP_DOLL, EVENT_DECO_SQUIRTLE_DOLL, SPRITE_SQUIRTLE
decoration DECO_DOLL, POLIWAG, SET_UP_DOLL, EVENT_DECO_POLIWAG_DOLL, SPRITE_POLIWAG
decoration DECO_DOLL, DIGLETT, SET_UP_DOLL, EVENT_DECO_DIGLETT_DOLL, SPRITE_DIGLETT
decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARMIE_DOLL, SPRITE_STARMIE
decoration DECO_DOLL, MAGIKARP, SET_UP_DOLL, EVENT_DECO_MAGIKARP_DOLL, SPRITE_MAGIKARP
decoration DECO_DOLL, ODDISH, SET_UP_DOLL, EVENT_DECO_ODDISH_DOLL, SPRITE_ODDISH
decoration DECO_DOLL, GENGAR, SET_UP_DOLL, EVENT_DECO_GENGAR_DOLL, SPRITE_GENGAR
decoration DECO_DOLL, SHELLDER, SET_UP_DOLL, EVENT_DECO_SHELLDER_DOLL, SPRITE_SHELLDER
decoration DECO_DOLL, GRIMER, SET_UP_DOLL, EVENT_DECO_GRIMER_DOLL, SPRITE_GRIMER
decoration DECO_DOLL, VOLTORB, SET_UP_DOLL, EVENT_DECO_VOLTORB_DOLL, SPRITE_VOLTORB
decoration DECO_DOLL, WEEDLE, SET_UP_DOLL, EVENT_DECO_WEEDLE_DOLL, SPRITE_WEEDLE
decoration DECO_DOLL, UNOWN, SET_UP_DOLL, EVENT_DECO_UNOWN_DOLL, SPRITE_UNOWN
decoration DECO_DOLL, GEODUDE, SET_UP_DOLL, EVENT_DECO_GEODUDE_DOLL, SPRITE_GEODUDE
decoration DECO_DOLL, MACHOP, SET_UP_DOLL, EVENT_DECO_MACHOP_DOLL, SPRITE_MACHOP
decoration DECO_DOLL, TENTACOOL, SET_UP_DOLL, EVENT_DECO_TENTACOOL_DOLL, SPRITE_TENTACOOL
decoration DECO_PLANT, GOLD_TROPHY, SET_UP_DOLL, EVENT_DECO_GOLD_TROPHY, SPRITE_GOLD_TROPHY
decoration DECO_PLANT, SILVER_TROPHY, SET_UP_DOLL, EVENT_DECO_SILVER_TROPHY, SPRITE_SILVER_TROPHY
; 26b8d
@ -28565,7 +28565,7 @@ DecorationNames: ; 26b8d
db "GREEN@"
; 26c72
GetDecorationType: ; 26c72
GetDecoName: ; 26c72
ld a, [hli]
ld e, [hl]
ld bc, StringBuffer2
@ -28578,9 +28578,9 @@ GetDecorationType: ; 26c72
.NameFunctions: ; 26c7e
dw .invalid
dw .default
dw .plant
dw .bed
dw .three
dw .carpet
dw .poster
dw .doll
dw .bigdoll
@ -28591,35 +28591,35 @@ GetDecorationType: ; 26c72
ret
; 26c8d
.default: ; 26c8d
.plant: ; 26c8d
ld a, e
jr .getdeconame
.bed: ; 26c90
call .default
ld a, $d ; " BED@"
call .plant
ld a, _BED
jr .getdeconame
.three: ; 26c97
call .default
ld a, $e ; " CARPET@"
.carpet: ; 26c97
call .plant
ld a, _CARPET
jr .getdeconame
.poster: ; 26c9e
ld a, e
call .getpokename
ld a, $f ; " POSTER@"
ld a, _POSTER
jr .getdeconame
.doll: ; 26ca6
ld a, e
call .getpokename
ld a, $10 ; " DOLL@"
ld a, _DOLL
jr .getdeconame
.bigdoll: ; 26cae
push de
ld a, $11 ; "BIG @"
ld a, BIG_
call .getdeconame
pop de
ld a, e
@ -28733,7 +28733,7 @@ DecoAction_TrySetItUp: ; 26d2d
push hl
call DecoAction_SetItUp
jr c, .failed
ld a, $1
ld a, 1
ld [wd1ee], a
pop hl
ld a, [MenuSelection]
@ -28838,7 +28838,7 @@ DecoAction_putawayornament: ; 26dc9
call DecoAction_PutItAway_Ornament
DecoAction_FinishUp_Ornament: ; 26dd6
call Function26e9a
call QueryWhichSide
ld a, [wd1ec]
ld [hl], a
ld a, [wd1ed]
@ -28936,15 +28936,15 @@ UnknownText_0x26e6b: ; 0x26e6b
DecoAction_AskWhichSide: ; 26e70
call MenuTextBox
ld hl, MenuDataHeader_0x26eab
call Function1dab
call GetMenu2
call Function1c07
call Function1c66
jr c, .asm_26e98
jr c, .nope
ld a, [wcfa9]
cp $3
jr z, .asm_26e98
cp 3
jr z, .nope
ld [Buffer2], a
call Function26e9a
call QueryWhichSide
ld a, [hl]
ld [wd1ec], a
ld a, [de]
@ -28952,16 +28952,16 @@ DecoAction_AskWhichSide: ; 26e70
xor a
ret
.asm_26e98
.nope
scf
ret
; 26e9a
Function26e9a: ; 26e9a
QueryWhichSide: ; 26e9a
ld hl, RightOrnament
ld de, LeftOrnament
ld a, [Buffer2]
cp $1
cp 1
ret z
push hl
ld h, d
@ -29016,7 +29016,7 @@ UnknownText_0x26ee5: ; 0x26ee5
db "@"
; 0x26eea
Function26eea: ; 26eea
GetDecorationName_c_de: ; 26eea
ld a, c
ld h, d
ld l, e
@ -29024,13 +29024,13 @@ Function26eea: ; 26eea
ret
; 26ef1
Function26ef1: ; 26ef1
DecorationFlagAction_c: ; 26ef1
ld a, c
jp DecorationFlagAction
; 26ef5
Function26ef5: ; 26ef5 (9:6ef5)
GetDecorationName_c: ; 26ef5 (9:6ef5)
ld a, c
call GetDecorationID
ld hl, StringBuffer1
@ -29078,51 +29078,56 @@ SetAllDecorationFlags: ; 26f19
; 26f2b
DecorationIDs: ; 26f2b
db $02
db $03
db $04
db $05
db $07
db $08
db $09
db $0a
db $0c
db $0d
db $0e
db $10
db $11
db $12
db $13
db $15
db $16
db $17
db $18
db $1e
db $1f
db $20
db $21
db $22
db $23
db $24
db $25
db $26
db $27
db $28
db $29
db $2a
db $2b
db $2c
db $2d
db $2e
db $2f
db $30
db $31
db $32
db $1a
db $1b
db $1c
db $33
db $34
db DECO_FEATHERY_BED ; 2
db DECO_PINK_BED ; 3
db DECO_POLKADOT_BED ; 4
db DECO_PIKACHU_BED ; 5
db DECO_RED_CARPET ; 7
db DECO_BLUE_CARPET ; 8
db DECO_YELLOW_CARPET ; 9
db DECO_GREEN_CARPET ; a
db DECO_MAGNAPLANT ; c
db DECO_TROPICPLANT ; d
db DECO_JUMBOPLANT ; e
db DECO_TOWN_MAP ; 10
db DECO_PIKACHU_POSTER ; 11
db DECO_CLEFAIRY_POSTER ; 12
db DECO_JIGGLYPUFF_POSTER ; 13
db DECO_FAMICOM ; 15
db DECO_SNES ; 16
db DECO_N64 ; 17
db DECO_VIRTUAL_BOY ; 18
db DECO_PIKACHU_DOLL ; 1e
db DECO_SURF_PIKACHU_DOLL ; 1f
db DECO_CLEFAIRY_DOLL ; 20
db DECO_JIGGLYPUFF_DOLL ; 21
db DECO_BULBASAUR_DOLL ; 22
db DECO_CHARMANDER_DOLL ; 23
db DECO_SQUIRTLE_DOLL ; 24
db DECO_POLIWAG_DOLL ; 25
db DECO_DIGLETT_DOLL ; 26
db DECO_STARMIE_DOLL ; 27
db DECO_MAGIKARP_DOLL ; 28
db DECO_ODDISH_DOLL ; 29
db DECO_GENGAR_DOLL ; 2a
db DECO_SHELLDER_DOLL ; 2b
db DECO_GRIMER_DOLL ; 2c
db DECO_VOLTORB_DOLL ; 2d
db DECO_WEEDLE_DOLL ; 2e
db DECO_UNOWN_DOLL ; 2f
db DECO_GEODUDE_DOLL ; 30
db DECO_MACHOP_DOLL ; 31
db DECO_TENTACOOL_DOLL ; 32
db DECO_BIG_SNORLAX_DOLL ; 1a
db DECO_BIG_ONIX_DOLL ; 1b
db DECO_BIG_LAPRAS_DOLL ; 1c
db DECO_GOLD_TROPHY_DOLL ; 33
db DECO_SILVER_TROPHY_DOLL ; 34
db -1
; 26f59
@ -29146,12 +29151,12 @@ DecorationDesc_Poster: ; 26f69
ld hl, DecorationDesc_PosterPointers
ld de, 3
call IsInArray
jr c, .asm_26f7d
jr c, .nope
ld de, DecorationDesc_NullPoster
ld b, BANK(DecorationDesc_NullPoster)
ret
.asm_26f7d
.nope
ld b, BANK(DecorationDesc_TownMapPoster)
inc hl
ld a, [hli]
@ -29161,11 +29166,11 @@ DecorationDesc_Poster: ; 26f69
; 26f84
DecorationDesc_PosterPointers: ; 26f84
dbw $10, DecorationDesc_TownMapPoster
dbw $11, DecorationDesc_PikachuPoster
dbw $12, DecorationDesc_ClefairyPoster
dbw $13, DecorationDesc_JigglypuffPoster
db $ff
dbw DECO_TOWN_MAP, DecorationDesc_TownMapPoster
dbw DECO_PIKACHU_POSTER, DecorationDesc_PikachuPoster
dbw DECO_CLEFAIRY_POSTER, DecorationDesc_ClefairyPoster
dbw DECO_JIGGLYPUFF_POSTER, DecorationDesc_JigglypuffPoster
db -1
; 26f91
DecorationDesc_TownMapPoster: ; 0x26f91
@ -29232,7 +29237,7 @@ DecorationDesc_Console: ; 26fc3
DecorationDesc_OrnamentOrConsole: ; 26fc8
ld c, a
ld de, StringBuffer3
call Function26eea
call GetDecorationName_c_de
ld b, BANK(Unknown_26fd5)
ld de, Unknown_26fd5
ret
@ -29264,19 +29269,19 @@ UnknownText_0x26fe6: ; 0x26fe6
db "@"
; 0x26feb
Function26feb: ; 26feb
ToggleMaptileDecorations: ; 26feb
lb de, 0, 4
ld a, [Bed]
call Function27037
call SetDecorationTile
lb de, 7, 4
ld a, [Plant]
call Function27037
call SetDecorationTile
lb de, 6, 0
ld a, [Poster]
call Function27037
call SetDecorationTile
call SetPosterVisibility
lb de, 0, 0
call Function27092
call PadCoords_de
ld a, [Carpet]
and a
ret z
@ -29284,7 +29289,7 @@ Function26feb: ; 26feb
ld [hl], a
push af
lb de, 0, 2
call Function27092
call PadCoords_de
pop af
inc a
ld [hli], a
@ -29307,9 +29312,9 @@ SetPosterVisibility: ; 27027
jp EventFlagAction
; 27037
Function27037: ; 27037
SetDecorationTile: ; 27037
push af
call Function27092
call PadCoords_de
pop af
and a
ret z
@ -29362,7 +29367,7 @@ _GetDecorationSprite: ; 27085
ret
; 27092
Function27092: ; 27092
PadCoords_de: ; 27092
ld a, d
add 4
ld d, a
@ -29374,7 +29379,7 @@ Function27092: ; 27092
; 2709e
Function2709e: ; 2709e
LevelUpHappinessMod: ; 2709e
ld a, [CurPartyMon]
ld hl, PartyMon1CaughtLocation
call GetPartyLocation
@ -29403,14 +29408,14 @@ Function2715c: ; 2715c
call ClearTileMap
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
jr z, .asm_27171
jr z, .gettutorialbackpic
callba Function3f43d
jr .asm_27177
jr .continue
.asm_27171
.gettutorialbackpic
callba GetBattleBackpic
.asm_27177
.continue
callba Function3f47c
callba Function3ed9f
call ClearSGB
@ -29429,24 +29434,24 @@ Function27192: ; 27192
ld hl, OTPartyMon1Item
ld de, EnemyMonItem
ld a, [CurOTMon]
jr z, .asm_271ac
jr z, .theirturn
ld hl, PartyMon1Item
ld de, BattleMonItem
ld a, [CurBattleMon]
.asm_271ac
.theirturn
push hl
push af
ld a, [de]
ld b, a
callba GetItem
ld hl, Unknown_271de
.asm_271b9
.loop
ld a, [hli]
cp b
jr z, .asm_271c6
jr z, .ok
inc a
jr nz, .asm_271b9
jr nz, .loop
pop af
pop hl
pop bc
@ -29454,7 +29459,7 @@ Function27192: ; 27192
pop hl
ret
.asm_271c6
.ok
xor a
ld [de], a
pop af
@ -29462,15 +29467,15 @@ Function27192: ; 27192
call GetPartyLocation
ld a, [hBattleTurn]
and a
jr nz, .asm_271d8
jr nz, .ourturn
ld a, [IsInBattle]
dec a
jr z, .asm_271da
jr z, .done
.asm_271d8
.ourturn
ld [hl], $0
.asm_271da
.done
pop bc
pop de
pop hl
@ -29500,7 +29505,7 @@ Unknown_271de: ; 271de
db $47
db HELD_ESCAPE
db HELD_CRITICAL_UP
db $ff
db -1
; 271f4
MoveEffectsPointers: ; 271f4
@ -38478,7 +38483,7 @@ Function44648: ; 44648
Function44654:: ; 44654
push bc
push de
callba Function50000
callba SelectMonFromParty
ld a, $2
jr c, .asm_446c6
ld a, [CurPartyMon]
@ -48214,7 +48219,7 @@ INCLUDE "event/poke_seer.asm"
SECTION "bank14", ROMX, BANK[$14]
Function50000: ; 50000
SelectMonFromParty: ; 50000
call Function2ed3
xor a
ld [PartyMenuActionText], a
@ -49431,24 +49436,24 @@ Function50753: ; 50753
_CardKey: ; 50779
ld a, [MapGroup]
cp GROUP_RADIO_TOWER_3F
jr nz, .asm_507a9
jr nz, .nope
ld a, [MapNumber]
cp MAP_RADIO_TOWER_3F
jr nz, .asm_507a9
jr nz, .nope
ld a, [PlayerDirection]
and $c
cp UP << 2
jr nz, .asm_507a9
cp OW_UP
jr nz, .nope
call GetFacingTileCoord
ld a, d
cp 18
jr nz, .asm_507a9
jr nz, .nope
ld a, e
cp 6
jr nz, .asm_507a9
jr nz, .nope
ld hl, UnknownScript_0x507af
call ExitMenuCallScript
@ -49456,7 +49461,7 @@ _CardKey: ; 50779
ld [wd0ec], a
ret
.asm_507a9
.nope
ld a, $0
ld [wd0ec], a
ret
@ -89998,7 +90003,7 @@ UnownWord26: unownword "ZOOM"
; fbb32
Special_CheckMagikarpLength: ; fbb32
callba Function50000
callba SelectMonFromParty
jr c, .declined
ld a, [CurPartySpecies]
cp MAGIKARP
@ -91137,7 +91142,7 @@ Functionfd0c3: ; fd0c3
ld a, [hl]
ld c, a
ld b, 1
callba Function26ef1
callba DecorationFlagAction_c
scf
ret
@ -91226,13 +91231,13 @@ MomItems_2: ; fd15e
momitem 900, 600, MOM_ITEM, SUPER_POTION
momitem 4000, 270, MOM_ITEM, REPEL
momitem 7000, 600, MOM_ITEM, SUPER_POTION
momitem 10000, 1800, MOM_DOLL, DOLL_CHARMANDER
momitem 10000, 1800, MOM_DOLL, DECO_CHARMANDER_DOLL
momitem 15000, 3000, MOM_ITEM, MOON_STONE
momitem 19000, 600, MOM_ITEM, SUPER_POTION
momitem 30000, 4800, MOM_DOLL, DOLL_CLEFAIRY
momitem 30000, 4800, MOM_DOLL, DECO_CLEFAIRY_DOLL
momitem 40000, 900, MOM_ITEM, HYPER_POTION
momitem 50000, 8000, MOM_DOLL, DOLL_PIKACHU
momitem 100000, 22800, MOM_DOLL, BIGDOLL_SNORLAX
momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL
momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL
; fd1ae
db 0, 0, 0 ; XXX
@ -92366,7 +92371,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
call Function105069
pop bc
jr nz, .asm_104990
callab Function26ef5
callab GetDecorationName_c
ld h, d
ld l, e
ld de, StringBuffer1

View File

@ -371,10 +371,10 @@ AzaleaGym_MapEventHeader:
; people-events
db 7
person_event SPRITE_BUGSY, 11, 9, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugsyScript_0x18ec1e, -1
person_event SPRITE_BUG_CATCHER, 7, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherBug_catcher_benny, -1
person_event SPRITE_BUG_CATCHER, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherAl, -1
person_event SPRITE_BUG_CATCHER, 6, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherJosh, -1
person_event SPRITE_TWIN, 14, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay1, -1
person_event SPRITE_TWIN, 14, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay2, -1
person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, AzaleaGymGuyScript, -1
person_event SPRITE_BUGSY, 11, 9, OW_DOWN | $3, $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, 12, 12, OW_UP | $2, $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_TWIN, 14, 8, OW_UP | $2, $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_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, AzaleaGymGuyScript, -1

View File

@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
; people-events
db 3
person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x18e040, -1
person_event SPRITE_COOLTRAINER_M, 9, 6, UP << 2 | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x18e047, -1
person_event SPRITE_BUG_CATCHER, 6, 11, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18e04a, -1
person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $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_BUG_CATCHER, 6, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18e04a, -1

View File

@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
; people-events
db 4
person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x18db28, -1
person_event SPRITE_GENTLEMAN, 10, 13, UP << 2 | $0, $10, -1, -1, $0, 0, GentlemanScript_0x18db2b, -1
person_event SPRITE_FISHING_GURU, 5, 10, UP << 2 | $2, $0, -1, -1, $0, 0, FishingGuruScript_0x18db2e, -1
person_event SPRITE_POKEFAN_F, 8, 5, DOWN << 2 | $2, $21, -1, -1, $0, 0, PokefanFScript_0x18db31, -1
person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $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_FISHING_GURU, 5, 10, OW_UP | $2, $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

View File

@ -481,15 +481,15 @@ AzaleaTown_MapEventHeader:
; people-events
db 12
person_event SPRITE_AZALEA_ROCKET, 13, 35, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
person_event SPRITE_GRAMPS, 13, 25, DOWN << 2 | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1
person_event SPRITE_TEACHER, 17, 19, UP << 2 | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1
person_event SPRITE_YOUNGSTER, 13, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1
person_event SPRITE_SLOWPOKE, 21, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 13, 22, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 13, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 19, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_FRUIT_TREE, 6, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, WhiteApricornTree, -1
person_event SPRITE_AZALEA_ROCKET, 14, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
person_event SPRITE_AZALEA_ROCKET, 20, 14, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
person_event SPRITE_KURT_OUTSIDE, 9, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
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_GRAMPS, 13, 25, OW_DOWN | $2, $21, -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_YOUNGSTER, 13, 11, OW_UP | $1, $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, 13, 22, OW_DOWN | $1, $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, 19, 19, OW_DOWN | $1, $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_AZALEA_ROCKET, 14, 15, OW_LEFT | $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_KURT_OUTSIDE, 9, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT

View File

@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader:
; people-events
db 5
person_event SPRITE_RECEPTIONIST, 10, 11, UP << 2 | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x9e3e2, -1
person_event SPRITE_YOUNGSTER, 13, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x9e55d, -1
person_event SPRITE_COOLTRAINER_F, 13, 8, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x9e568, -1
person_event SPRITE_BUG_CATCHER, 7, 5, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BugCatcherScript_0x9e56b, -1
person_event SPRITE_GRANNY, 7, 18, UP << 2 | $0, $10, -1, -1, $0, 0, GrannyScript_0x9e56e, -1
person_event SPRITE_RECEPTIONIST, 10, 11, OW_UP | $2, $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_COOLTRAINER_F, 13, 8, OW_UP | $1, $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_GRANNY, 7, 18, OW_UP | $0, $10, -1, -1, $0, 0, GrannyScript_0x9e56e, -1

View File

@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader:
; people-events
db 2
person_event SPRITE_YOUNGSTER, 4, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
person_event SPRITE_RECEPTIONIST, 10, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, -1
person_event SPRITE_YOUNGSTER, 4, 8, OW_UP | $2, $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

View File

@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
; people-events
db 1
person_event SPRITE_RECEPTIONIST, 6, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, MovementData_0x9f58f, -1
person_event SPRITE_RECEPTIONIST, 6, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, MovementData_0x9f58f, -1

View File

@ -96,4 +96,4 @@ BattleTowerHallway_MapEventHeader:
; people-events
db 1
person_event SPRITE_RECEPTIONIST, 6, 15, UP << 2 | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1
person_event SPRITE_RECEPTIONIST, 6, 15, OW_UP | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1

View File

@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader:
; people-events
db 4
person_event SPRITE_STANDING_YOUNGSTER, 16, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x9f85f, -1
person_event SPRITE_BUENA, 15, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x9f862, -1
person_event SPRITE_SAILOR, 22, 16, UP << 2 | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
person_event SPRITE_LASS, 28, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1
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_BUENA, 15, 17, OW_DOWN | $2, $11, -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_LASS, 28, 16, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1

View File

@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
; people-events
db 1
person_event SPRITE_GRAMPS, 7, 6, UP << 2 | $3, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x189538, -1
person_event SPRITE_GRAMPS, 7, 6, OW_UP | $3, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x189538, -1

View File

@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader:
; people-events
db 9
person_event SPRITE_SUPER_NERD, 16, 22, UP << 2 | $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, 23, UP << 2 | $2, $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, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
person_event SPRITE_GRAMPS, 6, 25, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
person_event SPRITE_BLACK_BELT, 35, 28, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x1a470e, -1
person_event SPRITE_COOLTRAINER_F, 29, 13, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1a4722, -1
person_event SPRITE_YOUNGSTER, 19, 17, UP << 2 | $1, $1, -1, -1, $0, 0, YoungsterScript_0x1a4725, -1
person_event SPRITE_YOUNGSTER, 24, 26, UP << 2 | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
person_event SPRITE_COOLTRAINER_F, 23, 39, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1a4728, -1
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, 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_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, 25, OW_LEFT | $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_COOLTRAINER_F, 29, 13, OW_UP | $1, $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, 24, 26, OW_UP | $2, $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

View File

@ -35,4 +35,4 @@ BlackthornDodrioTradeHouse_MapEventHeader:
; people-events
db 1
person_event SPRITE_LASS, 7, 6, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Emy, -1
person_event SPRITE_LASS, 7, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Emy, -1

View File

@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader:
; people-events
db 2
person_event SPRITE_GRANNY, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, GrannyScript_0x195949, -1
person_event SPRITE_EKANS, 9, 9, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, EkansScript_0x19594c, -1
person_event SPRITE_GRANNY, 7, 6, OW_DOWN | $3, $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

View File

@ -404,8 +404,8 @@ BlackthornGym1F_MapEventHeader:
; people-events
db 5
person_event SPRITE_CLAIR, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClairScript_0x194e24, -1
person_event SPRITE_COOLTRAINER_M, 10, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermMike, -1
person_event SPRITE_COOLTRAINER_M, 18, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermPaul, -1
person_event SPRITE_COOLTRAINER_F, 6, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfLola, -1
person_event SPRITE_GYM_GUY, 19, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BlackthornGymGuyScript, -1
person_event SPRITE_CLAIR, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClairScript_0x194e24, -1
person_event SPRITE_COOLTRAINER_M, 10, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermMike, -1
person_event SPRITE_COOLTRAINER_M, 18, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermPaul, -1
person_event SPRITE_COOLTRAINER_F, 6, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfLola, -1
person_event SPRITE_GYM_GUY, 19, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BlackthornGymGuyScript, -1

View File

@ -145,11 +145,11 @@ BlackthornGym2F_MapEventHeader:
; people-events
db 8
person_event SPRITE_COOLTRAINER_M, 5, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermCody, -1
person_event SPRITE_COOLTRAINER_F, 15, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfFran, -1
person_event SPRITE_BOULDER, 6, 12, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
person_event SPRITE_BOULDER, 7, 6, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
person_event SPRITE_BOULDER, 20, 10, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
person_event SPRITE_BOULDER, 7, 7, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 5, 10, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 18, 12, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1
person_event SPRITE_COOLTRAINER_M, 5, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermCody, -1
person_event SPRITE_COOLTRAINER_F, 15, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfFran, -1
person_event SPRITE_BOULDER, 6, 12, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
person_event SPRITE_BOULDER, 7, 6, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
person_event SPRITE_BOULDER, 20, 10, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
person_event SPRITE_BOULDER, 7, 7, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 5, 10, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 18, 12, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1

View File

@ -58,6 +58,6 @@ BlackthornMart_MapEventHeader:
; people-events
db 3
person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x195a5d, -1
person_event SPRITE_COOLTRAINER_M, 10, 11, UP << 2 | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x195a64, -1
person_event SPRITE_BLACK_BELT, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BlackBeltScript_0x195a67, -1
person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x195a5d, -1
person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x195a64, -1
person_event SPRITE_BLACK_BELT, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BlackBeltScript_0x195a67, -1

View File

@ -61,7 +61,7 @@ BlackthornPokeCenter1F_MapEventHeader:
; people-events
db 4
person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x195b79, -1
person_event SPRITE_GENTLEMAN, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, GentlemanScript_0x195b7c, -1
person_event SPRITE_TWIN, 8, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x195b7f, -1
person_event SPRITE_COOLTRAINER_M, 10, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x195b82, -1
person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x195b79, -1
person_event SPRITE_GENTLEMAN, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, GentlemanScript_0x195b7c, -1
person_event SPRITE_TWIN, 8, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x195b7f, -1
person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x195b82, -1

View File

@ -158,4 +158,4 @@ BluesHouse_MapEventHeader:
; people-events
db 1
person_event SPRITE_DAISY, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, DaisyScript_0x19b0d0, -1
person_event SPRITE_DAISY, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, DaisyScript_0x19b0d0, -1

View File

@ -145,4 +145,4 @@ BrunosRoom_MapEventHeader:
; people-events
db 1
person_event SPRITE_BRUNO, 11, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BrunoScript_0x1809c5, -1
person_event SPRITE_BRUNO, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BrunoScript_0x1809c5, -1

View File

@ -309,8 +309,8 @@ BurnedTower1F_MapEventHeader:
; people-events
db 5
person_event SPRITE_ROCK, 8, 19, LEFT << 2 | $10, $0, -1, -1, $0, 0, BurnedTower1FRock, -1
person_event SPRITE_SUPER_NERD, 16, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
person_event SPRITE_SILVER, 13, 12, LEFT << 2 | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
person_event SPRITE_MORTY, 18, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP
person_event SPRITE_ROCK, 8, 19, OW_LEFT | $10, $0, -1, -1, $0, 0, BurnedTower1FRock, -1
person_event SPRITE_SUPER_NERD, 16, 16, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
person_event SPRITE_SILVER, 13, 12, OW_LEFT | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
person_event SPRITE_MORTY, 18, 18, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
person_event SPRITE_POKE_BALL, 6, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP

View File

@ -251,12 +251,12 @@ BurnedTowerB1F_MapEventHeader:
; people-events
db 9
person_event SPRITE_BOULDER, 12, 21, LEFT << 2 | $11, $0, -1, -1, $0, 0, BurnedTowerB1FBoulder, -1
person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_ENTEI, 7, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_ENTEI, 7, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_POKE_BALL, 8, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
person_event SPRITE_SUPER_NERD, 16, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER
person_event SPRITE_BOULDER, 12, 21, OW_LEFT | $11, $0, -1, -1, $0, 0, BurnedTowerB1FBoulder, -1
person_event SPRITE_RAIKOU, 7, 11, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_ENTEI, 7, 16, OW_UP | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_SUICUNE, 8, 14, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_RAIKOU, 7, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_ENTEI, 7, 16, OW_UP | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_SUICUNE, 8, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_POKE_BALL, 8, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
person_event SPRITE_SUPER_NERD, 16, 14, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER

View File

@ -219,8 +219,8 @@ CeladonCafe_MapEventHeader:
; people-events
db 5
person_event SPRITE_SUPER_NERD, 7, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, SuperNerdScript_0x73049, -1
person_event SPRITE_FISHER, 10, 8, LEFT << 2 | $0, $0, -1, -1, $0, 0, FisherScript_0x73051, -1
person_event SPRITE_FISHER, 11, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x73062, -1
person_event SPRITE_FISHER, 6, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, FisherScript_0x73073, -1
person_event SPRITE_TEACHER, 7, 8, LEFT << 2 | $0, $0, -1, -1, $0, 0, TeacherScript_0x73084, -1
person_event SPRITE_SUPER_NERD, 7, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, SuperNerdScript_0x73049, -1
person_event SPRITE_FISHER, 10, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, FisherScript_0x73051, -1
person_event SPRITE_FISHER, 11, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x73062, -1
person_event SPRITE_FISHER, 6, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, FisherScript_0x73073, -1
person_event SPRITE_TEACHER, 7, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, TeacherScript_0x73084, -1

View File

@ -257,12 +257,12 @@ CeladonCity_MapEventHeader:
; people-events
db 9
person_event SPRITE_FISHER, 15, 30, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a9f43, -1
person_event SPRITE_POLIWAG, 15, 31, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonCityPoliwrath, -1
person_event SPRITE_TEACHER, 28, 24, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x1a9f50, -1
person_event SPRITE_GRAMPS, 20, 18, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x1a9f53, -1
person_event SPRITE_GRAMPS, 35, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrampsScript_0x1a9f56, -1
person_event SPRITE_YOUNGSTER, 17, 22, UP << 2 | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a9f59, -1
person_event SPRITE_YOUNGSTER, 37, 28, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a9f5c, -1
person_event SPRITE_TEACHER, 18, 10, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a9f5f, -1
person_event SPRITE_LASS, 26, 11, UP << 2 | $0, $20, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x1a9f62, -1
person_event SPRITE_FISHER, 15, 30, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a9f43, -1
person_event SPRITE_POLIWAG, 15, 31, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonCityPoliwrath, -1
person_event SPRITE_TEACHER, 28, 24, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x1a9f50, -1
person_event SPRITE_GRAMPS, 20, 18, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x1a9f53, -1
person_event SPRITE_GRAMPS, 35, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrampsScript_0x1a9f56, -1
person_event SPRITE_YOUNGSTER, 17, 22, OW_UP | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a9f59, -1
person_event SPRITE_YOUNGSTER, 37, 28, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a9f5c, -1
person_event SPRITE_TEACHER, 18, 10, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a9f5f, -1
person_event SPRITE_LASS, 26, 11, OW_UP | $0, $20, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x1a9f62, -1

View File

@ -89,6 +89,6 @@ CeladonDeptStore1F_MapEventHeader:
; people-events
db 3
person_event SPRITE_RECEPTIONIST, 5, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x709e0, -1
person_event SPRITE_GENTLEMAN, 8, 15, DOWN << 2 | $2, $11, -1, -1, $0, 0, GentlemanScript_0x709e3, -1
person_event SPRITE_TEACHER, 7, 9, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x709e6, -1
person_event SPRITE_RECEPTIONIST, 5, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x709e0, -1
person_event SPRITE_GENTLEMAN, 8, 15, OW_DOWN | $2, $11, -1, -1, $0, 0, GentlemanScript_0x709e3, -1
person_event SPRITE_TEACHER, 7, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x709e6, -1

View File

@ -82,7 +82,7 @@ CeladonDeptStore2F_MapEventHeader:
; people-events
db 4
person_event SPRITE_CLERK, 9, 17, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bad, -1
person_event SPRITE_CLERK, 9, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bb5, -1
person_event SPRITE_POKEFAN_M, 6, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x70bbd, -1
person_event SPRITE_YOUNGSTER, 6, 10, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70bc0, -1
person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bad, -1
person_event SPRITE_CLERK, 9, 18, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bb5, -1
person_event SPRITE_POKEFAN_M, 6, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x70bbd, -1
person_event SPRITE_YOUNGSTER, 6, 10, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70bc0, -1

View File

@ -107,8 +107,8 @@ CeladonDeptStore3F_MapEventHeader:
; people-events
db 5
person_event SPRITE_CLERK, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70d29, -1
person_event SPRITE_YOUNGSTER, 8, 10, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70d31, -1
person_event SPRITE_GAMEBOY_KID, 5, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x70d34, -1
person_event SPRITE_GAMEBOY_KID, 5, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GameboyKidScript_0x70d3f, -1
person_event SPRITE_SUPER_NERD, 8, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x70d4a, -1
person_event SPRITE_CLERK, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70d29, -1
person_event SPRITE_YOUNGSTER, 8, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70d31, -1
person_event SPRITE_GAMEBOY_KID, 5, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x70d34, -1
person_event SPRITE_GAMEBOY_KID, 5, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GameboyKidScript_0x70d3f, -1
person_event SPRITE_SUPER_NERD, 8, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x70d4a, -1

View File

@ -65,6 +65,6 @@ CeladonDeptStore4F_MapEventHeader:
; people-events
db 3
person_event SPRITE_CLERK, 9, 17, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70f0d, -1
person_event SPRITE_SUPER_NERD, 10, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x70f15, -1
person_event SPRITE_YOUNGSTER, 6, 12, UP << 2 | $3, $0, -1, -1, $0, 0, YoungsterScript_0x70f18, -1
person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70f0d, -1
person_event SPRITE_SUPER_NERD, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x70f15, -1
person_event SPRITE_YOUNGSTER, 6, 12, OW_UP | $3, $0, -1, -1, $0, 0, YoungsterScript_0x70f18, -1

View File

@ -84,8 +84,8 @@ CeladonDeptStore5F_MapEventHeader:
; people-events
db 5
person_event SPRITE_CLERK, 9, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x71004, -1
person_event SPRITE_CLERK, 9, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x7100c, -1
person_event SPRITE_GENTLEMAN, 9, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x71014, -1
person_event SPRITE_SAILOR, 8, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x71017, -1
person_event SPRITE_TEACHER, 11, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x7101a, -1
person_event SPRITE_CLERK, 9, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x71004, -1
person_event SPRITE_CLERK, 9, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x7100c, -1
person_event SPRITE_GENTLEMAN, 9, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x71014, -1
person_event SPRITE_SAILOR, 8, 7, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x71017, -1
person_event SPRITE_TEACHER, 11, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x7101a, -1

View File

@ -168,5 +168,5 @@ CeladonDeptStore6F_MapEventHeader:
; people-events
db 2
person_event SPRITE_SUPER_NERD, 6, 13, UP << 2 | $3, $0, -1, -1, $0, 0, SuperNerdScript_0x7117a, -1
person_event SPRITE_YOUNGSTER, 9, 16, DOWN << 2 | $2, $12, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x7117d, -1
person_event SPRITE_SUPER_NERD, 6, 13, OW_UP | $3, $0, -1, -1, $0, 0, SuperNerdScript_0x7117a, -1
person_event SPRITE_YOUNGSTER, 9, 16, OW_DOWN | $2, $12, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x7117d, -1

View File

@ -325,12 +325,12 @@ CeladonGameCorner_MapEventHeader:
; people-events
db 9
person_event SPRITE_CLERK, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ClerkScript_0x7211d, -1
person_event SPRITE_RECEPTIONIST, 6, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x72120, -1
person_event SPRITE_POKEFAN_M, 14, 18, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x72123, -1
person_event SPRITE_TEACHER, 11, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7212e, -1
person_event SPRITE_FISHING_GURU, 11, 15, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x72139, -1
person_event SPRITE_FISHER, 14, 12, LEFT << 2 | $0, $0, -1, 2, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x72144, -1
person_event SPRITE_FISHER, 14, 12, LEFT << 2 | $0, $0, -1, 4, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x72144, -1
person_event SPRITE_GYM_GUY, 7, 15, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CeladonGymGuyScript, -1
person_event SPRITE_GRAMPS, 12, 6, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x72190, -1
person_event SPRITE_CLERK, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ClerkScript_0x7211d, -1
person_event SPRITE_RECEPTIONIST, 6, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x72120, -1
person_event SPRITE_POKEFAN_M, 14, 18, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x72123, -1
person_event SPRITE_TEACHER, 11, 21, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7212e, -1
person_event SPRITE_FISHING_GURU, 11, 15, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x72139, -1
person_event SPRITE_FISHER, 14, 12, OW_LEFT | $0, $0, -1, 2, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x72144, -1
person_event SPRITE_FISHER, 14, 12, OW_LEFT | $0, $0, -1, 4, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x72144, -1
person_event SPRITE_GYM_GUY, 7, 15, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CeladonGymGuyScript, -1
person_event SPRITE_GRAMPS, 12, 6, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x72190, -1

View File

@ -284,5 +284,5 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
; people-events
db 2
person_event SPRITE_GENTLEMAN, 6, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x726e9, -1
person_event SPRITE_PHARMACIST, 8, 8, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x726ec, -1
person_event SPRITE_GENTLEMAN, 6, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x726e9, -1
person_event SPRITE_PHARMACIST, 8, 8, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x726ec, -1

View File

@ -278,9 +278,9 @@ CeladonGym_MapEventHeader:
; people-events
db 6
person_event SPRITE_ERIKA, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ErikaScript_0x72a6a, -1
person_event SPRITE_LASS, 12, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerLassMichelle, -1
person_event SPRITE_LASS, 12, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerTanya, -1
person_event SPRITE_BUENA, 9, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBeautyJulia, -1
person_event SPRITE_TWIN, 14, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsJoandzoe1, -1
person_event SPRITE_TWIN, 14, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsJoandzoe2, -1
person_event SPRITE_ERIKA, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ErikaScript_0x72a6a, -1
person_event SPRITE_LASS, 12, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerLassMichelle, -1
person_event SPRITE_LASS, 12, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerTanya, -1
person_event SPRITE_BUENA, 9, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBeautyJulia, -1
person_event SPRITE_TWIN, 14, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsJoandzoe1, -1
person_event SPRITE_TWIN, 14, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsJoandzoe2, -1

View File

@ -91,7 +91,7 @@ CeladonMansion1F_MapEventHeader:
; people-events
db 4
person_event SPRITE_GRANNY, 9, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, CeladonMansionManager, -1
person_event SPRITE_GROWLITHE, 10, 6, UP << 2 | $12, $0, -1, -1, $0, 0, CeladonMansion1FMeowth, -1
person_event SPRITE_CLEFAIRY, 8, 7, UP << 2 | $12, $0, -1, -1, $0, 0, CeladonMansion1FClefairy, -1
person_event SPRITE_GROWLITHE, 8, 8, UP << 2 | $12, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonMansion1FNidoranF, -1
person_event SPRITE_GRANNY, 9, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, CeladonMansionManager, -1
person_event SPRITE_GROWLITHE, 10, 6, OW_UP | $12, $0, -1, -1, $0, 0, CeladonMansion1FMeowth, -1
person_event SPRITE_CLEFAIRY, 8, 7, OW_UP | $12, $0, -1, -1, $0, 0, CeladonMansion1FClefairy, -1
person_event SPRITE_GROWLITHE, 8, 8, OW_UP | $12, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonMansion1FNidoranF, -1

View File

@ -206,7 +206,7 @@ CeladonMansion3F_MapEventHeader:
; people-events
db 4
person_event SPRITE_COOLTRAINER_M, 10, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x71670, -1
person_event SPRITE_GYM_GUY, 8, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x71696, -1
person_event SPRITE_SUPER_NERD, 11, 4, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x716bc, -1
person_event SPRITE_FISHER, 8, 4, UP << 2 | $3, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x716bf, -1
person_event SPRITE_COOLTRAINER_M, 10, 7, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x71670, -1
person_event SPRITE_GYM_GUY, 8, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x71696, -1
person_event SPRITE_SUPER_NERD, 11, 4, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x716bc, -1
person_event SPRITE_FISHER, 8, 4, OW_UP | $3, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x716bf, -1

View File

@ -49,4 +49,4 @@ CeladonMansionRoof_MapEventHeader:
; people-events
db 1
person_event SPRITE_FISHER, 9, 11, UP << 2 | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x71a39, -1
person_event SPRITE_FISHER, 9, 11, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x71a39, -1

View File

@ -130,4 +130,4 @@ CeladonMansionRoofHouse_MapEventHeader:
; people-events
db 1
person_event SPRITE_PHARMACIST, 6, 7, UP << 2 | $2, $20, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x71afd, -1
person_event SPRITE_PHARMACIST, 6, 7, OW_UP | $2, $20, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x71afd, -1

View File

@ -156,8 +156,8 @@ CeladonPokeCenter1F_MapEventHeader:
; people-events
db 5
person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x71e22, -1
person_event SPRITE_GENTLEMAN, 9, 5, UP << 2 | $1, $1, -1, -1, $0, 0, GentlemanScript_0x71e25, -1
person_event SPRITE_PHARMACIST, 7, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PharmacistScript_0x71e2b, -1
person_event SPRITE_COOLTRAINER_F, 10, 12, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x71e28, -1
person_event SPRITE_SUPER_NERD, 7, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH
person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x71e22, -1
person_event SPRITE_GENTLEMAN, 9, 5, OW_UP | $1, $1, -1, -1, $0, 0, GentlemanScript_0x71e25, -1
person_event SPRITE_PHARMACIST, 7, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PharmacistScript_0x71e2b, -1
person_event SPRITE_COOLTRAINER_F, 10, 12, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x71e28, -1
person_event SPRITE_SUPER_NERD, 7, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH

View File

@ -299,9 +299,9 @@ CeruleanCity_MapEventHeader:
; people-events
db 6
person_event SPRITE_COOLTRAINER_M, 27, 19, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerMScript_0x184009, -1
person_event SPRITE_SUPER_NERD, 19, 27, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x18401d, -1
person_event SPRITE_SLOWPOKE, 28, 24, DOWN << 2 | $1, $0, -1, -1, $0, 0, CeruleanCitySlowbro, -1
person_event SPRITE_COOLTRAINER_F, 28, 25, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18402a, -1
person_event SPRITE_FISHER, 30, 34, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x18404a, -1
person_event SPRITE_YOUNGSTER, 16, 10, DOWN << 2 | $3, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x184064, -1
person_event SPRITE_COOLTRAINER_M, 27, 19, OW_DOWN | $2, $22, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerMScript_0x184009, -1
person_event SPRITE_SUPER_NERD, 19, 27, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x18401d, -1
person_event SPRITE_SLOWPOKE, 28, 24, OW_DOWN | $1, $0, -1, -1, $0, 0, CeruleanCitySlowbro, -1
person_event SPRITE_COOLTRAINER_F, 28, 25, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18402a, -1
person_event SPRITE_FISHER, 30, 34, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x18404a, -1
person_event SPRITE_YOUNGSTER, 16, 10, OW_DOWN | $3, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x184064, -1

View File

@ -377,9 +377,9 @@ CeruleanGym_MapEventHeader:
; people-events
db 6
person_event SPRITE_ROCKET, 14, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
person_event SPRITE_MISTY, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 10, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 13, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GUY, 13, 12, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_ROCKET, 14, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
person_event SPRITE_MISTY, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 10, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 13, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GUY, 13, 12, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM

View File

@ -30,4 +30,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader:
; people-events
db 1
person_event SPRITE_POKEFAN_M, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, PokefanMScript_0x188002, -1
person_event SPRITE_POKEFAN_M, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, PokefanMScript_0x188002, -1

View File

@ -57,6 +57,6 @@ CeruleanMart_MapEventHeader:
; people-events
db 3
person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x188ac0, -1
person_event SPRITE_COOLTRAINER_M, 10, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerMScript_0x188ac7, -1
person_event SPRITE_COOLTRAINER_F, 6, 11, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x188aca, -1
person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x188ac0, -1
person_event SPRITE_COOLTRAINER_M, 10, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerMScript_0x188ac7, -1
person_event SPRITE_COOLTRAINER_F, 6, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x188aca, -1

View File

@ -75,6 +75,6 @@ CeruleanPokeCenter1F_MapEventHeader:
; people-events
db 3
person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x18820f, -1
person_event SPRITE_SUPER_NERD, 8, 12, UP << 2 | $1, $1, -1, -1, $0, 0, SuperNerdScript_0x188212, -1
person_event SPRITE_GYM_GUY, 9, 5, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x18821e, -1
person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18820f, -1
person_event SPRITE_SUPER_NERD, 8, 12, OW_UP | $1, $1, -1, -1, $0, 0, SuperNerdScript_0x188212, -1
person_event SPRITE_GYM_GUY, 9, 5, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x18821e, -1

View File

@ -55,6 +55,6 @@ CeruleanPoliceStation_MapEventHeader:
; people-events
db 3
person_event SPRITE_FISHING_GURU, 5, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x18804a, -1
person_event SPRITE_POKEFAN_F, 8, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x18804d, -1
person_event SPRITE_DIGLETT, 9, 7, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, DiglettScript_0x188050, -1
person_event SPRITE_FISHING_GURU, 5, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x18804a, -1
person_event SPRITE_POKEFAN_F, 8, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x18804d, -1
person_event SPRITE_DIGLETT, 9, 7, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, DiglettScript_0x188050, -1

View File

@ -64,7 +64,7 @@ CeruleanTradeSpeechHouse_MapEventHeader:
; people-events
db 4
person_event SPRITE_GRANNY, 8, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrannyScript_0x188133, -1
person_event SPRITE_GRAMPS, 6, 5, DOWN << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x188136, -1
person_event SPRITE_RHYDON, 6, 9, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, RhydonScript_0x188139, -1
person_event SPRITE_ZUBAT, 10, 9, UP << 2 | $12, $0, -1, -1, $0, 0, ZubatScript_0x188143, -1
person_event SPRITE_GRANNY, 8, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrannyScript_0x188133, -1
person_event SPRITE_GRAMPS, 6, 5, OW_DOWN | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x188136, -1
person_event SPRITE_RHYDON, 6, 9, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, RhydonScript_0x188139, -1
person_event SPRITE_ZUBAT, 10, 9, OW_UP | $12, $0, -1, -1, $0, 0, ZubatScript_0x188143, -1

View File

@ -163,6 +163,6 @@ CharcoalKiln_MapEventHeader:
; people-events
db 3
person_event SPRITE_BLACK_BELT, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_6F7
person_event SPRITE_YOUNGSTER, 7, 9, DOWN << 2 | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_6F6
person_event SPRITE_MOLTRES, 10, 9, UP << 2 | $12, $22, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CharcoalKilnFarfetchd, EVENT_6F5
person_event SPRITE_BLACK_BELT, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_6F7
person_event SPRITE_YOUNGSTER, 7, 9, OW_DOWN | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_6F6
person_event SPRITE_MOLTRES, 10, 9, OW_UP | $12, $22, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CharcoalKilnFarfetchd, EVENT_6F5

View File

@ -570,8 +570,8 @@ CherrygroveCity_MapEventHeader:
; people-events
db 5
person_event SPRITE_GRAMPS, 10, 36, UP << 2 | $2, $0, -1, -1, $0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
person_event SPRITE_SILVER, 10, 43, DOWN << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
person_event SPRITE_TEACHER, 16, 31, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x19c146, -1
person_event SPRITE_YOUNGSTER, 11, 27, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x19c15a, -1
person_event SPRITE_FISHER, 16, 11, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MysticWaterGuy, -1
person_event SPRITE_GRAMPS, 10, 36, OW_UP | $2, $0, -1, -1, $0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
person_event SPRITE_SILVER, 10, 43, OW_DOWN | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
person_event SPRITE_TEACHER, 16, 31, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x19c146, -1
person_event SPRITE_YOUNGSTER, 11, 27, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x19c15a, -1
person_event SPRITE_FISHER, 16, 11, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MysticWaterGuy, -1

View File

@ -56,5 +56,5 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader:
; people-events
db 2
person_event SPRITE_LASS, 9, 7, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x196cb9, -1
person_event SPRITE_YOUNGSTER, 9, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196cb2, -1
person_event SPRITE_LASS, 9, 7, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x196cb9, -1
person_event SPRITE_YOUNGSTER, 9, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196cb2, -1

View File

@ -59,5 +59,5 @@ CherrygroveGymSpeechHouse_MapEventHeader:
; people-events
db 2
person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x196ae1, -1
person_event SPRITE_BUG_CATCHER, 9, 9, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x196ae4, -1
person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x196ae1, -1
person_event SPRITE_BUG_CATCHER, 9, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x196ae4, -1

View File

@ -83,6 +83,6 @@ CherrygroveMart_MapEventHeader:
; people-events
db 3
person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x19680a, -1
person_event SPRITE_COOLTRAINER_M, 10, 11, UP << 2 | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x19681d, -1
person_event SPRITE_YOUNGSTER, 9, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196831, -1
person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x19680a, -1
person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x19681d, -1
person_event SPRITE_YOUNGSTER, 9, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196831, -1

View File

@ -80,7 +80,7 @@ CherrygrovePokeCenter1F_MapEventHeader:
; people-events
db 4
person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x19696d, -1
person_event SPRITE_FISHER, 7, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x196970, -1
person_event SPRITE_GENTLEMAN, 10, 12, UP << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x196973, -1
person_event SPRITE_TEACHER, 10, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x196976, -1
person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x19696d, -1
person_event SPRITE_FISHER, 7, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x196970, -1
person_event SPRITE_GENTLEMAN, 10, 12, OW_UP | $3, $0, -1, -1, $0, 0, GentlemanScript_0x196973, -1
person_event SPRITE_TEACHER, 10, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x196976, -1

View File

@ -401,15 +401,15 @@ CianwoodCity_MapEventHeader:
; people-events
db 12
person_event SPRITE_STANDING_YOUNGSTER, 41, 25, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, StandingYoungsterScript_0x1a00b3, -1
person_event SPRITE_POKEFAN_M, 37, 21, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanMScript_0x1a00b6, -1
person_event SPRITE_LASS, 46, 18, UP << 2 | $0, $20, -1, -1, $0, 0, LassScript_0x1a00b9, -1
person_event SPRITE_ROCK, 20, 12, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 21, 13, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 29, 8, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 33, 9, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 31, 14, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 23, 8, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_POKEFAN_F, 50, 14, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanFScript_0x1a0084, -1
person_event SPRITE_SUPER_NERD, 25, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
person_event SPRITE_SUICUNE, 18, 14, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
person_event SPRITE_STANDING_YOUNGSTER, 41, 25, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, StandingYoungsterScript_0x1a00b3, -1
person_event SPRITE_POKEFAN_M, 37, 21, OW_UP | $1, $1, -1, -1, $0, 0, PokefanMScript_0x1a00b6, -1
person_event SPRITE_LASS, 46, 18, OW_UP | $0, $20, -1, -1, $0, 0, LassScript_0x1a00b9, -1
person_event SPRITE_ROCK, 20, 12, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 21, 13, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 29, 8, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 33, 9, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 31, 14, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 23, 8, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1
person_event SPRITE_POKEFAN_F, 50, 14, OW_UP | $1, $1, -1, -1, $0, 0, PokefanFScript_0x1a0084, -1
person_event SPRITE_SUPER_NERD, 25, 15, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
person_event SPRITE_SUICUNE, 18, 14, OW_DOWN | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY

View File

@ -62,4 +62,4 @@ CianwoodCityPhotoStudio_MapEventHeader:
; people-events
db 1
person_event SPRITE_FISHING_GURU, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x9e0e0, -1
person_event SPRITE_FISHING_GURU, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x9e0e0, -1

View File

@ -313,12 +313,12 @@ CianwoodGym_MapEventHeader:
; people-events
db 9
person_event SPRITE_CHUCK, 5, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ChuckScript_0x9d60f, -1
person_event SPRITE_BLACK_BELT, 16, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltYoshi, -1
person_event SPRITE_BLACK_BELT, 16, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltLao, -1
person_event SPRITE_BLACK_BELT, 13, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBlackbeltNob, -1
person_event SPRITE_BLACK_BELT, 9, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerBlackbeltLung, -1
person_event SPRITE_BOULDER, 5, 9, LEFT << 2 | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 11, 7, LEFT << 2 | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 11, 8, LEFT << 2 | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 11, 9, LEFT << 2 | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1
person_event SPRITE_CHUCK, 5, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ChuckScript_0x9d60f, -1
person_event SPRITE_BLACK_BELT, 16, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltYoshi, -1
person_event SPRITE_BLACK_BELT, 16, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltLao, -1
person_event SPRITE_BLACK_BELT, 13, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBlackbeltNob, -1
person_event SPRITE_BLACK_BELT, 9, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerBlackbeltLung, -1
person_event SPRITE_BOULDER, 5, 9, OW_LEFT | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 11, 7, OW_LEFT | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 11, 8, OW_LEFT | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 11, 9, OW_LEFT | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1

View File

@ -75,6 +75,6 @@ CianwoodLugiaSpeechHouse_MapEventHeader:
; people-events
db 3
person_event SPRITE_TEACHER, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, TeacherScript_0x9e1b0, -1
person_event SPRITE_LASS, 9, 10, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9e1b3, -1
person_event SPRITE_TWIN, 6, 4, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TwinScript_0x9e1b6, -1
person_event SPRITE_TEACHER, 8, 6, OW_UP | $2, $0, -1, -1, $0, 0, TeacherScript_0x9e1b0, -1
person_event SPRITE_LASS, 9, 10, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9e1b3, -1
person_event SPRITE_TWIN, 6, 4, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TwinScript_0x9e1b6, -1

View File

@ -90,4 +90,4 @@ CianwoodPharmacy_MapEventHeader:
; people-events
db 1
person_event SPRITE_PHARMACIST, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CianwoodPharmacist, -1
person_event SPRITE_PHARMACIST, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CianwoodPharmacist, -1

View File

@ -143,7 +143,7 @@ CianwoodPokeCenter1F_MapEventHeader:
; people-events
db 4
person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x9dbcf, -1
person_event SPRITE_LASS, 9, 5, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9dbd2, -1
person_event SPRITE_GYM_GUY, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CianwoodGymGuyScript, -1
person_event SPRITE_SUPER_NERD, 10, 12, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x9dbea, -1
person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x9dbcf, -1
person_event SPRITE_LASS, 9, 5, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9dbd2, -1
person_event SPRITE_GYM_GUY, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CianwoodGymGuyScript, -1
person_event SPRITE_SUPER_NERD, 10, 12, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x9dbea, -1

View File

@ -146,4 +146,4 @@ CinnabarIsland_MapEventHeader:
; people-events
db 1
person_event SPRITE_BLUE, 10, 13, DOWN << 2 | $3, $0, -1, -1, $0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
person_event SPRITE_BLUE, 10, 13, OW_DOWN | $3, $0, -1, -1, $0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR

View File

@ -47,6 +47,6 @@ CinnabarPokeCenter1F_MapEventHeader:
; people-events
db 3
person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x1ab32c, -1
person_event SPRITE_COOLTRAINER_F, 10, 11, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1ab32f, -1
person_event SPRITE_FISHER, 8, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1ab332, -1
person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x1ab32c, -1
person_event SPRITE_COOLTRAINER_F, 10, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1ab32f, -1
person_event SPRITE_FISHER, 8, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1ab332, -1

View File

@ -83,5 +83,5 @@ Colosseum_MapEventHeader:
; people-events
db 2
person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000
person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001
person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000
person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001

View File

@ -85,6 +85,6 @@ CopycatsHouse1F_MapEventHeader:
; people-events
db 3
person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x18ad13, -1
person_event SPRITE_POKEFAN_F, 8, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PokefanFScript_0x18ad16, -1
person_event SPRITE_CLEFAIRY, 10, 10, UP << 2 | $12, $0, -1, -1, $0, 0, ClefairyScript_0x18ad2a, -1
person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x18ad13, -1
person_event SPRITE_POKEFAN_F, 8, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PokefanFScript_0x18ad16, -1
person_event SPRITE_CLEFAIRY, 10, 10, OW_UP | $12, $0, -1, -1, $0, 0, ClefairyScript_0x18ad2a, -1

View File

@ -373,9 +373,9 @@ CopycatsHouse2F_MapEventHeader:
; people-events
db 6
person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Copycat, EVENT_COPYCAT_1
person_event SPRITE_MOLTRES, 8, 10, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CopycatsDodrio, -1
person_event SPRITE_FAIRY, 5, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
person_event SPRITE_MONSTER, 5, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CopycatsHouse2FDoll, -1
person_event SPRITE_BIRD, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CopycatsHouse2FDoll, -1
person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, Copycat, EVENT_COPYCAT_2
person_event SPRITE_COPYCAT, 7, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Copycat, EVENT_COPYCAT_1
person_event SPRITE_MOLTRES, 8, 10, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CopycatsDodrio, -1
person_event SPRITE_FAIRY, 5, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
person_event SPRITE_MONSTER, 5, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CopycatsHouse2FDoll, -1
person_event SPRITE_BIRD, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CopycatsHouse2FDoll, -1
person_event SPRITE_COPYCAT, 7, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, Copycat, EVENT_COPYCAT_2

View File

@ -345,12 +345,12 @@ DanceTheatre_MapEventHeader:
; people-events
db 9
person_event SPRITE_KIMONO_GIRL, 6, 4, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlNaoko2, -1
person_event SPRITE_KIMONO_GIRL, 5, 6, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlSayo, -1
person_event SPRITE_KIMONO_GIRL, 6, 10, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerKimono_girlZuki, -1
person_event SPRITE_KIMONO_GIRL, 5, 13, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlKuni, -1
person_event SPRITE_KIMONO_GIRL, 6, 15, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlMiki, -1
person_event SPRITE_GENTLEMAN, 14, 11, UP << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x994c6, -1
person_event SPRITE_RHYDON, 12, 10, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RhydonScript_0x9951b, -1
person_event SPRITE_COOLTRAINER_M, 14, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x99525, -1
person_event SPRITE_GRANNY, 10, 7, UP << 2 | $3, $0, -1, -1, $0, 0, GrannyScript_0x99528, -1
person_event SPRITE_KIMONO_GIRL, 6, 4, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlNaoko2, -1
person_event SPRITE_KIMONO_GIRL, 5, 6, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlSayo, -1
person_event SPRITE_KIMONO_GIRL, 6, 10, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerKimono_girlZuki, -1
person_event SPRITE_KIMONO_GIRL, 5, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlKuni, -1
person_event SPRITE_KIMONO_GIRL, 6, 15, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlMiki, -1
person_event SPRITE_GENTLEMAN, 14, 11, OW_UP | $3, $0, -1, -1, $0, 0, GentlemanScript_0x994c6, -1
person_event SPRITE_RHYDON, 12, 10, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RhydonScript_0x9951b, -1
person_event SPRITE_COOLTRAINER_M, 14, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x99525, -1
person_event SPRITE_GRANNY, 10, 7, OW_UP | $3, $0, -1, -1, $0, 0, GrannyScript_0x99528, -1

View File

@ -73,6 +73,6 @@ DarkCaveBlackthornEntrance_MapEventHeader:
; people-events
db 3
person_event SPRITE_PHARMACIST, 7, 11, DOWN << 2 | $3, $0, -1, -1, $0, 0, PharmacistScript_0x18c720, -1
person_event SPRITE_POKE_BALL, 28, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
person_event SPRITE_POKE_BALL, 26, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
person_event SPRITE_PHARMACIST, 7, 11, OW_DOWN | $3, $0, -1, -1, $0, 0, PharmacistScript_0x18c720, -1
person_event SPRITE_POKE_BALL, 28, 25, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
person_event SPRITE_POKE_BALL, 26, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE

View File

@ -43,11 +43,11 @@ DarkCaveVioletEntrance_MapEventHeader:
; people-events
db 8
person_event SPRITE_POKE_BALL, 12, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
person_event SPRITE_ROCK, 18, 20, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 10, 31, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 18, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 35, 40, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_POKE_BALL, 26, 40, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
person_event SPRITE_POKE_BALL, 32, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
person_event SPRITE_POKE_BALL, 12, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
person_event SPRITE_ROCK, 18, 20, OW_LEFT | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 10, 31, OW_LEFT | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 18, 11, OW_LEFT | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 35, 40, OW_LEFT | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_POKE_BALL, 26, 40, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
person_event SPRITE_POKE_BALL, 13, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
person_event SPRITE_POKE_BALL, 32, 34, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT

View File

@ -175,5 +175,5 @@ DayCare_MapEventHeader:
; people-events
db 2
person_event SPRITE_GRAMPS, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE
person_event SPRITE_GRANNY, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrannyScript_0x62fc3, -1
person_event SPRITE_GRAMPS, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE
person_event SPRITE_GRANNY, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrannyScript_0x62fc3, -1

View File

@ -42,4 +42,4 @@ DiglettsCave_MapEventHeader:
; people-events
db 1
person_event SPRITE_POKEFAN_M, 35, 7, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x74002, -1
person_event SPRITE_POKEFAN_M, 35, 7, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x74002, -1

View File

@ -681,7 +681,7 @@ DragonShrine_MapEventHeader:
; people-events
db 4
person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000
person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000
person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000
person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000
person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000
person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000
person_event SPRITE_CLAIR, 12, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR

View File

@ -419,12 +419,12 @@ DragonsDenB1F_MapEventHeader:
; people-events
db 9
person_event SPRITE_POKE_BALL, 20, 39, DOWN << 2 | $1, $0, -1, -1, $0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
person_event SPRITE_CLAIR, 34, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
person_event SPRITE_SILVER, 27, 24, DOWN << 2 | $2, $22, -1, -1, $0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
person_event SPRITE_COOLTRAINER_M, 12, 24, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainermDarin, -1
person_event SPRITE_COOLTRAINER_F, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCara, -1
person_event SPRITE_TWIN, 21, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia1, -1
person_event SPRITE_TWIN, 22, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia2, -1
person_event SPRITE_POKE_BALL, 8, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM
person_event SPRITE_POKE_BALL, 24, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
person_event SPRITE_POKE_BALL, 20, 39, OW_DOWN | $1, $0, -1, -1, $0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
person_event SPRITE_CLAIR, 34, 18, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
person_event SPRITE_SILVER, 27, 24, OW_DOWN | $2, $22, -1, -1, $0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
person_event SPRITE_COOLTRAINER_M, 12, 24, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainermDarin, -1
person_event SPRITE_COOLTRAINER_F, 12, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCara, -1
person_event SPRITE_TWIN, 21, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia1, -1
person_event SPRITE_TWIN, 22, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia2, -1
person_event SPRITE_POKE_BALL, 8, 34, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM
person_event SPRITE_POKE_BALL, 24, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER

View File

@ -425,9 +425,9 @@ EarlsPokemonAcademy_MapEventHeader:
; people-events
db 6
person_event SPRITE_FISHER, 6, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
person_event SPRITE_YOUNGSTER, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x68a83, -1
person_event SPRITE_GAMEBOY_KID, 15, 7, UP << 2 | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x68a86, -1
person_event SPRITE_GAMEBOY_KID, 15, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x68a91, -1
person_event SPRITE_YOUNGSTER, 11, 8, UP << 2 | $3, $0, -1, -1, $0, 0, YoungsterScript_0x68a9c, -1
person_event SPRITE_POKEDEX, 8, 6, DOWN << 2 | $1, $0, -1, -1, $0, 0, AcademyNotebook, -1
person_event SPRITE_FISHER, 6, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
person_event SPRITE_YOUNGSTER, 9, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x68a83, -1
person_event SPRITE_GAMEBOY_KID, 15, 7, OW_UP | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x68a86, -1
person_event SPRITE_GAMEBOY_KID, 15, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x68a91, -1
person_event SPRITE_YOUNGSTER, 11, 8, OW_UP | $3, $0, -1, -1, $0, 0, YoungsterScript_0x68a9c, -1
person_event SPRITE_POKEDEX, 8, 6, OW_DOWN | $1, $0, -1, -1, $0, 0, AcademyNotebook, -1

View File

@ -290,10 +290,10 @@ EcruteakCity_MapEventHeader:
; people-events
db 7
person_event SPRITE_GRAMPS, 19, 22, DOWN << 2 | $2, $11, -1, -1, $0, 0, GrampsScript_0x1a4009, -1
person_event SPRITE_GRAMPS, 25, 24, DOWN << 2 | $3, $0, -1, -1, $0, 0, GrampsScript_0x1a400c, -1
person_event SPRITE_LASS, 33, 25, UP << 2 | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x1a4012, -1
person_event SPRITE_LASS, 13, 7, UP << 2 | $3, $0, -1, -1, $0, 0, LassScript_0x1a4015, -1
person_event SPRITE_FISHER, 26, 13, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a4029, -1
person_event SPRITE_YOUNGSTER, 18, 14, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a403d, -1
person_event SPRITE_GRAMPS, 11, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS
person_event SPRITE_GRAMPS, 19, 22, OW_DOWN | $2, $11, -1, -1, $0, 0, GrampsScript_0x1a4009, -1
person_event SPRITE_GRAMPS, 25, 24, OW_DOWN | $3, $0, -1, -1, $0, 0, GrampsScript_0x1a400c, -1
person_event SPRITE_LASS, 33, 25, OW_UP | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x1a4012, -1
person_event SPRITE_LASS, 13, 7, OW_UP | $3, $0, -1, -1, $0, 0, LassScript_0x1a4015, -1
person_event SPRITE_FISHER, 26, 13, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a4029, -1
person_event SPRITE_YOUNGSTER, 18, 14, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a403d, -1
person_event SPRITE_GRAMPS, 11, 7, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS

View File

@ -429,10 +429,10 @@ EcruteakGym_MapEventHeader:
; people-events
db 7
person_event SPRITE_MORTY, 5, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x99d58, -1
person_event SPRITE_SAGE, 11, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSageJeffrey, -1
person_event SPRITE_SAGE, 17, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSagePing, -1
person_event SPRITE_GRANNY, 9, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumMartha, -1
person_event SPRITE_GRANNY, 13, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumGrace, -1
person_event SPRITE_GYM_GUY, 19, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, EcruteakGymGuyScript, -1
person_event SPRITE_GRAMPS, 18, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
person_event SPRITE_MORTY, 5, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x99d58, -1
person_event SPRITE_SAGE, 11, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSageJeffrey, -1
person_event SPRITE_SAGE, 17, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSagePing, -1
person_event SPRITE_GRANNY, 9, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumMartha, -1
person_event SPRITE_GRANNY, 13, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumGrace, -1
person_event SPRITE_GYM_GUY, 19, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, EcruteakGymGuyScript, -1
person_event SPRITE_GRAMPS, 18, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS

View File

@ -298,7 +298,7 @@ EcruteakHouse_MapEventHeader:
; people-events
db 4
person_event SPRITE_SAGE, 10, 8, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
person_event SPRITE_SAGE, 10, 9, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
person_event SPRITE_SAGE, 13, 10, DOWN << 2 | $2, $11, -1, -1, $0, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
person_event SPRITE_GRAMPS, 15, 7, DOWN << 2 | $2, $11, -1, -1, $0, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
person_event SPRITE_SAGE, 10, 8, OW_UP | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
person_event SPRITE_SAGE, 10, 9, OW_UP | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
person_event SPRITE_SAGE, 13, 10, OW_DOWN | $2, $11, -1, -1, $0, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
person_event SPRITE_GRAMPS, 15, 7, OW_DOWN | $2, $11, -1, -1, $0, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE

View File

@ -176,5 +176,5 @@ EcruteakItemfinderHouse_MapEventHeader:
; people-events
db 2
person_event SPRITE_COOLTRAINER_M, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x9a5fb, -1
person_event SPRITE_POKEDEX, 7, 7, DOWN << 2 | $1, $0, -1, -1, $0, 0, PokedexScript_0x9a620, -1
person_event SPRITE_COOLTRAINER_M, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x9a5fb, -1
person_event SPRITE_POKEDEX, 7, 7, OW_DOWN | $1, $0, -1, -1, $0, 0, PokedexScript_0x9a620, -1

View File

@ -58,5 +58,5 @@ EcruteakLugiaSpeechHouse_MapEventHeader:
; people-events
db 2
person_event SPRITE_GRAMPS, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, GrampsScript_0x99334, -1
person_event SPRITE_YOUNGSTER, 8, 9, LEFT << 2 | $0, $0, -1, -1, $0, 0, YoungsterScript_0x99337, -1
person_event SPRITE_GRAMPS, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, GrampsScript_0x99334, -1
person_event SPRITE_YOUNGSTER, 8, 9, OW_LEFT | $0, $0, -1, -1, $0, 0, YoungsterScript_0x99337, -1

View File

@ -57,6 +57,6 @@ EcruteakMart_MapEventHeader:
; people-events
db 3
person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x99c3b, -1
person_event SPRITE_SUPER_NERD, 6, 9, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x99c42, -1
person_event SPRITE_GRANNY, 10, 10, UP << 2 | $3, $0, -1, -1, $0, 0, GrannyScript_0x99c45, -1
person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x99c3b, -1
person_event SPRITE_SUPER_NERD, 6, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x99c42, -1
person_event SPRITE_GRANNY, 10, 10, OW_UP | $3, $0, -1, -1, $0, 0, GrannyScript_0x99c45, -1

View File

@ -219,8 +219,8 @@ EcruteakPokeCenter1F_MapEventHeader:
; people-events
db 5
person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x98eb0, -1
person_event SPRITE_POKEFAN_M, 10, 11, LEFT << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x98eb3, -1
person_event SPRITE_COOLTRAINER_F, 8, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, CooltrainerFScript_0x98ebf, -1
person_event SPRITE_GYM_GUY, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x98ec2, -1
person_event SPRITE_BILL, 11, 4, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x98eb0, -1
person_event SPRITE_POKEFAN_M, 10, 11, OW_LEFT | $2, $0, -1, -1, $0, 0, PokefanMScript_0x98eb3, -1
person_event SPRITE_COOLTRAINER_F, 8, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, CooltrainerFScript_0x98ebf, -1
person_event SPRITE_GYM_GUY, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x98ec2, -1
person_event SPRITE_BILL, 11, 4, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL

View File

@ -99,5 +99,5 @@ ElmsHouse_MapEventHeader:
; people-events
db 2
person_event SPRITE_TEACHER, 9, 5, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ElmsWife, -1
person_event SPRITE_BUG_CATCHER, 8, 9, UP << 2 | $3, $0, -1, -1, $0, 0, ElmsSon, -1
person_event SPRITE_TEACHER, 9, 5, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ElmsWife, -1
person_event SPRITE_BUG_CATCHER, 8, 9, OW_UP | $3, $0, -1, -1, $0, 0, ElmsSon, -1

View File

@ -1408,9 +1408,9 @@ ElmsLab_MapEventHeader:
; people-events
db 6
person_event SPRITE_ELM, 6, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ProfElmScript, -1
person_event SPRITE_SCIENTIST, 13, 6, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $0, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
person_event SPRITE_POKE_BALL, 7, 11, DOWN << 2 | $1, $0, -1, -1, $0, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
person_event SPRITE_POKE_BALL, 7, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
person_event SPRITE_OFFICER, 7, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CopScript, EVENT_COP_IN_ELMS_LAB
person_event SPRITE_ELM, 6, 9, OW_UP | $2, $0, -1, -1, $0, 0, ProfElmScript, -1
person_event SPRITE_SCIENTIST, 13, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
person_event SPRITE_POKE_BALL, 7, 10, OW_DOWN | $1, $0, -1, -1, $0, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
person_event SPRITE_POKE_BALL, 7, 11, OW_DOWN | $1, $0, -1, -1, $0, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
person_event SPRITE_POKE_BALL, 7, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
person_event SPRITE_OFFICER, 7, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CopScript, EVENT_COP_IN_ELMS_LAB

View File

@ -310,7 +310,7 @@ FastShip1F_MapEventHeader:
; people-events
db 4
person_event SPRITE_SAILOR, 6, 29, UP << 2 | $2, $0, -1, -1, $0, 0, SailorScript_0x75160, -1
person_event SPRITE_SAILOR, 11, 18, LEFT << 2 | $1, $0, -1, -1, $0, 0, SailorScript_0x751d0, -1
person_event SPRITE_SAILOR, 21, 26, UP << 2 | $1, $2, -1, -1, $0, 0, SailorScript_0x751e4, -1
person_event SPRITE_GENTLEMAN, 10, 23, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
person_event SPRITE_SAILOR, 6, 29, OW_UP | $2, $0, -1, -1, $0, 0, SailorScript_0x75160, -1
person_event SPRITE_SAILOR, 11, 18, OW_LEFT | $1, $0, -1, -1, $0, 0, SailorScript_0x751d0, -1
person_event SPRITE_SAILOR, 21, 26, OW_UP | $1, $2, -1, -1, $0, 0, SailorScript_0x751e4, -1
person_event SPRITE_GENTLEMAN, 10, 23, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN

View File

@ -456,15 +456,15 @@ FastShipB1F_MapEventHeader:
; people-events
db 12
person_event SPRITE_SAILOR, 10, 34, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
person_event SPRITE_SAILOR, 10, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
person_event SPRITE_SAILOR, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_LASS, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_SUPER_NERD, 13, 30, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_SAILOR, 8, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_FISHER, 12, 29, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_BLACK_BELT, 15, 19, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_SAILOR, 8, 27, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_TEACHER, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_YOUNGSTER, 13, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_YOUNGSTER, 15, 18, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_SAILOR, 10, 34, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
person_event SPRITE_SAILOR, 10, 35, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
person_event SPRITE_SAILOR, 15, 13, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_LASS, 8, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_SUPER_NERD, 13, 30, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_SAILOR, 8, 21, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_FISHER, 12, 29, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_BLACK_BELT, 15, 19, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_SAILOR, 8, 27, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_TEACHER, 15, 13, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_YOUNGSTER, 13, 18, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_YOUNGSTER, 15, 18, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND

View File

@ -278,10 +278,10 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader:
; people-events
db 7
person_event SPRITE_COOLTRAINER_M, 7, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_COOLTRAINER_F, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_SUPER_NERD, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_POKEFAN_M, 21, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_SAILOR, 30, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
person_event SPRITE_GENTLEMAN, 34, 11, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_PHARMACIST, 34, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_COOLTRAINER_M, 7, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_COOLTRAINER_F, 9, 5, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_SUPER_NERD, 9, 5, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_POKEFAN_M, 21, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_SAILOR, 30, 8, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
person_event SPRITE_GENTLEMAN, 34, 11, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_PHARMACIST, 34, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND

View File

@ -471,14 +471,14 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader:
; people-events
db 11
person_event SPRITE_CAPTAIN, 29, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CaptainScript_0x75ea7, -1
person_event SPRITE_GENTLEMAN, 21, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
person_event SPRITE_TWIN, 21, 7, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
person_event SPRITE_TWIN, 29, 6, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
person_event SPRITE_POKEFAN_M, 10, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_TWIN, 8, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_TWIN, 8, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_SUPER_NERD, 9, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_POKEFAN_F, 9, 9, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_SUPER_NERD, 19, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_CAPTAIN, 29, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CaptainScript_0x75ea7, -1
person_event SPRITE_GENTLEMAN, 21, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
person_event SPRITE_TWIN, 21, 7, OW_LEFT | $2, $0, -1, -1, $0, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
person_event SPRITE_TWIN, 29, 6, OW_LEFT | $2, $0, -1, -1, $0, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
person_event SPRITE_POKEFAN_M, 10, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_TWIN, 8, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_TWIN, 8, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_SUPER_NERD, 9, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_POKEFAN_F, 9, 9, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_SUPER_NERD, 19, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND

View File

@ -239,7 +239,7 @@ FastShipCabins_SW_SSW_NW_MapEventHeader:
; people-events
db 4
person_event SPRITE_FISHER, 19, 5, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_BUG_CATCHER, 19, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_BUENA, 30, 5, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_ROCKER, 32, 7, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_FISHER, 19, 5, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
person_event SPRITE_BUG_CATCHER, 19, 10, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
person_event SPRITE_BUENA, 30, 5, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
person_event SPRITE_ROCKER, 32, 7, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND

View File

@ -57,5 +57,5 @@ FightingDojo_MapEventHeader:
; people-events
db 2
person_event SPRITE_BLACK_BELT, 8, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x189b61, -1
person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND
person_event SPRITE_BLACK_BELT, 8, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x189b61, -1
person_event SPRITE_POKE_BALL, 5, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND

Some files were not shown because too many files have changed in this diff Show More