pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

No more ItemFragment

Browse Source
This commit is contained in:
PikalaxALT 2015-12-15 10:55:56 -05:00
parent 6e257bc7cd
commit bb2aba7da1
95 changed files with 882 additions and 884 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/map_constants.asm
View File

@ -659,7 +659,7 @@ EMOTE_OBJECT EQU 7
const_def const_def
const PERSONTYPE_SCRIPT const PERSONTYPE_SCRIPT
const PERSONTYPE_ITEMFRAGMENT const PERSONTYPE_ITEMBALL
const PERSONTYPE_TRAINER const PERSONTYPE_TRAINER
const PERSONTYPE_3 const PERSONTYPE_3
const PERSONTYPE_4 const PERSONTYPE_4

4
engine/events.asm
View File

@ -641,7 +641,7 @@ TryObjectEvent: ; 969b5
.pointers .pointers
dbw PERSONTYPE_SCRIPT, .script dbw PERSONTYPE_SCRIPT, .script
dbw PERSONTYPE_ITEMFRAGMENT, .itemfragment dbw PERSONTYPE_ITEMBALL, .itemball
dbw PERSONTYPE_TRAINER, .trainer dbw PERSONTYPE_TRAINER, .trainer
; the remaining four are dummy events ; the remaining four are dummy events
dbw PERSONTYPE_3, .three dbw PERSONTYPE_3, .three
@ -662,7 +662,7 @@ TryObjectEvent: ; 969b5
ret ret
; 96a12 ; 96a12
.itemfragment ; 96a12 .itemball ; 96a12
ld hl, MAPOBJECT_SCRIPT_POINTER ld hl, MAPOBJECT_SCRIPT_POINTER
add hl, bc add hl, bc
ld a, [hli] ld a, [hli]

4
engine/movement.asm
View File

@ -88,7 +88,7 @@ MovementPointers: ; 5075
dw Movement_56 ; 56 dw Movement_56 ; 56
dw Movement_rock_smash ; 57 dw Movement_rock_smash ; 57
dw Movement_return_dig ; 58 dw Movement_return_dig ; 58
dw Movement_59 ; 59 dw Movement_run_before_fall ; 59
; 5129 ; 5129
@ -113,7 +113,7 @@ Movement_skyfall: ; 5137
ret ret
; 513e ; 513e
Movement_59: ; 513e Movement_run_before_fall: ; 513e
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_19 ld [hl], STEP_TYPE_19

2
event/halloffame.asm
View File

@ -540,7 +540,7 @@ DisplayHOFMon: ; 86748
Function86810: ; 86810 Function86810: ; 86810
call ClearBGPalettes call ClearBGPalettes
ld hl, VTiles2 tile $63 ld hl, VTiles2 tile $63
ld de, FontExtra + $d0 ld de, FontExtra + 13 tiles
lb bc, BANK(FontExtra), 1 lb bc, BANK(FontExtra), 1
call Request2bpp call Request2bpp
hlcoord 0, 0 hlcoord 0, 0

2
home/map.asm
View File

@ -517,7 +517,7 @@ ReadMapTriggers:: ; 23ac
ld a, l ld a, l
ld [wCurrMapTriggerHeaderPointer], a ; map trigger pointer ld [wCurrMapTriggerHeaderPointer], a ; map trigger pointer
ld a, h ld a, h
ld [wdc09], a ld [wCurrMapTriggerHeaderPointer + 1], a
ld a, c ld a, c
and a and a
ret z ret z

5
home/mobile.asm
View File

@ -127,7 +127,8 @@ Timer:: ; 3e93
; 3ed7 ; 3ed7
Function3ed7:: ; 3ed7 Function3ed7:: ; 3ed7
ld [$dc02], a ; unreferenced
ld [wdc02], a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, BANK(Function114243) ld a, BANK(Function114243)
@ -138,6 +139,6 @@ Function3ed7:: ; 3ed7
ld a, b ld a, b
rst Bankswitch rst Bankswitch
ld a, [$dc02] ld a, [wdc02]
ret ret
; 3eea ; 3eea

8
items/item_effects.asm
View File

@ -39,7 +39,7 @@ ItemEffects: ; e73c
dw Thunderstone dw Thunderstone
dw WaterStone dw WaterStone
dw Item19 dw Item19
dw HpUp dw HPUp
dw Protein dw Protein
dw Iron dw Iron
dw Carbos dw Carbos
@ -75,7 +75,7 @@ ItemEffects: ; e73c
dw GoodRod dw GoodRod
dw SilverLeaf dw SilverLeaf
dw SuperRod dw SuperRod
dw PpUp dw PPUp
dw Ether dw Ether
dw MaxEther dw MaxEther
dw Elixer dw Elixer
@ -1225,7 +1225,7 @@ SunStone: ; ee0f
; ee3d ; ee3d
HpUp: HPUp:
Protein: Protein:
Iron: Iron:
Carbos: Carbos:
@ -2512,7 +2512,7 @@ Itemfinder: ; f5b8
MaxElixer: MaxElixer:
PpUp: PPUp:
Ether: Ether:
MaxEther: MaxEther:
Elixer: Elixer:

8
macros/map.asm
View File

@ -171,10 +171,16 @@ elevfloor: MACRO
map \3 map \3
ENDM ENDM
itemfragment: MACRO itemball: MACRO
if _NARG == 2 if _NARG == 2
db \1, \2 db \1, \2
else else
db \1, 1 db \1, 1
endc endc
endm endm
stonetable: MACRO
db \1, \2
dw \3
endm

5
macros/movement.asm
View File

@ -433,3 +433,8 @@ return_dig: macro
db movement_return_dig ; $58 db movement_return_dig ; $58
db \1 db \1
endm endm
enum movement_run_before_fall
run_before_fall: macro
db movement_run_before_fall ; $59
endm

42
maps/BattleTowerOutside.asm
View File

@ -22,19 +22,19 @@ BattleTowerOutside_MapScriptHeader:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
return return
StandingYoungsterScript_0x9f85f: BattleTowerOutsideYoungsterScript:
jumptextfaceplayer UnknownText_0x9f930 jumptextfaceplayer BattleTowerOutsideYoungsterText
BuenaScript_0x9f862: BattleTowerOutsideBuenaScript:
jumptextfaceplayer UnknownText_0x9f9db jumptextfaceplayer BattleTowerOutsideBuenaText
SailorScript_0x9f865: BattleTowerOutsideSailorScript:
jumptextfaceplayer UnknownText_0x9fa8c jumptextfaceplayer BattleTowerOutsideSailorText
MapBattleTowerOutsideSignpost0Script: MapBattleTowerOutsideSignpost0Script:
jumptext UnknownText_0x9fafc jumptext BattleTowerOutsideText_UltimateChallenge
UnknownText_0x9f86b: BattleTowerOutsideUnusedText1:
text "Wow, the BATTLE" text "Wow, the BATTLE"
line "TOWER is huge! My" line "TOWER is huge! My"
@ -42,7 +42,7 @@ UnknownText_0x9f86b:
line "looking up at it." line "looking up at it."
done done
UnknownText_0x9f8b3: BattleTowerOutsideUnusedText2:
text "Wow, the BATTLE" text "Wow, the BATTLE"
line "TOWER is huge!" line "TOWER is huge!"
@ -56,7 +56,7 @@ UnknownText_0x9f8b3:
line "#MON." line "#MON."
done done
UnknownText_0x9f930: BattleTowerOutsideYoungsterText:
text "Wow, the BATTLE" text "Wow, the BATTLE"
line "TOWER is huge!" line "TOWER is huge!"
@ -65,7 +65,7 @@ UnknownText_0x9f930:
cont "in there!" cont "in there!"
done done
UnknownText_0x9f97b: BattleTowerOutsideUnusedText3:
text "What on earth do" text "What on earth do"
line "they do here?" line "they do here?"
@ -76,7 +76,7 @@ UnknownText_0x9f97b:
line "#MON battles." line "#MON battles."
done done
UnknownText_0x9f9db: BattleTowerOutsideBuenaText:
text "You can use only" text "You can use only"
line "three #MON." line "three #MON."
@ -87,7 +87,7 @@ UnknownText_0x9f9db:
line "battle…" line "battle…"
done done
UnknownText_0x9fa32: BattleTowerOutsideUnusedText4:
text "Ehehehe…" text "Ehehehe…"
line "I sneaked out of" line "I sneaked out of"
cont "work to come here." cont "work to come here."
@ -97,7 +97,7 @@ UnknownText_0x9fa32:
cont "a LEADER!" cont "a LEADER!"
done done
UnknownText_0x9fa8c: BattleTowerOutsideSailorText:
text "Hehehe, I snuck" text "Hehehe, I snuck"
line "out from work." line "out from work."
@ -108,23 +108,23 @@ UnknownText_0x9fa8c:
line "all. That I must!" line "all. That I must!"
done done
UnknownText_0x9faee: BattleTowerOutsideText_BattleTower:
text "BATTLE TOWER" text "BATTLE TOWER"
done done
UnknownText_0x9fafc: BattleTowerOutsideText_UltimateChallenge:
text "BATTLE TOWER" text "BATTLE TOWER"
para "Take the Ultimate" para "Take the Ultimate"
line "Trainer Challenge!" line "Trainer Challenge!"
done done
UnknownText_0x9fb2f: BattleTowerOutsideText_DoorsClosed:
text "The BATTLE TOWER's" text "The BATTLE TOWER's"
line "doors are closed…" line "doors are closed…"
done done
UnknownText_0x9fb54: BattleTowerOutsideText_DoorsOpen:
text "It's open!" text "It's open!"
done done
@ -148,7 +148,7 @@ BattleTowerOutside_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x9f85f, -1 person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BuenaScript_0x9f862, -1 person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1

226
maps/BillsHouse.asm
View File

@ -12,206 +12,206 @@ GrampsScript_0x189538:
faceplayer faceplayer
opentext opentext
checkevent EVENT_GAVE_KURT_APRICORNS checkevent EVENT_GAVE_KURT_APRICORNS
iftrue UnknownScript_0x1896ba iftrue .JustShowedSomething
checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1896c0 iftrue .GotThunderstone
checkevent EVENT_MET_BILLS_GRANDPA checkevent EVENT_MET_BILLS_GRANDPA
iftrue UnknownScript_0x189553 iftrue .MetGrandpa
writetext UnknownText_0x1896ce writetext BillsGrandpaIntroText
buttonsound buttonsound
setevent EVENT_MET_BILLS_GRANDPA setevent EVENT_MET_BILLS_GRANDPA
UnknownScript_0x189553: .MetGrandpa:
checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189697 iftrue .ShowedPichu
checkevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA checkevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189680 iftrue .ShowedGrowlitheVulpix
checkevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA checkevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189669 iftrue .ShowedStaryu
checkevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA checkevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189652 iftrue .ShowedOddish
checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
iftrue UnknownScript_0x18963b iftrue .ShowedLickitung
writetext UnknownText_0x1898c0 writetext BillsGrandpaLickitungText
buttonsound buttonsound
writetext UnknownText_0x189732 writetext BillsGrandpaAskToSeeMonText
yesorno yesorno
iffalse UnknownScript_0x1896aa iffalse .SaidNo
scall UnknownScript_0x1896a5 scall .ExcitedToSee
special Special_BillsGrandfather special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa iffalse .SaidNo
if_not_equal LICKITUNG, UnknownScript_0x1896c6 if_not_equal LICKITUNG, .WrongPokemon
scall UnknownScript_0x1896b0 scall .CorrectPokemon
setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
jump UnknownScript_0x18963b jump .ShowedLickitung
UnknownScript_0x189592: .GotEverstone:
writetext UnknownText_0x1898ff writetext BillsGrandpaOddishText
buttonsound buttonsound
writetext UnknownText_0x189732 writetext BillsGrandpaAskToSeeMonText
yesorno yesorno
iffalse UnknownScript_0x1896aa iffalse .SaidNo
scall UnknownScript_0x1896a5 scall .ExcitedToSee
special Special_BillsGrandfather special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa iffalse .SaidNo
if_not_equal ODDISH, UnknownScript_0x1896c6 if_not_equal ODDISH, .WrongPokemon
scall UnknownScript_0x1896b0 scall .CorrectPokemon
setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
jump UnknownScript_0x189652 jump .ShowedOddish
UnknownScript_0x1895b3: .GotLeafStone:
writetext UnknownText_0x189953 writetext BillsGrandpaStaryuText
buttonsound buttonsound
writetext UnknownText_0x189732 writetext BillsGrandpaAskToSeeMonText
yesorno yesorno
iffalse UnknownScript_0x1896aa iffalse .SaidNo
scall UnknownScript_0x1896a5 scall .ExcitedToSee
special Special_BillsGrandfather special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa iffalse .SaidNo
if_not_equal STARYU, UnknownScript_0x1896c6 if_not_equal STARYU, .WrongPokemon
scall UnknownScript_0x1896b0 scall .CorrectPokemon
setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
jump UnknownScript_0x189669 jump .ShowedStaryu
UnknownScript_0x1895d4: .GotWaterStone:
checkver checkver
iftrue UnknownScript_0x1895f9 iftrue .Crystal11
writetext UnknownText_0x1899fe writetext BillsGrandpaGrowlitheText
buttonsound buttonsound
writetext UnknownText_0x189732 writetext BillsGrandpaAskToSeeMonText
yesorno yesorno
iffalse UnknownScript_0x1896aa iffalse .SaidNo
scall UnknownScript_0x1896a5 scall .ExcitedToSee
special Special_BillsGrandfather special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa iffalse .SaidNo
if_not_equal GROWLITHE, UnknownScript_0x1896c6 if_not_equal GROWLITHE, .WrongPokemon
scall UnknownScript_0x1896b0 scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump UnknownScript_0x189680 jump .ShowedGrowlitheVulpix
UnknownScript_0x1895f9: .Crystal11:
writetext UnknownText_0x189a57 writetext BillsGrandpaVulpixText
buttonsound buttonsound
writetext UnknownText_0x189732 writetext BillsGrandpaAskToSeeMonText
yesorno yesorno
iffalse UnknownScript_0x1896aa iffalse .SaidNo
scall UnknownScript_0x1896a5 scall .ExcitedToSee
special Special_BillsGrandfather special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa iffalse .SaidNo
if_not_equal VULPIX, UnknownScript_0x1896c6 if_not_equal VULPIX, .WrongPokemon
scall UnknownScript_0x1896b0 scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump UnknownScript_0x189680 jump .ShowedGrowlitheVulpix
UnknownScript_0x18961a: .GotFireStone:
writetext UnknownText_0x189ab1 writetext BillsGrandpaPichuText
buttonsound buttonsound
writetext UnknownText_0x189732 writetext BillsGrandpaAskToSeeMonText
yesorno yesorno
iffalse UnknownScript_0x1896aa iffalse .SaidNo
scall UnknownScript_0x1896a5 scall .ExcitedToSee
special Special_BillsGrandfather special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa iffalse .SaidNo
if_not_equal PICHU, UnknownScript_0x1896c6 if_not_equal PICHU, .WrongPokemon
scall UnknownScript_0x1896b0 scall .CorrectPokemon
setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
jump UnknownScript_0x189697 jump .ShowedPichu
UnknownScript_0x18963b: .ShowedLickitung:
checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x189592 iftrue .GotEverstone
scall UnknownScript_0x1896b5 scall .ReceiveItem
verbosegiveitem EVERSTONE verbosegiveitem EVERSTONE
iffalse UnknownScript_0x1896cc iffalse .BagFull
setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_GAVE_KURT_APRICORNS
closetext closetext
end end
UnknownScript_0x189652: .ShowedOddish:
checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895b3 iftrue .GotLeafStone
scall UnknownScript_0x1896b5 scall .ReceiveItem
verbosegiveitem LEAF_STONE verbosegiveitem LEAF_STONE
iffalse UnknownScript_0x1896cc iffalse .BagFull
setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_GAVE_KURT_APRICORNS
closetext closetext
end end
UnknownScript_0x189669: .ShowedStaryu:
checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895d4 iftrue .GotWaterStone
scall UnknownScript_0x1896b5 scall .ReceiveItem
verbosegiveitem WATER_STONE verbosegiveitem WATER_STONE
iffalse UnknownScript_0x1896cc iffalse .BagFull
setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_GAVE_KURT_APRICORNS
closetext closetext
end end
UnknownScript_0x189680: .ShowedGrowlitheVulpix:
checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x18961a iftrue .GotFireStone
scall UnknownScript_0x1896b5 scall .ReceiveItem
verbosegiveitem FIRE_STONE verbosegiveitem FIRE_STONE
iffalse UnknownScript_0x1896cc iffalse .BagFull
setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_GAVE_KURT_APRICORNS
closetext closetext
end end
UnknownScript_0x189697: .ShowedPichu:
scall UnknownScript_0x1896b5 scall .ReceiveItem
verbosegiveitem THUNDERSTONE verbosegiveitem THUNDERSTONE
iffalse UnknownScript_0x1896cc iffalse .BagFull
setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
closetext closetext
end end
UnknownScript_0x1896a5: .ExcitedToSee:
writetext UnknownText_0x189760 writetext BillsGrandpaExcitedToSeeText
buttonsound buttonsound
end end
UnknownScript_0x1896aa: .SaidNo:
writetext UnknownText_0x189784 writetext BillsGrandpaYouDontHaveItTextText
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x1896b0: .CorrectPokemon:
writetext UnknownText_0x1897a6 writetext BillsGrandpaShownPokemonText
buttonsound buttonsound
end end
UnknownScript_0x1896b5: .ReceiveItem:
writetext UnknownText_0x1897e1 writetext BillsGrandpaTokenOfAppreciationText
buttonsound buttonsound
end end
UnknownScript_0x1896ba: .JustShowedSomething:
writetext UnknownText_0x18980e writetext BillsGrandpaComeAgainText
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x1896c0: .GotThunderstone:
writetext UnknownText_0x18982a writetext BillsGrandpaShownAllThePokemonText
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x1896c6: .WrongPokemon:
writetext UnknownText_0x189891 writetext BillsGrandpaWrongPokemonText
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x1896cc: .BagFull:
closetext closetext
end end
UnknownText_0x1896ce: BillsGrandpaIntroText:
text "Hm? You know BILL?" text "Hm? You know BILL?"
line "He's my grandson." line "He's my grandson."
@ -222,23 +222,23 @@ UnknownText_0x1896ce:
line "house-sitting." line "house-sitting."
done done
UnknownText_0x189732: BillsGrandpaAskToSeeMonText:
text "If you have that" text "If you have that"
line "#MON, may I see" line "#MON, may I see"
cont "it, please?" cont "it, please?"
done done
UnknownText_0x189760: BillsGrandpaExcitedToSeeText:
text "You will show me?" text "You will show me?"
line "How good of you!" line "How good of you!"
done done
UnknownText_0x189784: BillsGrandpaYouDontHaveItTextText:
text "You don't have it?" text "You don't have it?"
line "That's too bad…" line "That's too bad…"
done done
UnknownText_0x1897a6: BillsGrandpaShownPokemonText:
text "Ah, so that is" text "Ah, so that is"
line "@" line "@"
text_from_ram StringBuffer3 text_from_ram StringBuffer3
@ -249,19 +249,19 @@ UnknownText_0x1897a6:
cont "you." cont "you."
done done
UnknownText_0x1897e1: BillsGrandpaTokenOfAppreciationText:
text "Thanks!" text "Thanks!"
para "This is a token of" para "This is a token of"
line "my appreciation." line "my appreciation."
done done
UnknownText_0x18980e: BillsGrandpaComeAgainText:
text "Come visit again" text "Come visit again"
line "sometime." line "sometime."
done done
UnknownText_0x18982a: BillsGrandpaShownAllThePokemonText:
text "Thanks for showing" text "Thanks for showing"
line "me so many cute" line "me so many cute"
cont "#MON." cont "#MON."
@ -273,7 +273,7 @@ UnknownText_0x18982a:
line "long life." line "long life."
done done
UnknownText_0x189891: BillsGrandpaWrongPokemonText:
text "Hm?" text "Hm?"
para "That's not the" para "That's not the"
@ -281,7 +281,7 @@ UnknownText_0x189891:
cont "told about." cont "told about."
done done
UnknownText_0x1898c0: BillsGrandpaLickitungText:
text "My grandson BILL" text "My grandson BILL"
line "told me about a" line "told me about a"
@ -289,7 +289,7 @@ UnknownText_0x1898c0:
line "long tongue." line "long tongue."
done done
UnknownText_0x1898ff: BillsGrandpaOddishText:
text "Ah, my grandson" text "Ah, my grandson"
line "mentioned a round," line "mentioned a round,"
@ -298,7 +298,7 @@ UnknownText_0x1898ff:
cont "on its head." cont "on its head."
done done
UnknownText_0x189953: BillsGrandpaStaryuText:
text "Do you know of a" text "Do you know of a"
line "sea #MON that" line "sea #MON that"
@ -316,7 +316,7 @@ UnknownText_0x189953:
line "like to see it." line "like to see it."
done done
UnknownText_0x1899fe: BillsGrandpaGrowlitheText:
text "BILL told me about" text "BILL told me about"
line "a #MON that is" line "a #MON that is"
@ -327,7 +327,7 @@ UnknownText_0x1899fe:
line "ROAR well." line "ROAR well."
done done
UnknownText_0x189a57: BillsGrandpaVulpixText:
text "I heard about a" text "I heard about a"
line "cute #MON that" line "cute #MON that"
cont "has six tails." cont "has six tails."
@ -337,7 +337,7 @@ UnknownText_0x189a57:
cont "like that." cont "like that."
done done
UnknownText_0x189ab1: BillsGrandpaPichuText:
text "Do you know that" text "Do you know that"
line "hugely popular" line "hugely popular"
cont "#MON?" cont "#MON?"

94
maps/BlackthornCity.asm
View File

@ -34,68 +34,68 @@ BlackthornCity_MapScriptHeader:
appear BLACKTHORNCITY_YOUNGSTER2 appear BLACKTHORNCITY_YOUNGSTER2
return return
SuperNerdScript_0x1a46e8: BlackthornSuperNerdScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_BEAT_CLAIR checkevent EVENT_BEAT_CLAIR
iftrue UnknownScript_0x1a4702 iftrue .BeatClair
checkevent EVENT_CLEARED_RADIO_TOWER checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a46fc iftrue .ClearedRadioTower
writetext UnknownText_0x1a477a writetext Text_ClairIsOut
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x1a46fc: .ClearedRadioTower:
writetext UnknownText_0x1a47f3 writetext Text_ClairIsIn
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x1a4702: .BeatClair:
writetext UnknownText_0x1a4865 writetext Text_ClairIsBeaten
waitbutton waitbutton
closetext closetext
end end
GrampsScript_0x1a4708: BlackthornGramps1Script:
jumptextfaceplayer UnknownText_0x1a48c3 jumptextfaceplayer BlackthornGrampsRefusesEntryText
GrampsScript_0x1a470b: BlackthornGramps2Script:
jumptextfaceplayer UnknownText_0x1a48fb jumptextfaceplayer BlackthornGrampsGrantsEntryText
BlackBeltScript_0x1a470e: BlackthornBlackBeltScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_CLEARED_RADIO_TOWER checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a471c iftrue .ClearedRadioTower
writetext UnknownText_0x1a494a writetext BlackBeltText_WeirdRadio
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x1a471c: .ClearedRadioTower:
writetext UnknownText_0x1a4983 writetext BlackBeltText_VoicesInMyHead
waitbutton waitbutton
closetext closetext
end end
CooltrainerFScript_0x1a4722: BlackthornCooltrainerF1Script:
jumptextfaceplayer UnknownText_0x1a49bd jumptextfaceplayer BlackthornCooltrainerF1Text
YoungsterScript_0x1a4725: BlackthornYoungsterScript:
jumptextfaceplayer UnknownText_0x1a49f1 jumptextfaceplayer BlackthornYoungsterText
CooltrainerFScript_0x1a4728: BlackthornCooltrainerF2Script:
jumptextfaceplayer UnknownText_0x1a4b1e jumptextfaceplayer BlackthornCooltrainerF2Text
SantosScript: SantosScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
iftrue SantosSaturdayScript iftrue .Saturday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_not_equal SATURDAY, SantosNotSaturdayScript if_not_equal SATURDAY, .NotSaturday
checkevent EVENT_MET_SANTOS_OF_SATURDAY checkevent EVENT_MET_SANTOS_OF_SATURDAY
iftrue .MetSantos iftrue .MetSantos
writetext MeetSantosText writetext MeetSantosText
@ -105,21 +105,21 @@ SantosScript:
writetext SantosGivesGiftText writetext SantosGivesGiftText
buttonsound buttonsound
verbosegiveitem SPELL_TAG verbosegiveitem SPELL_TAG
iffalse SantosDoneScript iffalse .Done
setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
writetext SantosGaveGiftText writetext SantosGaveGiftText
waitbutton waitbutton
closetext closetext
end end
SantosSaturdayScript: .Saturday
writetext SantosSaturdayText writetext SantosSaturdayText
waitbutton waitbutton
SantosDoneScript: .Done
closetext closetext
end end
SantosNotSaturdayScript: .NotSaturday
writetext SantosNotSaturdayText writetext SantosNotSaturdayText
waitbutton waitbutton
closetext closetext
@ -146,7 +146,7 @@ BlackthornCityPokeCenterSign:
BlackthornCityMartSign: BlackthornCityMartSign:
jumpstd martsign jumpstd martsign
UnknownText_0x1a477a: Text_ClairIsOut:
text "I am sorry." text "I am sorry."
para "CLAIR, our GYM" para "CLAIR, our GYM"
@ -160,7 +160,7 @@ UnknownText_0x1a477a:
cont "will return." cont "will return."
done done
UnknownText_0x1a47f3: Text_ClairIsIn:
text "CLAIR, our GYM" text "CLAIR, our GYM"
line "LEADER, is waiting" line "LEADER, is waiting"
cont "for you." cont "for you."
@ -172,7 +172,7 @@ UnknownText_0x1a47f3:
line "trainer to win." line "trainer to win."
done done
UnknownText_0x1a4865: Text_ClairIsBeaten:
text "You defeated" text "You defeated"
line "CLAIR?" line "CLAIR?"
@ -185,7 +185,7 @@ UnknownText_0x1a4865:
line "LANCE." line "LANCE."
done done
UnknownText_0x1a48c3: BlackthornGrampsRefusesEntryText:
text "No. Only chosen" text "No. Only chosen"
line "trainers may train" line "trainers may train"
@ -193,7 +193,7 @@ UnknownText_0x1a48c3:
line "Please leave." line "Please leave."
done done
UnknownText_0x1a48fb: BlackthornGrampsGrantsEntryText:
text "If CLAIR allows" text "If CLAIR allows"
line "it, her grand-" line "it, her grand-"
cont "father--our MASTER" cont "father--our MASTER"
@ -202,13 +202,13 @@ UnknownText_0x1a48fb:
para "You may enter." para "You may enter."
done done
UnknownText_0x1a494a: BlackBeltText_WeirdRadio:
text "My radio's busted?" text "My radio's busted?"
line "Lately, I only get" line "Lately, I only get"
cont "this weird signal." cont "this weird signal."
done done
UnknownText_0x1a4983: BlackBeltText_VoicesInMyHead:
text "Arooo! Voices in" text "Arooo! Voices in"
line "my head!" line "my head!"
@ -216,13 +216,13 @@ UnknownText_0x1a4983:
line "to my radio!" line "to my radio!"
done done
UnknownText_0x1a49bd: BlackthornCooltrainerF1Text:
text "Are you going to" text "Are you going to"
line "make your #MON" line "make your #MON"
cont "forget some moves?" cont "forget some moves?"
done done
UnknownText_0x1a49f1: BlackthornYoungsterText:
text "Dragon masters all" text "Dragon masters all"
line "come from the city" line "come from the city"
cont "of BLACKTHORN." cont "of BLACKTHORN."
@ -268,7 +268,7 @@ SantosNotSaturdayText:
line "not Saturday…" line "not Saturday…"
done done
UnknownText_0x1a4b1e: BlackthornCooltrainerF2Text:
text "Wow, you came" text "Wow, you came"
line "through the ICE" line "through the ICE"
cont "PATH?" cont "PATH?"
@ -344,12 +344,12 @@ BlackthornCity_MapEventHeader:
.PersonEvents: .PersonEvents:
db 9 db 9
person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
person_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN person_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x1a470e, -1 person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1
person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1a4722, -1 person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a4725, -1 person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1
person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1a4728, -1 person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1

67
maps/BlackthornGym1F.asm
View File

@ -30,23 +30,23 @@ BlackthornGym1F_MapScriptHeader:
.skip3 .skip3
return return
ClairScript_0x194e24: BlackthornGymClairScript:
faceplayer faceplayer
opentext opentext
checkflag ENGINE_RISINGBADGE checkflag ENGINE_RISINGBADGE
iftrue UnknownScript_0x194e69 iftrue .AlreadyGotBadge
checkevent EVENT_BEAT_CLAIR checkevent EVENT_BEAT_CLAIR
iftrue .FightDone iftrue .FightDone
writetext UnknownText_0x194efa writetext ClairIntroText
waitbutton waitbutton
closetext closetext
winlosstext UnknownText_0x194fd6, 0 winlosstext ClairWinText, 0
loadtrainer CLAIR, 1 loadtrainer CLAIR, 1
startbattle startbattle
returnafterbattle returnafterbattle
setevent EVENT_BEAT_CLAIR setevent EVENT_BEAT_CLAIR
opentext opentext
writetext UnknownText_0x19500e writetext ClairText_GoToDragonsDen
waitbutton waitbutton
closetext closetext
setevent EVENT_BEAT_COOLTRAINERM_PAUL setevent EVENT_BEAT_COOLTRAINERM_PAUL
@ -58,37 +58,38 @@ ClairScript_0x194e24:
setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
end end
.FightDone .FightDone
writetext UnknownText_0x195162 writetext ClairText_TooMuchToExpect
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x194e69: .AlreadyGotBadge
checkevent EVENT_GOT_TM24_DRAGONBREATH checkevent EVENT_GOT_TM24_DRAGONBREATH
iftrue UnknownScript_0x194e94 iftrue .GotTM24
writetext UnknownText_0x195196 writetext BlackthornGymClairText_YouKeptMeWaiting
buttonsound buttonsound
giveitem TM_DRAGONBREATH giveitem TM_DRAGONBREATH
iffalse UnknownScript_0x194e8e iffalse .BagFull
itemtotext TM_DRAGONBREATH, $0 itemtotext TM_DRAGONBREATH, $0
writetext UnknownText_0x1951bf writetext BlackthornGymText_ReceivedTM24
playsound SFX_ITEM playsound SFX_ITEM
waitsfx waitsfx
itemnotify itemnotify
setevent EVENT_GOT_TM24_DRAGONBREATH setevent EVENT_GOT_TM24_DRAGONBREATH
writetext UnknownText_0x1951d1 writetext BlackthornGymClairText_DescribeTM24
buttonsound buttonsound
jump UnknownScript_0x194e94 jump .GotTM24
UnknownScript_0x194e8e: .BagFull:
writetext UnknownText_0x19524f writetext BlackthornGymClairText_BagFull
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x194e94: .GotTM24:
writetext UnknownText_0x195272 writetext BlackthornGymClairText_League
waitbutton waitbutton
closetext closetext
end end
@ -99,7 +100,7 @@ TrainerCooltrainermPaul:
CooltrainermPaulScript: CooltrainermPaulScript:
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x1953f1 writetext CooltrainermPaulAfterText
waitbutton waitbutton
closetext closetext
end end
@ -110,7 +111,7 @@ TrainerCooltrainermMike:
CooltrainermMikeScript: CooltrainermMikeScript:
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x195467 writetext CooltrainermMikeAfterText
waitbutton waitbutton
closetext closetext
end end
@ -121,7 +122,7 @@ TrainerCooltrainerfLola:
CooltrainerfLolaScript: CooltrainerfLolaScript:
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x195516 writetext CooltrainerfLolaAfterText
waitbutton waitbutton
closetext closetext
end end
@ -150,7 +151,7 @@ BlackthornGymStatue:
trainertotext CLAIR, 1, $1 trainertotext CLAIR, 1, $1
jumpstd gymstatue2 jumpstd gymstatue2
UnknownText_0x194efa: ClairIntroText:
text "I am CLAIR." text "I am CLAIR."
para "The world's best" para "The world's best"
@ -175,7 +176,7 @@ UnknownText_0x194efa:
line "opponent!" line "opponent!"
done done
UnknownText_0x194fd6: ClairWinText:
text "I lost?" text "I lost?"
para "I don't believe" para "I don't believe"
@ -183,7 +184,7 @@ UnknownText_0x194fd6:
cont "some mistake…" cont "some mistake…"
done done
UnknownText_0x19500e: ClairText_GoToDragonsDen:
text "I won't admit" text "I won't admit"
line "this." line "this."
@ -218,26 +219,26 @@ UnknownText_0x19500e:
cont "BADGE!" cont "BADGE!"
done done
UnknownText_0x195162: ClairText_TooMuchToExpect:
text "What's the matter?" text "What's the matter?"
para "Is it too much to" para "Is it too much to"
line "expect of you?" line "expect of you?"
done done
UnknownText_0x195196: BlackthornGymClairText_YouKeptMeWaiting:
text "You've kept me" text "You've kept me"
line "waiting!" line "waiting!"
para "Here! Take this!" para "Here! Take this!"
done done
UnknownText_0x1951bf: BlackthornGymText_ReceivedTM24:
text "<PLAYER> received" text "<PLAYER> received"
line "TM24." line "TM24."
done done
UnknownText_0x1951d1: BlackthornGymClairText_DescribeTM24:
text "That contains" text "That contains"
line "DRAGONBREATH." line "DRAGONBREATH."
@ -250,12 +251,12 @@ UnknownText_0x1951d1:
cont "to take it." cont "to take it."
done done
UnknownText_0x19524f: BlackthornGymClairText_BagFull:
text "What is this? You" text "What is this? You"
line "don't have room?" line "don't have room?"
done done
UnknownText_0x195272: BlackthornGymClairText_League:
text "What's the matter?" text "What's the matter?"
para "Aren't you headed" para "Aren't you headed"
@ -299,7 +300,7 @@ CooltrainermPaulBeatenText:
line "lost?" line "lost?"
done done
UnknownText_0x1953f1: CooltrainermPaulAfterText:
text "LANCE told you" text "LANCE told you"
line "that he'd like to" line "that he'd like to"
@ -317,7 +318,7 @@ CooltrainermMikeBeatenText:
text "That's odd." text "That's odd."
done done
UnknownText_0x195467: CooltrainermMikeAfterText:
text "I know my short-" text "I know my short-"
line "comings now." line "comings now."
@ -343,7 +344,7 @@ CooltrainerfLolaBeatenText:
text "Way to go!" text "Way to go!"
done done
UnknownText_0x195516: CooltrainerfLolaAfterText:
text "Dragons are weak" text "Dragons are weak"
line "against dragon-" line "against dragon-"
cont "type moves." cont "type moves."
@ -411,7 +412,7 @@ BlackthornGym1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 5 db 5
person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClairScript_0x194e24, -1 person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1

22
maps/BlackthornGym2F.asm
View File

@ -27,16 +27,10 @@ BlackthornGym2F_MapScriptHeader:
db 0, 0 ; filler db 0, 0 ; filler
.BoulderTable .BoulderTable
db 5, 4 ; warp, person stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4
dw .Disappear4 stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Disappear5
stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Disappear6
db 3, 5 ; warp, person db -1 ; end
dw .Disappear5
db 4, 6 ; warp, person
dw .Disappear6
db $ff ; end
.Disappear4 .Disappear4
disappear BLACKTHORNGYM2F_BOULDER1 disappear BLACKTHORNGYM2F_BOULDER1
@ -74,7 +68,7 @@ TrainerCooltrainermCody:
CooltrainermCodyScript: CooltrainermCodyScript:
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x1957d5 writetext CooltrainermCodyAfterText
waitbutton waitbutton
closetext closetext
end end
@ -85,7 +79,7 @@ TrainerCooltrainerfFran:
CooltrainerfFranScript: CooltrainerfFranScript:
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x195883 writetext CooltrainerfFranAfterText
waitbutton waitbutton
closetext closetext
end end
@ -101,7 +95,7 @@ CooltrainermCodyBeatenText:
line "had a dragon!" line "had a dragon!"
done done
UnknownText_0x1957d5: CooltrainermCodyAfterText:
text "Members of our" text "Members of our"
line "dragon-user clan" line "dragon-user clan"
@ -125,7 +119,7 @@ CooltrainerfFranBeatenText:
text "Awww… I lost…" text "Awww… I lost…"
done done
UnknownText_0x195883: CooltrainerfFranAfterText:
text "Uh-oh… CLAIR is" text "Uh-oh… CLAIR is"
line "going to be mad…" line "going to be mad…"
done done

32
maps/BurnedTower1F.asm
View File

@ -143,8 +143,8 @@ MapBurnedTower1FSignpostItem1:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
ItemFragment_0x185ccb: BurnedTower1FHPUp:
itemfragment HP_UP itemball HP_UP
MovementData_0x185ccd: MovementData_0x185ccd:
step_left step_left
@ -155,7 +155,7 @@ MovementData_0x185ccf:
step_end step_end
MovementData_0x185cd1: MovementData_0x185cd1:
db $59 ; movement run_before_fall
step_end step_end
MovementData_0x185cd3: MovementData_0x185cd3:
@ -292,18 +292,18 @@ BurnedTower1F_MapEventHeader:
db 14 db 14
warp_def $f, $9, 13, ECRUTEAK_CITY warp_def $f, $9, 13, ECRUTEAK_CITY
warp_def $f, $a, 13, ECRUTEAK_CITY warp_def $f, $a, 13, ECRUTEAK_CITY
warp_def $9, $a, 1, BURNED_TOWER_B1F warp_def $9, $a, 1, BURNED_TOWER_B1F
warp_def $5, $5, 1, BURNED_TOWER_B1F warp_def $5, $5, 1, BURNED_TOWER_B1F
warp_def $6, $5, 1, BURNED_TOWER_B1F warp_def $6, $5, 1, BURNED_TOWER_B1F
warp_def $6, $4, 1, BURNED_TOWER_B1F warp_def $6, $4, 1, BURNED_TOWER_B1F
warp_def $4, $f, 2, BURNED_TOWER_B1F warp_def $4, $f, 2, BURNED_TOWER_B1F
warp_def $5, $f, 2, BURNED_TOWER_B1F warp_def $5, $f, 2, BURNED_TOWER_B1F
warp_def $7, $a, 3, BURNED_TOWER_B1F warp_def $7, $a, 3, BURNED_TOWER_B1F
warp_def $e, $5, 4, BURNED_TOWER_B1F warp_def $e, $5, 4, BURNED_TOWER_B1F
warp_def $e, $4, 4, BURNED_TOWER_B1F warp_def $e, $4, 4, BURNED_TOWER_B1F
warp_def $e, $e, 5, BURNED_TOWER_B1F warp_def $e, $e, 5, BURNED_TOWER_B1F
warp_def $e, $f, 5, BURNED_TOWER_B1F warp_def $e, $f, 5, BURNED_TOWER_B1F
warp_def $f, $7, 6, BURNED_TOWER_B1F warp_def $f, $7, 6, BURNED_TOWER_B1F
.XYTriggers: .XYTriggers:
db 1 db 1
@ -320,4 +320,4 @@ BurnedTower1F_MapEventHeader:
person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
person_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER person_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP

6
maps/BurnedTowerB1F.asm
View File

@ -123,8 +123,8 @@ UnknownScript_0x18622a:
waitsfx waitsfx
end end
ItemFragment_0x186231: BurnedTowerB1FTMEndure:
itemfragment TM_ENDURE itemball TM_ENDURE
BurnedTowerB1FBoulder: BurnedTowerB1FBoulder:
jumpstd strengthboulder jumpstd strengthboulder
@ -269,5 +269,5 @@ BurnedTowerB1F_MapEventHeader:
person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER

131
maps/CherrygroveCity.asm
View File

@ -42,30 +42,30 @@ CherrygroveCityGuideGent:
closetext closetext
playmusic MUSIC_SHOW_ME_AROUND playmusic MUSIC_SHOW_ME_AROUND
follow CHERRYGROVECITY_GRAMPS, PLAYER follow CHERRYGROVECITY_GRAMPS, PLAYER
applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c195 applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement1
opentext opentext
writetext GuideGentPokeCenterText writetext GuideGentPokeCenterText
waitbutton waitbutton
closetext closetext
applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c19b applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
spriteface PLAYER, UP spriteface PLAYER, UP
opentext opentext
writetext GuideGentMartText writetext GuideGentMartText
waitbutton waitbutton
closetext closetext
applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1a3 applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3
spriteface PLAYER, UP spriteface PLAYER, UP
opentext opentext
writetext GuideGentRoute30Text writetext GuideGentRoute30Text
waitbutton waitbutton
closetext closetext
applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1ac applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4
spriteface PLAYER, LEFT spriteface PLAYER, LEFT
opentext opentext
writetext GuideGentSeaText writetext GuideGentSeaText
waitbutton waitbutton
closetext closetext
applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1b6 applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5
spriteface PLAYER, UP spriteface PLAYER, UP
pause 60 pause 60
spriteface CHERRYGROVECITY_GRAMPS, LEFT spriteface CHERRYGROVECITY_GRAMPS, LEFT
@ -74,7 +74,7 @@ CherrygroveCityGuideGent:
writetext GuideGentGiftText writetext GuideGentGiftText
buttonsound buttonsound
stringtotext .mapcardname, $1 stringtotext .mapcardname, $1
scall .UnknownScript_0x19c097 scall .JumpstdReceiveItem
setflag ENGINE_MAP_CARD setflag ENGINE_MAP_CARD
writetext GotMapCardText writetext GotMapCardText
buttonsound buttonsound
@ -84,14 +84,14 @@ CherrygroveCityGuideGent:
stopfollow stopfollow
special RestartMapMusic special RestartMapMusic
spriteface PLAYER, UP spriteface PLAYER, UP
applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1cb applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement6
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
disappear CHERRYGROVECITY_GRAMPS disappear CHERRYGROVECITY_GRAMPS
clearevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE clearevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
waitsfx waitsfx
end end
.UnknownScript_0x19c097 .JumpstdReceiveItem
jumpstd receiveitem jumpstd receiveitem
end end
@ -104,10 +104,9 @@ CherrygroveCityGuideGent:
closetext closetext
end end
UnknownScript_0x19c0aa: CherrygroveSilverTriggerSouth:
moveperson CHERRYGROVECITY_SILVER, $27, $7 moveperson CHERRYGROVECITY_SILVER, $27, $7
CherrygroveSilverTriggerNorth:
UnknownScript_0x19c0ae:
spriteface PLAYER, RIGHT spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15 showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic special Special_FadeOutMusic
@ -121,56 +120,56 @@ UnknownScript_0x19c0ae:
waitbutton waitbutton
closetext closetext
checkevent EVENT_GOT_TOTODILE_FROM_ELM checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x19c0ee iftrue .Totodile
checkevent EVENT_GOT_CHIKORITA_FROM_ELM checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x19c104 iftrue .Chikorita
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_3 loadtrainer RIVAL1, RIVAL1_3
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle startbattle
reloadmapmusic reloadmapmusic
reloadmap reloadmap
iftrue UnknownScript_0x19c11a iftrue .AfterVictorious
jump UnknownScript_0x19c126 jump .AfterYourDefeat
UnknownScript_0x19c0ee: .Totodile:
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_1 loadtrainer RIVAL1, RIVAL1_1
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle startbattle
reloadmapmusic reloadmapmusic
reloadmap reloadmap
iftrue UnknownScript_0x19c11a iftrue .AfterVictorious
jump UnknownScript_0x19c126 jump .AfterYourDefeat
UnknownScript_0x19c104: .Chikorita:
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_2 loadtrainer RIVAL1, RIVAL1_2
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle startbattle
reloadmapmusic reloadmapmusic
reloadmap reloadmap
iftrue UnknownScript_0x19c11a iftrue .AfterVictorious
jump UnknownScript_0x19c126 jump .AfterYourDefeat
UnknownScript_0x19c11a: .AfterVictorious:
playmusic MUSIC_RIVAL_AFTER playmusic MUSIC_RIVAL_AFTER
opentext opentext
writetext UnknownText_0x19c608 writetext CherrygroveRivalText_YouWon
waitbutton waitbutton
closetext closetext
jump UnknownScript_0x19c12f jump .FinishRival
UnknownScript_0x19c126: .AfterYourDefeat:
playmusic MUSIC_RIVAL_AFTER playmusic MUSIC_RIVAL_AFTER
opentext opentext
writetext UnknownText_0x19c59e writetext CherrygroveRivalText_YouLost
waitbutton waitbutton
closetext closetext
UnknownScript_0x19c12f: .FinishRival:
playsound SFX_TACKLE playsound SFX_TACKLE
applymovement PLAYER, MovementData_0x19c1d4 applymovement PLAYER, MovementData_0x19c1d4
spriteface PLAYER, LEFT spriteface PLAYER, LEFT
@ -181,34 +180,34 @@ UnknownScript_0x19c12f:
playmapmusic playmapmusic
end end
TeacherScript_0x19c146: CherrygroveTeacherScript:
faceplayer faceplayer
opentext opentext
checkflag ENGINE_MAP_CARD checkflag ENGINE_MAP_CARD
iftrue UnknownScript_0x19c154 iftrue .HaveMapCard
writetext UnknownText_0x19c650 writetext CherrygroveTeacherText_NoMapCard
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x19c154: .HaveMapCard:
writetext UnknownText_0x19c6a8 writetext CherrygroveTeacherText_HaveMapCard
waitbutton waitbutton
closetext closetext
end end
YoungsterScript_0x19c15a: CherrygroveYoungsterScript:
faceplayer faceplayer
opentext opentext
checkflag ENGINE_POKEDEX checkflag ENGINE_POKEDEX
iftrue UnknownScript_0x19c168 iftrue .HavePokedex
writetext UnknownText_0x19c6d6 writetext CherrygroveYoungsterText_NoPokedex
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x19c168: .HavePokedex:
writetext UnknownText_0x19c701 writetext CherrygroveYoungsterText_HavePokedex
waitbutton waitbutton
closetext closetext
end end
@ -217,16 +216,16 @@ MysticWaterGuy:
faceplayer faceplayer
opentext opentext
checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
iftrue UnknownScript_0x19c183 iftrue .After
writetext UnknownText_0x19c766 writetext MysticWaterGuyTextBefore
buttonsound buttonsound
verbosegiveitem MYSTIC_WATER verbosegiveitem MYSTIC_WATER
iffalse UnknownScript_0x19c187 iffalse .Exit
setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
UnknownScript_0x19c183: .After:
writetext UnknownText_0x19c7c1 writetext MysticWaterGuyTextAfter
waitbutton waitbutton
UnknownScript_0x19c187: .Exit:
closetext closetext
end end
@ -242,7 +241,7 @@ CherrygroveCityPokeCenterSign:
CherrygroveCityMartSign: CherrygroveCityMartSign:
jumpstd martsign jumpstd martsign
MovementData_0x19c195: GuideGentMovement1:
step_left step_left
step_left step_left
step_up step_up
@ -250,7 +249,7 @@ MovementData_0x19c195:
turn_head_up turn_head_up
step_end step_end
MovementData_0x19c19b: GuideGentMovement2:
step_left step_left
step_left step_left
step_left step_left
@ -260,7 +259,7 @@ MovementData_0x19c19b:
turn_head_up turn_head_up
step_end step_end
MovementData_0x19c1a3: GuideGentMovement3:
step_left step_left
step_left step_left
step_left step_left
@ -271,7 +270,7 @@ MovementData_0x19c1a3:
turn_head_up turn_head_up
step_end step_end
MovementData_0x19c1ac: GuideGentMovement4:
step_left step_left
step_left step_left
step_left step_left
@ -283,7 +282,7 @@ MovementData_0x19c1ac:
turn_head_left turn_head_left
step_end step_end
MovementData_0x19c1b6: GuideGentMovement5:
step_down step_down
step_down step_down
step_right step_right
@ -306,7 +305,7 @@ MovementData_0x19c1b6:
turn_head_up turn_head_up
step_end step_end
MovementData_0x19c1cb: GuideGentMovement6:
step_up step_up
step_up step_up
step_end step_end
@ -458,12 +457,12 @@ UnknownText_0x19c4e2:
line "what I mean!" line "what I mean!"
done done
UnknownText_0x19c57f: SilverCherrygroveWinText:
text "Humph. Are you" text "Humph. Are you"
line "happy you won?" line "happy you won?"
done done
UnknownText_0x19c59e: CherrygroveRivalText_YouLost:
text "<......> <......> <......>" text "<......> <......> <......>"
para "My name's ???." para "My name's ???."
@ -474,12 +473,12 @@ UnknownText_0x19c59e:
cont "trainer." cont "trainer."
done done
UnknownText_0x19c5e6: SilverCherrygroveLossText:
text "Humph. That was a" text "Humph. That was a"
line "waste of time." line "waste of time."
done done
UnknownText_0x19c608: CherrygroveRivalText_YouWon:
text "<......> <......> <......>" text "<......> <......> <......>"
para "My name's ???." para "My name's ???."
@ -490,7 +489,7 @@ UnknownText_0x19c608:
cont "trainer." cont "trainer."
done done
UnknownText_0x19c650: CherrygroveTeacherText_NoMapCard:
text "Did you talk to" text "Did you talk to"
line "the old man by the" line "the old man by the"
cont "#MON CENTER?" cont "#MON CENTER?"
@ -500,19 +499,19 @@ UnknownText_0x19c650:
cont "#GEAR." cont "#GEAR."
done done
UnknownText_0x19c6a8: CherrygroveTeacherText_HaveMapCard:
text "When you're with" text "When you're with"
line "#MON, going" line "#MON, going"
cont "anywhere is fun." cont "anywhere is fun."
done done
UnknownText_0x19c6d6: CherrygroveYoungsterText_NoPokedex:
text "MR.#MON's house" text "MR.#MON's house"
line "is still farther" line "is still farther"
cont "up ahead." cont "up ahead."
done done
UnknownText_0x19c701: CherrygroveYoungsterText_HavePokedex:
text "I battled the" text "I battled the"
line "trainers on the" line "trainers on the"
cont "road." cont "road."
@ -524,7 +523,7 @@ UnknownText_0x19c701:
line "a #MON CENTER." line "a #MON CENTER."
done done
UnknownText_0x19c766: MysticWaterGuyTextBefore:
text "A #MON I caught" text "A #MON I caught"
line "had an item." line "had an item."
@ -535,7 +534,7 @@ UnknownText_0x19c766:
line "so do you want it?" line "so do you want it?"
done done
UnknownText_0x19c7c1: MysticWaterGuyTextAfter:
text "Back to fishing" text "Back to fishing"
line "for me, then." line "for me, then."
done done
@ -565,8 +564,8 @@ CherrygroveCity_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 1, $6, $21, $0, UnknownScript_0x19c0ae, $0, $0 xy_trigger 1, $6, $21, $0, CherrygroveSilverTriggerNorth, $0, $0
xy_trigger 1, $7, $21, $0, UnknownScript_0x19c0aa, $0, $0 xy_trigger 1, $7, $21, $0, CherrygroveSilverTriggerSouth, $0, $0
.Signposts: .Signposts:
db 4 db 4
@ -579,6 +578,6 @@ CherrygroveCity_MapEventHeader:
db 5 db 5
person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
person_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY person_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x19c146, -1 person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1
person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19c15a, -1 person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1
person_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, MysticWaterGuy, -1 person_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, MysticWaterGuy, -1

12
maps/DarkCaveBlackthornEntrance.asm
View File

@ -27,11 +27,11 @@ UnknownScript_0x18c739:
closetext closetext
end end
ItemFragment_0x18c73b: DarkCaveBlackthornEntranceRevive:
itemfragment REVIVE itemball REVIVE
ItemFragment_0x18c73d: DarkCaveBlackthornEntranceTMSnore:
itemfragment TM_SNORE itemball TM_SNORE
UnknownText_0x18c73f: UnknownText_0x18c73f:
text "Whoa! You startled" text "Whoa! You startled"
@ -79,5 +79,5 @@ DarkCaveBlackthornEntrance_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x18c720, -1 person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x18c720, -1
person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
person_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE person_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE

24
maps/DarkCaveVioletEntrance.asm
View File

@ -15,17 +15,17 @@ DarkCaveVioletEntrance_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x18c68e: DarkCaveVioletEntrancePotion:
itemfragment POTION itemball POTION
ItemFragment_0x18c690: DarkCaveVioletEntranceFullHeal:
itemfragment FULL_HEAL itemball FULL_HEAL
ItemFragment_0x18c692: DarkCaveVioletEntranceHyperPotion:
itemfragment HYPER_POTION itemball HYPER_POTION
ItemFragment_0x18c694: DarkCaveVioletEntranceDireHit:
itemfragment DIRE_HIT itemball DIRE_HIT
DarkCaveVioletEntranceRock: DarkCaveVioletEntranceRock:
jumpstd smashrock jumpstd smashrock
@ -53,11 +53,11 @@ DarkCaveVioletEntrance_MapEventHeader:
.PersonEvents: .PersonEvents:
db 8 db 8
person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
person_event SPRITE_ROCK, 14, 16, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 14, 16, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 6, 27, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 6, 27, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 14, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 14, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 31, 36, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 31, 36, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL person_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
person_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT person_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT

12
maps/DragonsDenB1F.asm
View File

@ -181,11 +181,11 @@ SilverScript_0x18c97e:
MapDragonsDenB1FSignpost0Script: MapDragonsDenB1FSignpost0Script:
jumptext DragonShrineSignpostText jumptext DragonShrineSignpostText
ItemFragment_0x18c9a1: DragonsDenB1FCalcium:
itemfragment CALCIUM itemball CALCIUM
ItemFragment_0x18c9a3: DragonsDenB1FMaxElixer:
itemfragment MAX_ELIXER itemball MAX_ELIXER
MapDragonsDenB1FSignpostItem1: MapDragonsDenB1FSignpostItem1:
dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE
@ -440,5 +440,5 @@ DragonsDenB1F_MapEventHeader:
person_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 person_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1
person_event SPRITE_TWIN, 17, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 person_event SPRITE_TWIN, 17, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1
person_event SPRITE_TWIN, 18, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1 person_event SPRITE_TWIN, 18, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1
person_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM person_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM
person_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER person_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER

6
maps/FightingDojo.asm
View File

@ -18,8 +18,8 @@ MapFightingDojoSignpost0Script:
MapFightingDojoSignpost1Script: MapFightingDojoSignpost1Script:
jumptext UnknownText_0x189be0 jumptext UnknownText_0x189be0
ItemFragment_0x189b6a: FightingDojoFocusBand:
itemfragment FOCUS_BAND itemball FOCUS_BAND
UnknownText_0x189b6c: UnknownText_0x189b6c:
text "Hello!" text "Hello!"
@ -62,4 +62,4 @@ FightingDojo_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x189b61, -1 person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x189b61, -1
person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND

24
maps/GoldenrodDeptStoreB1F.asm
View File

@ -67,17 +67,17 @@ MachopScript_0x7d7b9:
closetext closetext
end end
ItemFragment_0x7d7c3: GoldenrodDeptStoreB1FEther:
itemfragment ETHER itemball ETHER
ItemFragment_0x7d7c5: GoldenrodDeptStoreB1FAmuletCoin:
itemfragment AMULET_COIN itemball AMULET_COIN
ItemFragment_0x7d7c7: GoldenrodDeptStoreB1FBurnHeal:
itemfragment BURN_HEAL itemball BURN_HEAL
ItemFragment_0x7d7c9: GoldenrodDeptStoreB1FUltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
UnknownText_0x7d7cb: UnknownText_0x7d7cb:
text "Hey, kid! You're" text "Hey, kid! You're"
@ -131,10 +131,10 @@ GoldenrodDeptStoreB1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 8 db 8
person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c5, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c7, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c9, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b0, -1 person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b0, -1
person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b3, -1 person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b3, -1
person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b6, -1 person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b6, -1

18
maps/IcePath1F.asm
View File

@ -10,14 +10,14 @@ IcePath1F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x7e472: IcePath1FHMWaterfall:
itemfragment HM_WATERFALL itemball HM_WATERFALL
ItemFragment_0x7e474: IcePath1FPPUp:
itemfragment PP_UP itemball PP_UP
ItemFragment_0x7e476: IcePath1FProtein:
itemfragment PROTEIN itemball PROTEIN
IcePath1F_MapEventHeader: IcePath1F_MapEventHeader:
; filler ; filler
@ -38,6 +38,6 @@ IcePath1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL person_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
person_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP person_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN

28
maps/IcePathB1F.asm
View File

@ -25,19 +25,11 @@ IcePathB1F_MapScriptHeader:
db 0, 0 ; filler db 0, 0 ; filler
.StoneTable: .StoneTable:
db 3, 2 ; warp, person stonetable 3, ICEPATHB1F_BOULDER1, .Boulder1
dw .Boulder1 stonetable 4, ICEPATHB1F_BOULDER2, .Boulder2
stonetable 5, ICEPATHB1F_BOULDER3, .Boulder3
db 4, 3 ; warp, person stonetable 6, ICEPATHB1F_BOULDER4, .Boulder4
dw .Boulder2 db -1
db 5, 4 ; warp, person
dw .Boulder3
db 6, 5 ; warp, person
dw .Boulder4
db -1 ; end
.Boulder1: .Boulder1:
disappear ICEPATHB1F_BOULDER1 disappear ICEPATHB1F_BOULDER1
@ -63,7 +55,7 @@ IcePathB1F_MapScriptHeader:
pause 30 pause 30
scall .BoulderFallsThrough scall .BoulderFallsThrough
opentext opentext
writetext UnknownText_0x7e512 writetext IcePathBoulderFellThroughText
waitbutton waitbutton
closetext closetext
end end
@ -77,14 +69,14 @@ IcePathB1F_MapScriptHeader:
IcePathB1FBoulder: IcePathB1FBoulder:
jumpstd strengthboulder jumpstd strengthboulder
ItemFragment_0x7e50d: IcePathB1FIron:
itemfragment IRON itemball IRON
MapIcePathB1FSignpostItem0: MapIcePathB1FSignpostItem0:
dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
UnknownText_0x7e512: IcePathBoulderFellThroughText:
text "The boulder fell" text "The boulder fell"
line "through." line "through."
done done
@ -118,4 +110,4 @@ IcePathB1F_MapEventHeader:
person_event SPRITE_BOULDER, 8, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 person_event SPRITE_BOULDER, 8, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
person_event SPRITE_BOULDER, 9, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 person_event SPRITE_BOULDER, 9, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
person_event SPRITE_BOULDER, 7, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 person_event SPRITE_BOULDER, 7, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
person_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON person_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON

6
maps/IcePathB2FBlackthornSide.asm
View File

@ -8,8 +8,8 @@ IcePathB2FBlackthornSide_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x7e646: IcePathB2FBlackthornSideTMRest:
itemfragment TM_REST itemball TM_REST
MapIcePathB2FBlackthornSideSignpostItem0: MapIcePathB2FBlackthornSideSignpostItem0:
dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL
@ -33,4 +33,4 @@ IcePathB2FBlackthornSide_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e646, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST

12
maps/IcePathB2FMahoganySide.asm
View File

@ -16,11 +16,11 @@ IcePathB2FMahoganySide_MapScriptHeader:
BoulderScript_0x7e5a3: BoulderScript_0x7e5a3:
jumptext UnknownText_0x7e5ad jumptext UnknownText_0x7e5ad
ItemFragment_0x7e5a6: IcePathB2FMahoganySideFullHeal:
itemfragment FULL_HEAL itemball FULL_HEAL
ItemFragment_0x7e5a8: IcePathB2FMahoganySideMaxPotion:
itemfragment MAX_POTION itemball MAX_POTION
MapIcePathB2FMahoganySideSignpostItem0: MapIcePathB2FMahoganySideSignpostItem0:
dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
@ -57,5 +57,5 @@ IcePathB2FMahoganySide_MapEventHeader:
person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A
person_event SPRITE_BOULDER, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A person_event SPRITE_BOULDER, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A
person_event SPRITE_BOULDER, 13, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A person_event SPRITE_BOULDER, 13, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A
person_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e5a6, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL person_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
person_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e5a8, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION person_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION

6
maps/IcePathB3F.asm
View File

@ -9,8 +9,8 @@ IcePathB3F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x7e66f: IcePathB3FNevermeltice:
itemfragment NEVERMELTICE itemball NEVERMELTICE
IcePathB3FRock: IcePathB3FRock:
jumpstd smashrock jumpstd smashrock
@ -32,5 +32,5 @@ IcePathB3F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e66f, EVENT_ICE_PATH_B3F_NEVERMELTICE person_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
person_event SPRITE_ROCK, 6, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB3FRock, -1 person_event SPRITE_ROCK, 6, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB3FRock, -1

24
maps/IlexForest.asm
View File

@ -404,17 +404,17 @@ Bug_catcherWayneScript:
IlexForestLassScript: IlexForestLassScript:
jumptextfaceplayer Text_IlexForestLass jumptextfaceplayer Text_IlexForestLass
ItemFragment_0x6ee10: IlexForestRevive:
itemfragment REVIVE itemball REVIVE
ItemFragment_0x6ee12: IlexForestXAttack:
itemfragment X_ATTACK itemball X_ATTACK
ItemFragment_0x6ee14: IlexForestAntidote:
itemfragment ANTIDOTE itemball ANTIDOTE
ItemFragment_0x6ee16: IlexForestEther:
itemfragment ETHER itemball ETHER
MapIlexForestSignpostItem1: MapIlexForestSignpostItem1:
dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER
@ -969,10 +969,10 @@ IlexForest_MapEventHeader:
person_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE person_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
person_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER person_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
person_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1 person_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1
person_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6ee10, EVENT_ILEX_FOREST_REVIVE person_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE
person_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT person_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
person_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS person_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS
person_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1 person_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1
person_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6ee12, EVENT_ILEX_FOREST_X_ATTACK person_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK
person_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6ee14, EVENT_ILEX_FOREST_ANTIDOTE person_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
person_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6ee16, EVENT_ILEX_FOREST_ETHER person_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER

12
maps/LakeofRage.asm
View File

@ -230,11 +230,11 @@ WesleyNotWednesdayScript:
closetext closetext
end end
ItemFragment_0x70148: LakeofRageElixer:
itemfragment ELIXER itemball ELIXER
ItemFragment_0x7014a: LakeofRageTMDetect:
itemfragment TM_DETECT itemball TM_DETECT
MapLakeofRageSignpostItem2: MapLakeofRageSignpostItem2:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
@ -533,5 +533,5 @@ LakeofRage_MapEventHeader:
person_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS person_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
person_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS person_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
person_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY person_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x70148, EVENT_LAKE_OF_RAGE_ELIXER person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeofRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7014a, EVENT_LAKE_OF_RAGE_TM_DETECT person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeofRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT

42
maps/MountMortar1FInside.asm
View File

@ -42,26 +42,26 @@ SupernerdMarkusScript:
MountMortar1FBoulder: MountMortar1FBoulder:
jumpstd strengthboulder jumpstd strengthboulder
ItemFragment_0x7de7c: MountMortar1FInsideEscapeRope:
itemfragment ESCAPE_ROPE itemball ESCAPE_ROPE
ItemFragment_0x7de7e: MountMortar1FInsideMaxRevive:
itemfragment MAX_REVIVE itemball MAX_REVIVE
ItemFragment_0x7de80: MountMortar1FInsideHyperPotion:
itemfragment HYPER_POTION itemball HYPER_POTION
ItemFragment_0x7de82: MountMortar1FInsideMaxPotion:
itemfragment MAX_POTION itemball MAX_POTION
ItemFragment_0x7de84: MountMortar1FInsideNugget:
itemfragment NUGGET itemball NUGGET
ItemFragment_0x7de86: MountMortar1FInsideIron:
itemfragment IRON itemball IRON
ItemFragment_0x7de88: MountMortar1FInsideUltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
MapMountMortar1FInsideSignpostItem0: MapMountMortar1FInsideSignpostItem0:
dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL
@ -140,12 +140,12 @@ MountMortar1FInside_MapEventHeader:
.PersonEvents: .PersonEvents:
db 10 db 10
person_event SPRITE_BOULDER, 43, 21, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortar1FBoulder, -1 person_event SPRITE_BOULDER, 43, 21, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortar1FBoulder, -1
person_event SPRITE_POKE_BALL, 38, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de7c, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE person_event SPRITE_POKE_BALL, 38, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
person_event SPRITE_POKE_BALL, 10, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de7e, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE person_event SPRITE_POKE_BALL, 10, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
person_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de80, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION person_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION
person_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de82, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION person_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
person_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de84, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET person_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
person_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1 person_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1
person_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1 person_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1
person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de86, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
person_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de88, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL person_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL

12
maps/MountMortar1FOutside.asm
View File

@ -9,11 +9,11 @@ MountMortar1FOutside_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x7ddf6: MountMortar1FOutsideEther:
itemfragment ETHER itemball ETHER
ItemFragment_0x7ddf8: MountMortar1FOutsideRevive:
itemfragment REVIVE itemball REVIVE
MapMountMortar1FOutsideSignpostItem0: MapMountMortar1FOutsideSignpostItem0:
dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION
@ -44,5 +44,5 @@ MountMortar1FOutside_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7ddf6, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER person_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
person_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7ddf8, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE person_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE

36
maps/MountMortar2FInside.asm
View File

@ -25,23 +25,23 @@ SupernerdHughScript:
closetext closetext
end end
ItemFragment_0x7e0de: MountMortar2FInsideMaxPotion:
itemfragment MAX_POTION itemball MAX_POTION
ItemFragment_0x7e0e0: MountMortar2FInsideRareCandy:
itemfragment RARE_CANDY itemball RARE_CANDY
ItemFragment_0x7e0e2: MountMortar2FInsideTMDefenseCurl:
itemfragment TM_DEFENSE_CURL itemball TM_DEFENSE_CURL
ItemFragment_0x7e0e4: MountMortar2FInsideDragonScale:
itemfragment DRAGON_SCALE itemball DRAGON_SCALE
ItemFragment_0x7e0e6: MountMortar2FInsideElixer:
itemfragment ELIXER itemball ELIXER
ItemFragment_0x7e0e8: MountMortar2FInsideEscapeRope:
itemfragment ESCAPE_ROPE itemball ESCAPE_ROPE
MapMountMortar2FInsideSignpostItem0: MapMountMortar2FInsideSignpostItem0:
dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
@ -85,10 +85,10 @@ MountMortar2FInside_MapEventHeader:
.PersonEvents: .PersonEvents:
db 7 db 7
person_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0de, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION person_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
person_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e0, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY person_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
person_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e2, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL person_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
person_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e4, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE person_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e6, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
person_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e8, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE person_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
person_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdHugh, -1 person_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdHugh, -1

30
maps/MountMortarB1F.asm
View File

@ -56,20 +56,20 @@ UnknownScript_0x7e237:
MountMortarB1FBoulder: MountMortarB1FBoulder:
jumpstd strengthboulder jumpstd strengthboulder
ItemFragment_0x7e240: MountMortarB1FHyperPotion:
itemfragment HYPER_POTION itemball HYPER_POTION
ItemFragment_0x7e242: MountMortarB1FCarbos:
itemfragment CARBOS itemball CARBOS
ItemFragment_0x7e244: MountMortarB1FFullRestore:
itemfragment FULL_RESTORE itemball FULL_RESTORE
ItemFragment_0x7e246: MountMortarB1FMaxEther:
itemfragment MAX_ETHER itemball MAX_ETHER
ItemFragment_0x7e248: MountMortarB1FPPUp:
itemfragment PP_UP itemball PP_UP
MapMountMortarB1FSignpostItem0: MapMountMortarB1FSignpostItem0:
dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
@ -153,10 +153,10 @@ MountMortarB1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 7 db 7
person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
person_event SPRITE_BOULDER, 10, 9, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 person_event SPRITE_BOULDER, 10, 9, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
person_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 person_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1
person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP

12
maps/NationalPark.asm
View File

@ -298,11 +298,11 @@ MapNationalParkSignpost1Script:
MapNationalParkSignpost3Script: MapNationalParkSignpost3Script:
jumptext UnknownText_0x5c7c6 jumptext UnknownText_0x5c7c6
ItemFragment_0x5c1cc: NationalParkParlyzHeal:
itemfragment PARLYZ_HEAL itemball PARLYZ_HEAL
ItemFragment_0x5c1ce: NationalParkTMDig:
itemfragment TM_DIG itemball TM_DIG
MapNationalParkSignpostItem2: MapNationalParkSignpostItem2:
dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
@ -548,6 +548,6 @@ NationalPark_MapEventHeader:
person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1
person_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 person_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
person_event SPRITE_LASS, 14, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassKrise, -1 person_event SPRITE_LASS, 14, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassKrise, -1
person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5c1cc, EVENT_NATIONAL_PARK_PARLYZ_HEAL person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
person_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 person_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1
person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5c1ce, EVENT_NATIONAL_PARK_TM_DIG person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG

12
maps/NationalParkBugContest.asm
View File

@ -108,11 +108,11 @@ MapNationalParkBugContestSignpost1Script:
MapNationalParkBugContestSignpost3Script: MapNationalParkBugContestSignpost3Script:
jumptext UnknownText_0x5cc1d jumptext UnknownText_0x5cc1d
ItemFragment_0x5c945: NationalParkBugContestParlyzHeal:
itemfragment PARLYZ_HEAL itemball PARLYZ_HEAL
ItemFragment_0x5c947: NationalParkBugContestTMDig:
itemfragment TM_DIG itemball TM_DIG
MapNationalParkBugContestSignpostItem2: MapNationalParkBugContestSignpostItem2:
dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
@ -254,5 +254,5 @@ NationalParkBugContest_MapEventHeader:
person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A
person_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A person_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
person_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A person_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A
person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5c945, EVENT_NATIONAL_PARK_PARLYZ_HEAL person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5c947, EVENT_NATIONAL_PARK_TM_DIG person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG

28
maps/OaksLab.asm
View File

@ -11,7 +11,7 @@ OaksLab_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x19b3c7: .DummyTrigger:
end end
Oak: Oak:
@ -27,7 +27,7 @@ Oak:
.CheckBadges .CheckBadges
checkcode VAR_BADGES checkcode VAR_BADGES
if_equal 16, .OpenMtSilver if_equal 16, .OpenMtSilver
if_equal 8, .Complain if_equal 8, .Complain
jump .AhGood jump .AhGood
.CheckPokedex .CheckPokedex
@ -55,14 +55,14 @@ Oak:
buttonsound buttonsound
jump .CheckPokedex jump .CheckPokedex
ScientistScript_0x19b40f: OaksAssistant1Script:
jumptextfaceplayer UnknownText_0x19b7fb jumptextfaceplayer OaksAssistant1Text
ScientistScript_0x19b412: OaksAssistant2Script:
jumptextfaceplayer UnknownText_0x19b859 jumptextfaceplayer OaksAssistant2Text
ScientistScript_0x19b415: OaksAssistant3Script:
jumptextfaceplayer UnknownText_0x19b8a7 jumptextfaceplayer OaksAssistant3Text
OaksLabBookshelf: OaksLabBookshelf:
jumpstd difficultbookshelf jumpstd difficultbookshelf
@ -184,7 +184,7 @@ OakYesKantoBadgesText:
line "<PLAY_G>!" line "<PLAY_G>!"
done done
UnknownText_0x19b7fb: OaksAssistant1Text:
text "The PROF's #MON" text "The PROF's #MON"
line "TALK radio program" line "TALK radio program"
@ -195,7 +195,7 @@ UnknownText_0x19b7fb:
line "like to hear it." line "like to hear it."
done done
UnknownText_0x19b859: OaksAssistant2Text:
text "Thanks to your" text "Thanks to your"
line "work on the #-" line "work on the #-"
cont "DEX, the PROF's" cont "DEX, the PROF's"
@ -204,7 +204,7 @@ UnknownText_0x19b859:
line "along great." line "along great."
done done
UnknownText_0x19b8a7: OaksAssistant3Text:
text "Don't tell anyone," text "Don't tell anyone,"
line "but PROF.OAK'S" line "but PROF.OAK'S"
@ -290,6 +290,6 @@ OaksLab_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Oak, -1 person_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Oak, -1
person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x19b40f, -1 person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant1Script, -1
person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x19b412, -1 person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant2Script, -1
person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x19b415, -1 person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant3Script, -1

6
maps/OlivineLighthouse3F.asm
View File

@ -44,8 +44,8 @@ SailorTerrellScript:
closetext closetext
end end
ItemFragment_0x5b279: OlivineLighthouse3FEther:
itemfragment ETHER itemball ETHER
Bird_keeperTheoSeenText: Bird_keeperTheoSeenText:
text "Why are you here?" text "Why are you here?"
@ -139,4 +139,4 @@ OlivineLighthouse3F_MapEventHeader:
person_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSailorTerrell, -1 person_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSailorTerrell, -1
person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
person_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1 person_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1
person_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5b279, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER person_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER

18
maps/OlivineLighthouse5F.asm
View File

@ -34,14 +34,14 @@ SailorErnestScript:
closetext closetext
end end
ItemFragment_0x609aa: OlivineLighthouse5FRareCandy:
itemfragment RARE_CANDY itemball RARE_CANDY
ItemFragment_0x609ac: OlivineLighthouse5FSuperRepel:
itemfragment SUPER_REPEL itemball SUPER_REPEL
ItemFragment_0x609ae: OlivineLighthouse5FTMSwagger:
itemfragment TM_SWAGGER itemball TM_SWAGGER
MapOlivineLighthouse5FSignpostItem0: MapOlivineLighthouse5FSignpostItem0:
dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION
@ -116,6 +116,6 @@ OlivineLighthouse5F_MapEventHeader:
db 5 db 5
person_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorErnest, -1 person_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorErnest, -1
person_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1 person_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1
person_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x609aa, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY person_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
person_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x609ac, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL person_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
person_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x609ae, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER person_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER

6
maps/OlivineLighthouse6F.asm
View File

@ -127,8 +127,8 @@ UnknownScript_0x60c51:
special FadeInPalettes special FadeInPalettes
end end
ItemFragment_0x60c66: OlivineLighthouse6FSuperPotion:
itemfragment SUPER_POTION itemball SUPER_POTION
MovementData_0x60c68: MovementData_0x60c68:
slow_step_up slow_step_up
@ -277,4 +277,4 @@ OlivineLighthouse6F_MapEventHeader:
db 3 db 3
person_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE person_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
person_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 person_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1
person_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x60c66, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION person_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION

6
maps/RadioTower5F.asm
View File

@ -143,8 +143,8 @@ RadioTower5FRocketBossTrigger:
Ben: Ben:
jumptextfaceplayer BenText jumptextfaceplayer BenText
ItemFragment_0x600fe: RadioTower5FUltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
MapRadioTower5FSignpost0Script: MapRadioTower5FSignpost0Script:
jumptext SignpostRadioTower5FOffice jumptext SignpostRadioTower5FOffice
@ -450,4 +450,4 @@ RadioTower5F_MapEventHeader:
person_event SPRITE_ROCKET, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
person_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
person_event SPRITE_ROCKER, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_ROCKER, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
person_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x600fe, EVENT_RADIO_TOWER_5F_ULTRA_BALL person_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL

12
maps/RockTunnel1F.asm
View File

@ -9,11 +9,11 @@ RockTunnel1F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x743b5: RockTunnel1FElixer:
itemfragment ELIXER itemball ELIXER
ItemFragment_0x743b7: RockTunnel1FTMSteelWing:
itemfragment TM_STEEL_WING itemball TM_STEEL_WING
MapRockTunnel1FSignpostItem0: MapRockTunnel1FSignpostItem0:
dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY
@ -46,5 +46,5 @@ RockTunnel1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER person_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x743b7, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING

18
maps/RockTunnelB1F.asm
View File

@ -10,14 +10,14 @@ RockTunnelB1F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x74409: RockTunnelB1FIron:
itemfragment IRON itemball IRON
ItemFragment_0x7440b: RockTunnelB1FPPUp:
itemfragment PP_UP itemball PP_UP
ItemFragment_0x7440d: RockTunnelB1FRevive:
itemfragment REVIVE itemball REVIVE
MapRockTunnelB1FSignpostItem0: MapRockTunnelB1FSignpostItem0:
dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
@ -43,6 +43,6 @@ RockTunnelB1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
person_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP person_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7440d, EVENT_ROCK_TUNNEL_B1F_REVIVE person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE

12
maps/Route12.asm
View File

@ -63,11 +63,11 @@ MapRoute12Signpost0Script:
MapRoute12Signpost1Script: MapRoute12Signpost1Script:
jumptext UnknownText_0x1a72c1 jumptext UnknownText_0x1a72c1
ItemFragment_0x1a700b: Route12Calcium:
itemfragment CALCIUM itemball CALCIUM
ItemFragment_0x1a700d: Route12Nugget:
itemfragment NUGGET itemball NUGGET
MapRoute12SignpostItem2: MapRoute12SignpostItem2:
dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER
@ -190,5 +190,5 @@ Route12_MapEventHeader:
person_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherStephen, -1 person_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherStephen, -1
person_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerFisherBarney, -1 person_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerFisherBarney, -1
person_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherKyle, -1 person_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherKyle, -1
person_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a700b, EVENT_ROUTE_12_CALCIUM person_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM
person_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a700d, EVENT_ROUTE_12_NUGGET person_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET

6
maps/Route15.asm
View File

@ -83,8 +83,8 @@ SchoolboyBillyScript:
MapRoute15Signpost0Script: MapRoute15Signpost0Script:
jumptext UnknownText_0x1aa8e3 jumptext UnknownText_0x1aa8e3
ItemFragment_0x1aa5e4: Route15PPUp:
itemfragment PP_UP itemball PP_UP
TeacherColetteSeenText: TeacherColetteSeenText:
text "Have you forgotten" text "Have you forgotten"
@ -225,4 +225,4 @@ Route15_MapEventHeader:
person_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 person_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1
person_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerTeacherColette, -1 person_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerTeacherColette, -1
person_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherHillary, -1 person_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherHillary, -1
person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1aa5e4, EVENT_ROUTE_15_PP_UP person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP

24
maps/Route2.asm
View File

@ -54,17 +54,17 @@ MapRoute2Signpost0Script:
MapRoute2Signpost1Script: MapRoute2Signpost1Script:
jumptext UnknownText_0x1ac49f jumptext UnknownText_0x1ac49f
ItemFragment_0x1ac2fe: Route2DireHit:
itemfragment DIRE_HIT itemball DIRE_HIT
ItemFragment_0x1ac300: Route2MaxPotion:
itemfragment MAX_POTION itemball MAX_POTION
ItemFragment_0x1ac302: Route2Carbos:
itemfragment CARBOS itemball CARBOS
ItemFragment_0x1ac304: Route2Elixer:
itemfragment ELIXER itemball ELIXER
FruitTreeScript_0x1ac306: FruitTreeScript_0x1ac306:
fruittree FRUITTREE_ROUTE_2 fruittree FRUITTREE_ROUTE_2
@ -175,8 +175,8 @@ Route2_MapEventHeader:
person_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 person_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherRob, -1
person_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 person_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherEd, -1
person_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1 person_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1
person_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ac2fe, EVENT_ROUTE_2_DIRE_HIT person_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
person_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ac300, EVENT_ROUTE_2_MAX_POTION person_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
person_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ac302, EVENT_ROUTE_2_CARBOS person_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
person_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ac304, EVENT_ROUTE_2_ELIXER person_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
person_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 person_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1

6
maps/Route25.asm
View File

@ -189,8 +189,8 @@ UnknownScript_0x19efde:
MapRoute25Signpost0Script: MapRoute25Signpost0Script:
jumptext UnknownText_0x19f567 jumptext UnknownText_0x19f567
ItemFragment_0x19efe3: Route25Protein:
itemfragment PROTEIN itemball PROTEIN
MapRoute25SignpostItem1: MapRoute25SignpostItem1:
dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION
@ -462,4 +462,4 @@ Route25_MapEventHeader:
person_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassShannon, -1 person_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassShannon, -1
person_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerSupernerdPat, -1 person_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerSupernerdPat, -1
person_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 person_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1
person_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19efe3, EVENT_ROUTE_25_PROTEIN person_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN

6
maps/Route26.asm
View File

@ -251,8 +251,8 @@ MapRoute26Signpost0Script:
FruitTreeScript_0x1a4ec2: FruitTreeScript_0x1a4ec2:
fruittree FRUITTREE_ROUTE_26 fruittree FRUITTREE_ROUTE_26
ItemFragment_0x1a4ec4: Route26MaxElixer:
itemfragment MAX_ELIXER itemball MAX_ELIXER
CooltrainermJakeSeenText: CooltrainermJakeSeenText:
text "I'm making my" text "I'm making my"
@ -438,4 +438,4 @@ Route26_MapEventHeader:
person_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicRichard, -1 person_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicRichard, -1
person_event SPRITE_FISHER, 92, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherScott, -1 person_event SPRITE_FISHER, 92, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherScott, -1
person_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 person_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1
person_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a4ec4, EVENT_ROUTE_26_MAX_ELIXER person_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER

12
maps/Route27.asm
View File

@ -303,11 +303,11 @@ CooltrainerfMeganScript:
MapRoute27Signpost0Script: MapRoute27Signpost0Script:
jumptext UnknownText_0x1a0e7f jumptext UnknownText_0x1a0e7f
ItemFragment_0x1a0a62: Route27TMSolarbeam:
itemfragment TM_SOLARBEAM itemball TM_SOLARBEAM
ItemFragment_0x1a0a64: Route27RareCandy:
itemfragment RARE_CANDY itemball RARE_CANDY
MovementData_0x1a0a66: MovementData_0x1a0a66:
step_left step_left
@ -496,6 +496,6 @@ Route27_MapEventHeader:
person_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 person_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1
person_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 person_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicGilbert, -1
person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1
person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a0a62, EVENT_ROUTE_27_TM_SOLARBEAM person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM
person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a0a64, EVENT_ROUTE_27_RARE_CANDY person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY
person_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 3, FisherScript_0x1a089c, -1 person_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 3, FisherScript_0x1a089c, -1

6
maps/Route29.asm
View File

@ -216,8 +216,8 @@ MapRoute29Signpost1Script:
FruitTreeScript_0x1a1089: FruitTreeScript_0x1a1089:
fruittree FRUITTREE_ROUTE_29 fruittree FRUITTREE_ROUTE_29
ItemFragment_0x1a108b: Route29Potion:
itemfragment POTION itemball POTION
MovementData_0x1a108d: MovementData_0x1a108d:
step_up step_up
@ -447,4 +447,4 @@ Route29_MapEventHeader:
person_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a102e, -1 person_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a102e, -1
person_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 person_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1
person_event SPRITE_TEACHER, 12, 29, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY person_event SPRITE_TEACHER, 12, 29, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
person_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a108b, EVENT_ROUTE_29_POTION person_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION

6
maps/Route30.asm
View File

@ -238,8 +238,8 @@ MapRoute30Signpost2Script:
MapRoute30Signpost3Script: MapRoute30Signpost3Script:
jumptext UnknownText_0x1a1b66 jumptext UnknownText_0x1a1b66
ItemFragment_0x1a17f5: Route30Antidote:
itemfragment ANTIDOTE itemball ANTIDOTE
FruitTreeScript_0x1a17f7: FruitTreeScript_0x1a17f7:
fruittree FRUITTREE_ROUTE_30_1 fruittree FRUITTREE_ROUTE_30_1
@ -439,4 +439,4 @@ Route30_MapEventHeader:
person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a17f7, -1 person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a17f7, -1
person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a17f9, -1 person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a17f9, -1
person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1a17e6, -1 person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1a17e6, -1
person_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a17f5, EVENT_ROUTE_30_ANTIDOTE person_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE

12
maps/Route31.asm
View File

@ -263,11 +263,11 @@ CooltrainerMScript_0x1a55f6:
FruitTreeScript_0x1a55f9: FruitTreeScript_0x1a55f9:
fruittree FRUITTREE_ROUTE_31 fruittree FRUITTREE_ROUTE_31
ItemFragment_0x1a55fb: Route31Potion:
itemfragment POTION itemball POTION
ItemFragment_0x1a55fd: Route31PokeBall:
itemfragment POKE_BALL itemball POKE_BALL
UnknownText_0x1a55ff: UnknownText_0x1a55ff:
text "DARK CAVE…" text "DARK CAVE…"
@ -444,5 +444,5 @@ Route31_MapEventHeader:
person_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1 person_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1
person_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a55f6, -1 person_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a55f6, -1
person_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a55f9, -1 person_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a55f9, -1
person_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a55fb, EVENT_ROUTE_31_POTION person_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION
person_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a55fd, EVENT_ROUTE_31_POKE_BALL person_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL

12
maps/Route32.asm
View File

@ -492,11 +492,11 @@ FriedaNotFridayScript:
closetext closetext
end end
ItemFragment_0x190773: Route32GreatBall:
itemfragment GREAT_BALL itemball GREAT_BALL
ItemFragment_0x190775: Route32Repel:
itemfragment REPEL itemball REPEL
Route32Sign: Route32Sign:
jumptext Route32SignText jumptext Route32SignText
@ -972,7 +972,7 @@ Route32_MapEventHeader:
person_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19046f, -1 person_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19046f, -1
person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1
person_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1904f2, EVENT_SLOWPOKE_WELL_ROCKETS person_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1904f2, EVENT_SLOWPOKE_WELL_ROCKETS
person_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x190773, EVENT_ROUTE_32_GREAT_BALL person_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
person_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1904ce, -1 person_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1904ce, -1
person_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY person_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
person_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x190775, EVENT_ROUTE_32_REPEL person_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL

6
maps/Route34.asm
View File

@ -487,8 +487,8 @@ MapRoute34Signpost1Script:
MapRoute34Signpost2Script: MapRoute34Signpost2Script:
jumptext UnknownText_0x78a52 jumptext UnknownText_0x78a52
ItemFragment_0x7832b: Route34Nugget:
itemfragment NUGGET itemball NUGGET
MapRoute34SignpostItem3: MapRoute34SignpostItem3:
dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY
@ -802,4 +802,4 @@ Route34_MapEventHeader:
person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1
person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1
person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1
person_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7832b, EVENT_ROUTE_34_NUGGET person_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET

6
maps/Route35.asm
View File

@ -270,8 +270,8 @@ UnknownScript_0x19ca73:
MapRoute35Signpost1Script: MapRoute35Signpost1Script:
jumptext UnknownText_0x19cf94 jumptext UnknownText_0x19cf94
ItemFragment_0x19ca7c: Route35TMRollout:
itemfragment TM_ROLLOUT itemball TM_ROLLOUT
FruitTreeScript_0x19ca7e: FruitTreeScript_0x19ca7e:
fruittree FRUITTREE_ROUTE_35 fruittree FRUITTREE_ROUTE_35
@ -492,4 +492,4 @@ Route35_MapEventHeader:
person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1
person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT

6
maps/Route4.asm
View File

@ -47,8 +47,8 @@ PicnickerSharonScript:
MapRoute4Signpost0Script: MapRoute4Signpost0Script:
jumptext UnknownText_0x1ae384 jumptext UnknownText_0x1ae384
ItemFragment_0x1ae20f: Route4HPUp:
itemfragment HP_UP itemball HP_UP
MapRoute4SignpostItem1: MapRoute4SignpostItem1:
dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
@ -142,4 +142,4 @@ Route4_MapEventHeader:
person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperHank, -1 person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperHank, -1
person_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerHope, -1 person_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerHope, -1
person_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 person_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
person_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ae20f, EVENT_ROUTE_4_HP_UP person_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP

12
maps/Route42.asm
View File

@ -198,11 +198,11 @@ MapRoute42Signpost2Script:
MapRoute42Signpost3Script: MapRoute42Signpost3Script:
jumptext UnknownText_0x1a95a1 jumptext UnknownText_0x1a95a1
ItemFragment_0x1a9349: Route42UltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
ItemFragment_0x1a934b: Route42SuperPotion:
itemfragment SUPER_POTION itemball SUPER_POTION
FruitTreeScript_0x1a934d: FruitTreeScript_0x1a934d:
fruittree FRUITTREE_ROUTE_42_1 fruittree FRUITTREE_ROUTE_42_1
@ -353,6 +353,6 @@ Route42_MapEventHeader:
person_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 person_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1
person_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 person_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1
person_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 person_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1
person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a9349, EVENT_ROUTE_42_ULTRA_BALL person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL
person_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a934b, EVENT_ROUTE_42_SUPER_POTION person_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION
person_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 person_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42

6
maps/Route43.asm
View File

@ -324,8 +324,8 @@ MapRoute43Signpost2Script:
FruitTreeScript_0x19d266: FruitTreeScript_0x19d266:
fruittree FRUITTREE_ROUTE_43 fruittree FRUITTREE_ROUTE_43
ItemFragment_0x19d268: Route43MaxEther:
itemfragment MAX_ETHER itemball MAX_ETHER
PokemaniacBenSeenText: PokemaniacBenSeenText:
text "I love #MON!" text "I love #MON!"
@ -533,4 +533,4 @@ Route43_MapEventHeader:
person_event SPRITE_LASS, 25, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1 person_event SPRITE_LASS, 25, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1
person_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperSpencer, -1 person_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperSpencer, -1
person_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 person_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1
person_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19d268, EVENT_ROUTE_43_MAX_ETHER person_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER

18
maps/Route44.asm
View File

@ -308,14 +308,14 @@ MapRoute44Signpost1Script:
FruitTreeScript_0x19da40: FruitTreeScript_0x19da40:
fruittree FRUITTREE_ROUTE_44 fruittree FRUITTREE_ROUTE_44
ItemFragment_0x19da42: Route44MaxRevive:
itemfragment MAX_REVIVE itemball MAX_REVIVE
ItemFragment_0x19da44: Route44UltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
ItemFragment_0x19da46: Route44MaxRepel:
itemfragment MAX_REPEL itemball MAX_REPEL
MapRoute44SignpostItem2: MapRoute44SignpostItem2:
dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
@ -534,6 +534,6 @@ Route44_MapEventHeader:
person_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 person_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1
person_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 person_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1
person_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 person_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1
person_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19da42, EVENT_ROUTE_44_MAX_REVIVE person_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE
person_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19da44, EVENT_ROUTE_44_ULTRA_BALL person_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19da46, EVENT_ROUTE_44_MAX_REPEL person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL

24
maps/Route45.asm
View File

@ -299,17 +299,17 @@ MapRoute45Signpost0Script:
FruitTreeScript_0x19e294: FruitTreeScript_0x19e294:
fruittree FRUITTREE_ROUTE_45 fruittree FRUITTREE_ROUTE_45
ItemFragment_0x19e296: Route45Nugget:
itemfragment NUGGET itemball NUGGET
ItemFragment_0x19e298: Route45Revive:
itemfragment REVIVE itemball REVIVE
ItemFragment_0x19e29a: Route45Elixer:
itemfragment ELIXER itemball ELIXER
ItemFragment_0x19e29c: Route45MaxPotion:
itemfragment MAX_POTION itemball MAX_POTION
MapRoute45SignpostItem1: MapRoute45SignpostItem1:
dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP
@ -558,8 +558,8 @@ Route45_MapEventHeader:
person_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 person_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1
person_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 person_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1
person_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 person_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1
person_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19e296, EVENT_ROUTE_45_NUGGET person_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET
person_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19e298, EVENT_ROUTE_45_REVIVE person_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
person_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19e29a, EVENT_ROUTE_45_ELIXER person_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER
person_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19e29c, EVENT_ROUTE_45_MAX_POTION person_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
person_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1 person_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1

6
maps/Route46.asm
View File

@ -161,8 +161,8 @@ HikerBaileyScript:
MapRoute46Signpost0Script: MapRoute46Signpost0Script:
jumptext UnknownText_0x1a99be jumptext UnknownText_0x1a99be
ItemFragment_0x1a978d: Route46XSpeed:
itemfragment X_SPEED itemball X_SPEED
FruitTreeScript_0x1a978f: FruitTreeScript_0x1a978f:
fruittree FRUITTREE_ROUTE_46_1 fruittree FRUITTREE_ROUTE_46_1
@ -274,4 +274,4 @@ Route46_MapEventHeader:
person_event SPRITE_LASS, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 person_event SPRITE_LASS, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
person_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 person_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1
person_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 person_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1
person_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a978d, EVENT_ROUTE_46_X_SPEED person_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED

24
maps/RuinsofAlphAerodactylItemRoom.asm
View File

@ -11,17 +11,17 @@ RuinsofAlphAerodactylItemRoom_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x59ab6: RuinsofAlphAerodactylItemRoomGoldBerry:
itemfragment GOLD_BERRY itemball GOLD_BERRY
ItemFragment_0x59ab8: RuinsofAlphAerodactylItemRoomMoonStone:
itemfragment MOON_STONE itemball MOON_STONE
ItemFragment_0x59aba: RuinsofAlphAerodactylItemRoomHealPowder:
itemfragment HEAL_POWDER itemball HEAL_POWDER
ItemFragment_0x59abc: RuinsofAlphAerodactylItemRoomEnergyRoot:
itemfragment ENERGY_ROOT itemball ENERGY_ROOT
MapRuinsofAlphAerodactylItemRoomSignpost1Script: MapRuinsofAlphAerodactylItemRoomSignpost1Script:
jumptext UnknownText_0x59ac1 jumptext UnknownText_0x59ac1
@ -53,7 +53,7 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59ab6, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59ab8, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59aba, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59abc, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM

24
maps/RuinsofAlphHoOhItemRoom.asm
View File

@ -11,17 +11,17 @@ RuinsofAlphHoOhItemRoom_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x59918: RuinsofAlphHoOhItemRoomGoldBerry:
itemfragment GOLD_BERRY itemball GOLD_BERRY
ItemFragment_0x5991a: RuinsofAlphHoOhItemRoomMysteryberry:
itemfragment MYSTERYBERRY itemball MYSTERYBERRY
ItemFragment_0x5991c: RuinsofAlphHoOhItemRoomRevivalHerb:
itemfragment REVIVAL_HERB itemball REVIVAL_HERB
ItemFragment_0x5991e: RuinsofAlphHoOhItemRoomCharcoal:
itemfragment CHARCOAL itemball CHARCOAL
MapRuinsofAlphHoOhItemRoomSignpost1Script: MapRuinsofAlphHoOhItemRoomSignpost1Script:
jumptext UnknownText_0x59923 jumptext UnknownText_0x59923
@ -53,7 +53,7 @@ RuinsofAlphHoOhItemRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59918, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5991a, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5991c, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5991e, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM

24
maps/RuinsofAlphKabutoItemRoom.asm
View File

@ -11,17 +11,17 @@ RuinsofAlphKabutoItemRoom_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x599a2: RuinsofAlphKabutoItemRoomBerry:
itemfragment BERRY itemball BERRY
ItemFragment_0x599a4: RuinsofAlphKabutoItemRoomPsncureberry:
itemfragment PSNCUREBERRY itemball PSNCUREBERRY
ItemFragment_0x599a6: RuinsofAlphKabutoItemRoomHealPowder:
itemfragment HEAL_POWDER itemball HEAL_POWDER
ItemFragment_0x599a8: RuinsofAlphKabutoItemRoomEnergypowder:
itemfragment ENERGYPOWDER itemball ENERGYPOWDER
MapRuinsofAlphKabutoItemRoomSignpost1Script: MapRuinsofAlphKabutoItemRoomSignpost1Script:
jumptext UnknownText_0x599ad jumptext UnknownText_0x599ad
@ -53,7 +53,7 @@ RuinsofAlphKabutoItemRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x599a2, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x599a4, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x599a6, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x599a8, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM

24
maps/RuinsofAlphOmanyteItemRoom.asm
View File

@ -11,17 +11,17 @@ RuinsofAlphOmanyteItemRoom_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x59a2c: RuinsofAlphOmanyteItemRoomMysteryberry:
itemfragment MYSTERYBERRY itemball MYSTERYBERRY
ItemFragment_0x59a2e: RuinsofAlphOmanyteItemRoomMysticWater:
itemfragment MYSTIC_WATER itemball MYSTIC_WATER
ItemFragment_0x59a30: RuinsofAlphOmanyteItemRoomStardust:
itemfragment STARDUST itemball STARDUST
ItemFragment_0x59a32: RuinsofAlphOmanyteItemRoomStarPiece:
itemfragment STAR_PIECE itemball STAR_PIECE
MapRuinsofAlphOmanyteItemRoomSignpost1Script: MapRuinsofAlphOmanyteItemRoomSignpost1Script:
jumptext UnknownText_0x59a37 jumptext UnknownText_0x59a37
@ -53,7 +53,7 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59a2c, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59a2e, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59a30, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59a32, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM

12
maps/SilverCaveItemRooms.asm
View File

@ -9,11 +9,11 @@ SilverCaveItemRooms_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x18c65e: SilverCaveItemRoomsMaxRevive:
itemfragment MAX_REVIVE itemball MAX_REVIVE
ItemFragment_0x18c660: SilverCaveItemRoomsFullRestore:
itemfragment FULL_RESTORE itemball FULL_RESTORE
SilverCaveItemRooms_MapEventHeader: SilverCaveItemRooms_MapEventHeader:
; filler ; filler
@ -32,5 +32,5 @@ SilverCaveItemRooms_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c65e, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
person_event SPRITE_POKE_BALL, 11, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c660, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE person_event SPRITE_POKE_BALL, 11, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE

24
maps/SilverCaveRoom1.asm
View File

@ -11,17 +11,17 @@ SilverCaveRoom1_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x18c554: SilverCaveRoom1MaxElixer:
itemfragment MAX_ELIXER itemball MAX_ELIXER
ItemFragment_0x18c556: SilverCaveRoom1Protein:
itemfragment PROTEIN itemball PROTEIN
ItemFragment_0x18c558: SilverCaveRoom1EscapeRope:
itemfragment ESCAPE_ROPE itemball ESCAPE_ROPE
ItemFragment_0x18c55a: SilverCaveRoom1UltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
MapSilverCaveRoom1SignpostItem0: MapSilverCaveRoom1SignpostItem0:
dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT
@ -50,7 +50,7 @@ SilverCaveRoom1_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_POKE_BALL, 9, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER person_event SPRITE_POKE_BALL, 9, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
person_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN person_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
person_event SPRITE_POKE_BALL, 30, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c558, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE person_event SPRITE_POKE_BALL, 30, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
person_event SPRITE_POKE_BALL, 18, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c55a, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL person_event SPRITE_POKE_BALL, 18, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL

18
maps/SilverCaveRoom2.asm
View File

@ -10,14 +10,14 @@ SilverCaveRoom2_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x18c5b2: SilverCaveRoom2Calcium:
itemfragment CALCIUM itemball CALCIUM
ItemFragment_0x18c5b4: SilverCaveRoom2UltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
ItemFragment_0x18c5b6: SilverCaveRoom2PPUp:
itemfragment PP_UP itemball PP_UP
MapSilverCaveRoom2SignpostItem0: MapSilverCaveRoom2SignpostItem0:
dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION
@ -43,6 +43,6 @@ SilverCaveRoom2_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM person_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
person_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c5b4, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL person_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
person_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c5b6, EVENT_SILVER_CAVE_ROOM_2_PP_UP person_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP

6
maps/SlowpokeWellB1F.asm
View File

@ -123,8 +123,8 @@ SlowpokeScript_0x5a695:
SlowpokeWellB1FBoulder: SlowpokeWellB1FBoulder:
jumpstd strengthboulder jumpstd strengthboulder
ItemFragment_0x5a6a3: SlowpokeWellB1FSuperPotion:
itemfragment SUPER_POTION itemball SUPER_POTION
KurtSlowpokeWellVictoryMovementData: KurtSlowpokeWellVictoryMovementData:
step_left step_left
@ -345,4 +345,4 @@ SlowpokeWellB1F_MapEventHeader:
person_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES person_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES
person_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT person_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT
person_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 person_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1
person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a6a3, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION

6
maps/SlowpokeWellB2F.asm
View File

@ -29,8 +29,8 @@ UnknownScript_0x5ad22:
closetext closetext
end end
ItemFragment_0x5ad28: SlowpokeWellB2FTMRainDance:
itemfragment TM_RAIN_DANCE itemball TM_RAIN_DANCE
UnknownText_0x5ad2a: UnknownText_0x5ad2a:
text "I'm waiting to see" text "I'm waiting to see"
@ -78,4 +78,4 @@ SlowpokeWellB2F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 2 db 2
person_event SPRITE_GYM_GUY, 4, 5, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 person_event SPRITE_GYM_GUY, 4, 5, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
person_event SPRITE_POKE_BALL, 5, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5ad28, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE person_event SPRITE_POKE_BALL, 5, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE

6
maps/SproutTower1F.asm
View File

@ -36,8 +36,8 @@ SageChowScript:
closetext closetext
end end
ItemFragment_0x18451e: SproutTower1FParlyzHeal:
itemfragment PARLYZ_HEAL itemball PARLYZ_HEAL
MapSproutTower1FSignpost1Script: MapSproutTower1FSignpost1Script:
jumptext UnknownText_0x1846d6 jumptext UnknownText_0x1846d6
@ -129,4 +129,4 @@ SproutTower1F_MapEventHeader:
person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x184504, -1 person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x184504, -1
person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x184507, -1 person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x184507, -1
person_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageChow, -1 person_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageChow, -1
person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18451e, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL

6
maps/SproutTower2F.asm
View File

@ -35,8 +35,8 @@ SageEdmondScript:
MapSproutTower2FSignpost0Script: MapSproutTower2FSignpost0Script:
jumptext UnknownText_0x1848c8 jumptext UnknownText_0x1848c8
ItemFragment_0x1847a7: SproutTower2FXAccuracy:
itemfragment X_ACCURACY itemball X_ACCURACY
SageNicoSeenText: SageNicoSeenText:
text "However hard we" text "However hard we"
@ -106,4 +106,4 @@ SproutTower2F_MapEventHeader:
db 3 db 3
person_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageNico, -1 person_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageNico, -1
person_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSageEdmond, -1 person_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSageEdmond, -1
person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1847a7, EVENT_SPROUT_TOWER2F_X_ACCURACY person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY

12
maps/SproutTower3F.asm
View File

@ -133,11 +133,11 @@ MapSproutTower3FSignpost3Script:
MapSproutTower3FSignpost5Script: MapSproutTower3FSignpost5Script:
jumptext UnknownText_0x184f61 jumptext UnknownText_0x184f61
ItemFragment_0x184a19: SproutTower3FPotion:
itemfragment POTION itemball POTION
ItemFragment_0x184a1b: SproutTower3FEscapeRope:
itemfragment ESCAPE_ROPE itemball ESCAPE_ROPE
MovementData_0x184a1d: MovementData_0x184a1d:
step_up step_up
@ -358,6 +358,6 @@ SproutTower3F_MapEventHeader:
person_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerSageTroy, -1 person_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerSageTroy, -1
person_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SageLiScript, -1 person_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SageLiScript, -1
person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageNeal, -1 person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageNeal, -1
person_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x184a19, EVENT_SPROUT_TOWER_3F_POTION person_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION
person_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x184a1b, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE person_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
person_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER person_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER

18
maps/TeamRocketBaseB1F.asm
View File

@ -535,14 +535,14 @@ UnknownScript_0x6cabe:
closetext closetext
end end
ItemFragment_0x6cac4: TeamRocketBaseB1FHyperPotion:
itemfragment HYPER_POTION itemball HYPER_POTION
ItemFragment_0x6cac6: TeamRocketBaseB1FNugget:
itemfragment NUGGET itemball NUGGET
ItemFragment_0x6cac8: TeamRocketBaseB1FGuardSpec:
itemfragment GUARD_SPEC itemball GUARD_SPEC
MapTeamRocketBaseB1FSignpostItem8: MapTeamRocketBaseB1FSignpostItem8:
dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE
@ -797,6 +797,6 @@ TeamRocketBaseB1F_MapEventHeader:
person_event SPRITE_ROCKET, 0, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS person_event SPRITE_ROCKET, 0, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6cac4, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION person_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
person_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6cac6, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET person_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
person_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6cac8, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC person_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC

6
maps/TeamRocketBaseB2F.asm
View File

@ -359,8 +359,8 @@ UnknownScript_0x6d207:
closetext closetext
end end
ItemFragment_0x6d20d: TeamRocketBaseB2FTMThief:
itemfragment TM_THIEF itemball TM_THIEF
MapTeamRocketBaseB2FSignpostItem22: MapTeamRocketBaseB2FSignpostItem22:
dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
@ -981,4 +981,4 @@ TeamRocketBaseB2F_MapEventHeader:
person_event SPRITE_ROCKET, 13, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 13, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_ROCKET, 14, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 14, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_POKE_BALL, 10, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6d20d, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF person_event SPRITE_POKE_BALL, 10, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF

30
maps/TeamRocketBaseB3F.asm
View File

@ -210,20 +210,20 @@ BossDoor:
MapTeamRocketBaseB3FSignpost9Script: MapTeamRocketBaseB3FSignpost9Script:
jumpstd teamrocketoath jumpstd teamrocketoath
ItemFragment_0x6e120: TeamRocketBaseB3FProtein:
itemfragment PROTEIN itemball PROTEIN
ItemFragment_0x6e122: TeamRocketBaseB3FXSpecial:
itemfragment X_SPECIAL itemball X_SPECIAL
ItemFragment_0x6e124: TeamRocketBaseB3FFullHeal:
itemfragment FULL_HEAL itemball FULL_HEAL
ItemFragment_0x6e126: TeamRocketBaseB3FIceHeal:
itemfragment ICE_HEAL itemball ICE_HEAL
ItemFragment_0x6e128: TeamRocketBaseB3FUltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
MovementData_0x6e12a: MovementData_0x6e12a:
step_right step_right
@ -612,8 +612,8 @@ TeamRocketBaseB3F_MapEventHeader:
person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE person_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6e120, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
person_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6e122, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL person_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
person_event SPRITE_POKE_BALL, 9, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6e124, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL person_event SPRITE_POKE_BALL, 9, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
person_event SPRITE_POKE_BALL, 2, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6e126, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL person_event SPRITE_POKE_BALL, 2, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6e128, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL

6
maps/TinTower3F.asm
View File

@ -8,8 +8,8 @@ TinTower3F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x185a37: TinTower3FFullHeal:
itemfragment FULL_HEAL itemball FULL_HEAL
TinTower3F_MapEventHeader: TinTower3F_MapEventHeader:
; filler ; filler
@ -28,4 +28,4 @@ TinTower3F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185a37, EVENT_TIN_TOWER_3F_FULL_HEAL person_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL

18
maps/TinTower4F.asm
View File

@ -10,14 +10,14 @@ TinTower4F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x185a58: TinTower4FUltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
ItemFragment_0x185a5a: TinTower4FPPUp:
itemfragment PP_UP itemball PP_UP
ItemFragment_0x185a5c: TinTower4FEscapeRope:
itemfragment ESCAPE_ROPE itemball ESCAPE_ROPE
MapTinTower4FSignpostItem0: MapTinTower4FSignpostItem0:
dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION
@ -43,6 +43,6 @@ TinTower4F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185a58, EVENT_TIN_TOWER_4F_ULTRA_BALL person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
person_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185a5a, EVENT_TIN_TOWER_4F_PP_UP person_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
person_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185a5c, EVENT_TIN_TOWER_4F_ESCAPE_ROPE person_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE

6
maps/TinTower5F.asm
View File

@ -8,8 +8,8 @@ TinTower5F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x185aa9: TinTower5FRareCandy:
itemfragment RARE_CANDY itemball RARE_CANDY
MapTinTower5FSignpostItem0: MapTinTower5FSignpostItem0:
dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE
@ -40,4 +40,4 @@ TinTower5F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY person_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY

6
maps/TinTower6F.asm
View File

@ -8,8 +8,8 @@ TinTower6F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x185ae4: TinTower6FMaxPotion:
itemfragment MAX_POTION itemball MAX_POTION
TinTower6F_MapEventHeader: TinTower6F_MapEventHeader:
; filler ; filler
@ -28,4 +28,4 @@ TinTower6F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185ae4, EVENT_TIN_TOWER_6F_MAX_POTION person_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION

6
maps/TinTower7F.asm
View File

@ -8,8 +8,8 @@ TinTower7F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x185b05: TinTower7FMaxRevive:
itemfragment MAX_REVIVE itemball MAX_REVIVE
TinTower7F_MapEventHeader: TinTower7F_MapEventHeader:
; filler ; filler
@ -31,4 +31,4 @@ TinTower7F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185b05, EVENT_TIN_TOWER_7F_MAX_REVIVE person_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE

18
maps/TinTower8F.asm
View File

@ -10,14 +10,14 @@ TinTower8F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x185b35: TinTower8FNugget:
itemfragment NUGGET itemball NUGGET
ItemFragment_0x185b37: TinTower8FMaxElixer:
itemfragment MAX_ELIXER itemball MAX_ELIXER
ItemFragment_0x185b39: TinTower8FFullRestore:
itemfragment FULL_RESTORE itemball FULL_RESTORE
TinTower8F_MapEventHeader: TinTower8F_MapEventHeader:
; filler ; filler
@ -40,6 +40,6 @@ TinTower8F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185b35, EVENT_TIN_TOWER_8F_NUGGET person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
person_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185b37, EVENT_TIN_TOWER_8F_MAX_ELIXER person_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185b39, EVENT_TIN_TOWER_8F_FULL_RESTORE person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE

6
maps/TinTower9F.asm
View File

@ -8,8 +8,8 @@ TinTower9F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x185b88: TinTower9FHPUp:
itemfragment HP_UP itemball HP_UP
UnknownText_0x185b8a: UnknownText_0x185b8a:
text "HO-OH: Shaoooh!" text "HO-OH: Shaoooh!"
@ -41,4 +41,4 @@ TinTower9F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185b88, EVENT_TIN_TOWER_9F_HP_UP person_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP

6
maps/TohjoFalls.asm
View File

@ -8,8 +8,8 @@ TohjoFalls_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x18db02: TohjoFallsMoonStone:
itemfragment MOON_STONE itemball MOON_STONE
TohjoFalls_MapEventHeader: TohjoFalls_MapEventHeader:
; filler ; filler
@ -28,4 +28,4 @@ TohjoFalls_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18db02, EVENT_TOHJO_FALLS_MOON_STONE person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE

12
maps/UndergroundPathSwitchRoomEntrances.asm
View File

@ -628,11 +628,11 @@ UndergroundPathSwitchRoomEntrances_UpdateDoors:
clearevent EVENT_SWITCH_14 clearevent EVENT_SWITCH_14
end end
ItemFragment_0x7ce7d: UndergroundPathSwitchRoomEntrancesSmokeBall:
itemfragment SMOKE_BALL itemball SMOKE_BALL
ItemFragment_0x7ce7f: UndergroundPathSwitchRoomEntrancesFullHeal:
itemfragment FULL_HEAL itemball FULL_HEAL
MapUndergroundPathSwitchRoomEntrancesSignpostItem4: MapUndergroundPathSwitchRoomEntrancesSignpostItem4:
dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
@ -976,6 +976,6 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader:
person_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
person_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 person_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
person_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1 person_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1
person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7ce7d, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesSmokeBall, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7ce7f, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesFullHeal, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL
person_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH person_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH

18
maps/UndergroundWarehouse.asm
View File

@ -91,14 +91,14 @@ UnknownScript_0x7d9de:
closetext closetext
end end
ItemFragment_0x7d9e4: UndergroundWarehouseMaxEther:
itemfragment MAX_ETHER itemball MAX_ETHER
ItemFragment_0x7d9e6: UndergroundWarehouseTMSleepTalk:
itemfragment TM_SLEEP_TALK itemball TM_SLEEP_TALK
ItemFragment_0x7d9e8: UndergroundWarehouseUltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
GruntM24SeenText: GruntM24SeenText:
text "How did you get" text "How did you get"
@ -235,6 +235,6 @@ UndergroundWarehouse_MapEventHeader:
person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
person_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
person_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
person_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d9e4, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER person_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseMaxEther, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER
person_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d9e6, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK person_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseTMSleepTalk, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
person_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d9e8, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL person_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseUltraBall, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL

24
maps/UnionCave1F.asm
View File

@ -71,17 +71,17 @@ FirebreatherRayScript:
closetext closetext
end end
ItemFragment_0x59c00: UnionCave1FGreatBall:
itemfragment GREAT_BALL itemball GREAT_BALL
ItemFragment_0x59c02: UnionCave1FXAttack:
itemfragment X_ATTACK itemball X_ATTACK
ItemFragment_0x59c04: UnionCave1FPotion:
itemfragment POTION itemball POTION
ItemFragment_0x59c06: UnionCave1FAwakening:
itemfragment AWAKENING itemball AWAKENING
UnknownScript_0x59c08: UnknownScript_0x59c08:
jumptext UnknownText_0x59f29 jumptext UnknownText_0x59f29
@ -223,7 +223,7 @@ UnionCave1F_MapEventHeader:
person_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerRussell, -1 person_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerRussell, -1
person_event SPRITE_FISHER, 27, 15, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 person_event SPRITE_FISHER, 27, 15, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherRay, -1
person_event SPRITE_FISHER, 19, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherBill, -1 person_event SPRITE_FISHER, 19, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherBill, -1
person_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59c00, EVENT_UNION_CAVE_1F_GREAT_BALL person_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL
person_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59c02, EVENT_UNION_CAVE_1F_X_ATTACK person_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK
person_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59c04, EVENT_UNION_CAVE_1F_POTION person_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION
person_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59c06, EVENT_UNION_CAVE_1F_AWAKENING person_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING

12
maps/UnionCaveB1F.asm
View File

@ -58,11 +58,11 @@ HikerLeonardScript:
closetext closetext
end end
ItemFragment_0x5a016: UnionCaveB1FTMSwift:
itemfragment TM_SWIFT itemball TM_SWIFT
ItemFragment_0x5a018: UnionCaveB1FXDefend:
itemfragment X_DEFEND itemball X_DEFEND
UnionCaveB1FBoulder: UnionCaveB1FBoulder:
jumpstd strengthboulder jumpstd strengthboulder
@ -176,6 +176,6 @@ UnionCaveB1F_MapEventHeader:
person_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerLeonard, -1 person_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerLeonard, -1
person_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 person_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1
person_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1 person_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1
person_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a016, EVENT_UNION_CAVE_B1F_TM_SWIFT person_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT
person_event SPRITE_BOULDER, 10, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1 person_event SPRITE_BOULDER, 10, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1
person_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a018, EVENT_UNION_CAVE_B1F_X_DEFEND person_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND

12
maps/UnionCaveB2F.asm
View File

@ -73,11 +73,11 @@ CooltrainerfEmmaScript:
closetext closetext
end end
ItemFragment_0x5a36a: UnionCaveB2FElixer:
itemfragment ELIXER itemball ELIXER
ItemFragment_0x5a36c: UnionCaveB2FHyperPotion:
itemfragment HYPER_POTION itemball HYPER_POTION
CooltrainermNickSeenText: CooltrainermNickSeenText:
text "There are two" text "There are two"
@ -163,6 +163,6 @@ UnionCaveB2F_MapEventHeader:
person_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 person_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermNick, -1
person_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 person_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1
person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER
person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION
person_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS person_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS

30
maps/VictoryRoad.asm
View File

@ -98,20 +98,20 @@ UnknownScript_0x7451f:
closetext closetext
end end
ItemFragment_0x74529: VictoryRoadTMEarthquake:
itemfragment TM_EARTHQUAKE itemball TM_EARTHQUAKE
ItemFragment_0x7452b: VictoryRoadMaxRevive:
itemfragment MAX_REVIVE itemball MAX_REVIVE
ItemFragment_0x7452d: VictoryRoadFullRestore:
itemfragment FULL_RESTORE itemball FULL_RESTORE
ItemFragment_0x7452f: VictoryRoadFullHeal:
itemfragment FULL_HEAL itemball FULL_HEAL
ItemFragment_0x74531: VictoryRoadHPUp:
itemfragment HP_UP itemball HP_UP
MapVictoryRoadSignpostItem0: MapVictoryRoadSignpostItem0:
dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION
@ -272,8 +272,8 @@ VictoryRoad_MapEventHeader:
.PersonEvents: .PersonEvents:
db 6 db 6
person_event SPRITE_SILVER, 13, 18, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD person_event SPRITE_SILVER, 13, 18, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
person_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x74529, EVENT_VICTORY_ROAD_TM_EARTHQUAKE person_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
person_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7452b, EVENT_VICTORY_ROAD_MAX_REVIVE person_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
person_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7452d, EVENT_VICTORY_ROAD_FULL_RESTORE person_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE
person_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7452f, EVENT_VICTORY_ROAD_FULL_HEAL person_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL
person_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x74531, EVENT_VICTORY_ROAD_HP_UP person_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP

12
maps/VioletCity.asm
View File

@ -90,11 +90,11 @@ VioletCityPokeCenterSign:
VioletCityMartSign: VioletCityMartSign:
jumpstd martsign jumpstd martsign
ItemFragment_0x1a8421: VioletCityPPUp:
itemfragment PP_UP itemball PP_UP
ItemFragment_0x1a8423: VioletCityRareCandy:
itemfragment RARE_CANDY itemball RARE_CANDY
FruitTreeScript_0x1a8425: FruitTreeScript_0x1a8425:
fruittree FRUITTREE_VIOLET_CITY fruittree FRUITTREE_VIOLET_CITY
@ -317,5 +317,5 @@ VioletCity_MapEventHeader:
person_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a8409, -1 person_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a8409, -1
person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a840c, -1 person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a840c, -1
person_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8425, -1 person_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8425, -1
person_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a8421, EVENT_VIOLET_CITY_PP_UP person_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP
person_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a8423, EVENT_VIOLET_CITY_RARE_CANDY person_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY

6
maps/WarehouseEntrance.asm
View File

@ -407,8 +407,8 @@ WarehouseEntranceScript_ShopClosed:
closetext closetext
end end
ItemFragment_0x7c306: WarehouseEntranceCoinCase:
itemfragment COIN_CASE itemball COIN_CASE
MapWarehouseEntranceSignpost1Script: MapWarehouseEntranceSignpost1Script:
jumptext UnknownText_0x7c91a jumptext UnknownText_0x7c91a
@ -684,7 +684,7 @@ WarehouseEntrance_MapEventHeader:
person_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 person_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
person_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 person_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
person_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 person_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7c306, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WarehouseEntranceCoinCase, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE
person_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS person_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS
person_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER person_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER
person_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER person_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER

30
maps/WhirlIslandB1F.asm
View File

@ -13,20 +13,20 @@ WhirlIslandB1F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x18c410: WhirlIslandB1FFullRestore:
itemfragment FULL_RESTORE itemball FULL_RESTORE
ItemFragment_0x18c412: WhirlIslandB1FCarbos:
itemfragment CARBOS itemball CARBOS
ItemFragment_0x18c414: WhirlIslandB1FCalcium:
itemfragment CALCIUM itemball CALCIUM
ItemFragment_0x18c416: WhirlIslandB1FNugget:
itemfragment NUGGET itemball NUGGET
ItemFragment_0x18c418: WhirlIslandB1FEscapeRope:
itemfragment ESCAPE_ROPE itemball ESCAPE_ROPE
WhirlIslandB1FBoulder: WhirlIslandB1FBoulder:
jumpstd strengthboulder jumpstd strengthboulder
@ -70,9 +70,9 @@ WhirlIslandB1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 6 db 6
person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
person_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS person_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
person_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c414, EVENT_WHIRL_ISLAND_B1F_CALCIUM person_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM
person_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c416, EVENT_WHIRL_ISLAND_B1F_NUGGET person_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET
person_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c418, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE person_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
person_event SPRITE_BOULDER, 26, 23, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 person_event SPRITE_BOULDER, 26, 23, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1

18
maps/WhirlIslandB2F.asm
View File

@ -10,14 +10,14 @@ WhirlIslandB2F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x18c4b8: WhirlIslandB2FFullRestore:
itemfragment FULL_RESTORE itemball FULL_RESTORE
ItemFragment_0x18c4ba: WhirlIslandB2FMaxRevive:
itemfragment MAX_REVIVE itemball MAX_REVIVE
ItemFragment_0x18c4bc: WhirlIslandB2FMaxElixer:
itemfragment MAX_ELIXER itemball MAX_ELIXER
WhirlIslandB2F_MapEventHeader: WhirlIslandB2F_MapEventHeader:
; filler ; filler
@ -38,6 +38,6 @@ WhirlIslandB2F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 db 3
person_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE person_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
person_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c4bc, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER person_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER

6
maps/WhirlIslandNE.asm
View File

@ -8,8 +8,8 @@ WhirlIslandNE_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x18c396: WhirlIslandNEUltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
WhirlIslandNE_MapEventHeader: WhirlIslandNE_MapEventHeader:
; filler ; filler
@ -29,4 +29,4 @@ WhirlIslandNE_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c396, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL person_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL

6
maps/WhirlIslandSW.asm
View File

@ -8,8 +8,8 @@ WhirlIslandSW_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ItemFragment_0x18c3bc: WhirlIslandSWUltraBall:
itemfragment ULTRA_BALL itemball ULTRA_BALL
WhirlIslandSW_MapEventHeader: WhirlIslandSW_MapEventHeader:
; filler ; filler
@ -31,4 +31,4 @@ WhirlIslandSW_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL