ref: bb2aba7da172f8ede8c3eb6f3602f62eff4d55be
parent: 6e257bc7cdab3249cc8fbdf4c808f0ebc442022e
author: PikalaxALT <PikalaxALT@gmail.com>
date: Tue Dec 15 05:55:56 EST 2015
No more ItemFragment
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -659,7 +659,7 @@
const_def
const PERSONTYPE_SCRIPT
- const PERSONTYPE_ITEMFRAGMENT
+ const PERSONTYPE_ITEMBALL
const PERSONTYPE_TRAINER
const PERSONTYPE_3
const PERSONTYPE_4
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -641,7 +641,7 @@
.pointers
dbw PERSONTYPE_SCRIPT, .script
- dbw PERSONTYPE_ITEMFRAGMENT, .itemfragment
+ dbw PERSONTYPE_ITEMBALL, .itemball
dbw PERSONTYPE_TRAINER, .trainer
; the remaining four are dummy events
dbw PERSONTYPE_3, .three
@@ -662,7 +662,7 @@
ret
; 96a12
-.itemfragment ; 96a12
+.itemball ; 96a12
ld hl, MAPOBJECT_SCRIPT_POINTER
add hl, bc
ld a, [hli]
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -88,7 +88,7 @@
dw Movement_56 ; 56
dw Movement_rock_smash ; 57
dw Movement_return_dig ; 58
- dw Movement_59 ; 59
+ dw Movement_run_before_fall ; 59
; 5129
@@ -113,7 +113,7 @@
ret
; 513e
-Movement_59: ; 513e
+Movement_run_before_fall: ; 513e
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_19
--- a/event/halloffame.asm
+++ b/event/halloffame.asm
@@ -540,7 +540,7 @@
Function86810: ; 86810
call ClearBGPalettes
ld hl, VTiles2 tile $63
- ld de, FontExtra + $d0
+ ld de, FontExtra + 13 tiles
lb bc, BANK(FontExtra), 1
call Request2bpp
hlcoord 0, 0
--- a/home/map.asm
+++ b/home/map.asm
@@ -517,7 +517,7 @@
ld a, l
ld [wCurrMapTriggerHeaderPointer], a ; map trigger pointer
ld a, h
- ld [wdc09], a
+ ld [wCurrMapTriggerHeaderPointer + 1], a
ld a, c
and a
ret z
--- a/home/mobile.asm
+++ b/home/mobile.asm
@@ -127,7 +127,8 @@
; 3ed7
Function3ed7:: ; 3ed7
- ld [$dc02], a
+; unreferenced
+ ld [wdc02], a
ld a, [hROMBank]
push af
ld a, BANK(Function114243)
@@ -138,6 +139,6 @@
ld a, b
rst Bankswitch
- ld a, [$dc02]
+ ld a, [wdc02]
ret
; 3eea
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -39,7 +39,7 @@
dw Thunderstone
dw WaterStone
dw Item19
- dw HpUp
+ dw HPUp
dw Protein
dw Iron
dw Carbos
@@ -75,7 +75,7 @@
dw GoodRod
dw SilverLeaf
dw SuperRod
- dw PpUp
+ dw PPUp
dw Ether
dw MaxEther
dw Elixer
@@ -1225,7 +1225,7 @@
; ee3d
-HpUp:
+HPUp:
Protein:
Iron:
Carbos:
@@ -2512,7 +2512,7 @@
MaxElixer:
-PpUp:
+PPUp:
Ether:
MaxEther:
Elixer:
--- a/macros/map.asm
+++ b/macros/map.asm
@@ -171,7 +171,7 @@
map \3
ENDM
-itemfragment: MACRO
+itemball: MACRO
if _NARG == 2
db \1, \2
else
@@ -178,3 +178,9 @@
db \1, 1
endc
endm
+
+stonetable: MACRO
+ db \1, \2
+ dw \3
+endm
+
--- a/macros/movement.asm
+++ b/macros/movement.asm
@@ -433,3 +433,8 @@
db movement_return_dig ; $58
db \1
endm
+
+ enum movement_run_before_fall
+run_before_fall: macro
+ db movement_run_before_fall ; $59
+ endm
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -22,19 +22,19 @@
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
return
-StandingYoungsterScript_0x9f85f:
- jumptextfaceplayer UnknownText_0x9f930
+BattleTowerOutsideYoungsterScript:
+ jumptextfaceplayer BattleTowerOutsideYoungsterText
-BuenaScript_0x9f862:
- jumptextfaceplayer UnknownText_0x9f9db
+BattleTowerOutsideBuenaScript:
+ jumptextfaceplayer BattleTowerOutsideBuenaText
-SailorScript_0x9f865:
- jumptextfaceplayer UnknownText_0x9fa8c
+BattleTowerOutsideSailorScript:
+ jumptextfaceplayer BattleTowerOutsideSailorText
MapBattleTowerOutsideSignpost0Script:
- jumptext UnknownText_0x9fafc
+ jumptext BattleTowerOutsideText_UltimateChallenge
-UnknownText_0x9f86b:
+BattleTowerOutsideUnusedText1:
text "Wow, the BATTLE"
line "TOWER is huge! My"
@@ -42,7 +42,7 @@
line "looking up at it."
done
-UnknownText_0x9f8b3:
+BattleTowerOutsideUnusedText2:
text "Wow, the BATTLE"
line "TOWER is huge!"
@@ -56,7 +56,7 @@
line "#MON."
done
-UnknownText_0x9f930:
+BattleTowerOutsideYoungsterText:
text "Wow, the BATTLE"
line "TOWER is huge!"
@@ -65,7 +65,7 @@
cont "in there!"
done
-UnknownText_0x9f97b:
+BattleTowerOutsideUnusedText3:
text "What on earth do"
line "they do here?"
@@ -76,7 +76,7 @@
line "#MON battles."
done
-UnknownText_0x9f9db:
+BattleTowerOutsideBuenaText:
text "You can use only"
line "three #MON."
@@ -87,7 +87,7 @@
line "battle…"
done
-UnknownText_0x9fa32:
+BattleTowerOutsideUnusedText4:
text "Ehehehe…"
line "I sneaked out of"
cont "work to come here."
@@ -97,7 +97,7 @@
cont "a LEADER!"
done
-UnknownText_0x9fa8c:
+BattleTowerOutsideSailorText:
text "Hehehe, I snuck"
line "out from work."
@@ -108,11 +108,11 @@
line "all. That I must!"
done
-UnknownText_0x9faee:
+BattleTowerOutsideText_BattleTower:
text "BATTLE TOWER"
done
-UnknownText_0x9fafc:
+BattleTowerOutsideText_UltimateChallenge:
text "BATTLE TOWER"
para "Take the Ultimate"
@@ -119,12 +119,12 @@
line "Trainer Challenge!"
done
-UnknownText_0x9fb2f:
+BattleTowerOutsideText_DoorsClosed:
text "The BATTLE TOWER's"
line "doors are closed…"
done
-UnknownText_0x9fb54:
+BattleTowerOutsideText_DoorsOpen:
text "It's open!"
done
@@ -148,7 +148,7 @@
.PersonEvents:
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_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BuenaScript_0x9f862, -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_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, BattleTowerOutsideBuenaScript, -1
+ 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
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -12,206 +12,206 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iftrue UnknownScript_0x1896ba
+ iftrue .JustShowedSomething
checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
- iftrue UnknownScript_0x1896c0
+ iftrue .GotThunderstone
checkevent EVENT_MET_BILLS_GRANDPA
- iftrue UnknownScript_0x189553
- writetext UnknownText_0x1896ce
+ iftrue .MetGrandpa
+ writetext BillsGrandpaIntroText
buttonsound
setevent EVENT_MET_BILLS_GRANDPA
-UnknownScript_0x189553:
+.MetGrandpa:
checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
- iftrue UnknownScript_0x189697
+ iftrue .ShowedPichu
checkevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
- iftrue UnknownScript_0x189680
+ iftrue .ShowedGrowlitheVulpix
checkevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
- iftrue UnknownScript_0x189669
+ iftrue .ShowedStaryu
checkevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
- iftrue UnknownScript_0x189652
+ iftrue .ShowedOddish
checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
- iftrue UnknownScript_0x18963b
- writetext UnknownText_0x1898c0
+ iftrue .ShowedLickitung
+ writetext BillsGrandpaLickitungText
buttonsound
- writetext UnknownText_0x189732
+ writetext BillsGrandpaAskToSeeMonText
yesorno
- iffalse UnknownScript_0x1896aa
- scall UnknownScript_0x1896a5
+ iffalse .SaidNo
+ scall .ExcitedToSee
special Special_BillsGrandfather
- iffalse UnknownScript_0x1896aa
- if_not_equal LICKITUNG, UnknownScript_0x1896c6
- scall UnknownScript_0x1896b0
+ iffalse .SaidNo
+ if_not_equal LICKITUNG, .WrongPokemon
+ scall .CorrectPokemon
setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
- jump UnknownScript_0x18963b
+ jump .ShowedLickitung
-UnknownScript_0x189592:
- writetext UnknownText_0x1898ff
+.GotEverstone:
+ writetext BillsGrandpaOddishText
buttonsound
- writetext UnknownText_0x189732
+ writetext BillsGrandpaAskToSeeMonText
yesorno
- iffalse UnknownScript_0x1896aa
- scall UnknownScript_0x1896a5
+ iffalse .SaidNo
+ scall .ExcitedToSee
special Special_BillsGrandfather
- iffalse UnknownScript_0x1896aa
- if_not_equal ODDISH, UnknownScript_0x1896c6
- scall UnknownScript_0x1896b0
+ iffalse .SaidNo
+ if_not_equal ODDISH, .WrongPokemon
+ scall .CorrectPokemon
setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
- jump UnknownScript_0x189652
+ jump .ShowedOddish
-UnknownScript_0x1895b3:
- writetext UnknownText_0x189953
+.GotLeafStone:
+ writetext BillsGrandpaStaryuText
buttonsound
- writetext UnknownText_0x189732
+ writetext BillsGrandpaAskToSeeMonText
yesorno
- iffalse UnknownScript_0x1896aa
- scall UnknownScript_0x1896a5
+ iffalse .SaidNo
+ scall .ExcitedToSee
special Special_BillsGrandfather
- iffalse UnknownScript_0x1896aa
- if_not_equal STARYU, UnknownScript_0x1896c6
- scall UnknownScript_0x1896b0
+ iffalse .SaidNo
+ if_not_equal STARYU, .WrongPokemon
+ scall .CorrectPokemon
setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
- jump UnknownScript_0x189669
+ jump .ShowedStaryu
-UnknownScript_0x1895d4:
+.GotWaterStone:
checkver
- iftrue UnknownScript_0x1895f9
- writetext UnknownText_0x1899fe
+ iftrue .Crystal11
+ writetext BillsGrandpaGrowlitheText
buttonsound
- writetext UnknownText_0x189732
+ writetext BillsGrandpaAskToSeeMonText
yesorno
- iffalse UnknownScript_0x1896aa
- scall UnknownScript_0x1896a5
+ iffalse .SaidNo
+ scall .ExcitedToSee
special Special_BillsGrandfather
- iffalse UnknownScript_0x1896aa
- if_not_equal GROWLITHE, UnknownScript_0x1896c6
- scall UnknownScript_0x1896b0
+ iffalse .SaidNo
+ if_not_equal GROWLITHE, .WrongPokemon
+ scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
- jump UnknownScript_0x189680
+ jump .ShowedGrowlitheVulpix
-UnknownScript_0x1895f9:
- writetext UnknownText_0x189a57
+.Crystal11:
+ writetext BillsGrandpaVulpixText
buttonsound
- writetext UnknownText_0x189732
+ writetext BillsGrandpaAskToSeeMonText
yesorno
- iffalse UnknownScript_0x1896aa
- scall UnknownScript_0x1896a5
+ iffalse .SaidNo
+ scall .ExcitedToSee
special Special_BillsGrandfather
- iffalse UnknownScript_0x1896aa
- if_not_equal VULPIX, UnknownScript_0x1896c6
- scall UnknownScript_0x1896b0
+ iffalse .SaidNo
+ if_not_equal VULPIX, .WrongPokemon
+ scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
- jump UnknownScript_0x189680
+ jump .ShowedGrowlitheVulpix
-UnknownScript_0x18961a:
- writetext UnknownText_0x189ab1
+.GotFireStone:
+ writetext BillsGrandpaPichuText
buttonsound
- writetext UnknownText_0x189732
+ writetext BillsGrandpaAskToSeeMonText
yesorno
- iffalse UnknownScript_0x1896aa
- scall UnknownScript_0x1896a5
+ iffalse .SaidNo
+ scall .ExcitedToSee
special Special_BillsGrandfather
- iffalse UnknownScript_0x1896aa
- if_not_equal PICHU, UnknownScript_0x1896c6
- scall UnknownScript_0x1896b0
+ iffalse .SaidNo
+ if_not_equal PICHU, .WrongPokemon
+ scall .CorrectPokemon
setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
- jump UnknownScript_0x189697
+ jump .ShowedPichu
-UnknownScript_0x18963b:
+.ShowedLickitung:
checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
- iftrue UnknownScript_0x189592
- scall UnknownScript_0x1896b5
+ iftrue .GotEverstone
+ scall .ReceiveItem
verbosegiveitem EVERSTONE
- iffalse UnknownScript_0x1896cc
+ iffalse .BagFull
setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
closetext
end
-UnknownScript_0x189652:
+.ShowedOddish:
checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
- iftrue UnknownScript_0x1895b3
- scall UnknownScript_0x1896b5
+ iftrue .GotLeafStone
+ scall .ReceiveItem
verbosegiveitem LEAF_STONE
- iffalse UnknownScript_0x1896cc
+ iffalse .BagFull
setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
closetext
end
-UnknownScript_0x189669:
+.ShowedStaryu:
checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
- iftrue UnknownScript_0x1895d4
- scall UnknownScript_0x1896b5
+ iftrue .GotWaterStone
+ scall .ReceiveItem
verbosegiveitem WATER_STONE
- iffalse UnknownScript_0x1896cc
+ iffalse .BagFull
setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
closetext
end
-UnknownScript_0x189680:
+.ShowedGrowlitheVulpix:
checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
- iftrue UnknownScript_0x18961a
- scall UnknownScript_0x1896b5
+ iftrue .GotFireStone
+ scall .ReceiveItem
verbosegiveitem FIRE_STONE
- iffalse UnknownScript_0x1896cc
+ iffalse .BagFull
setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
closetext
end
-UnknownScript_0x189697:
- scall UnknownScript_0x1896b5
+.ShowedPichu:
+ scall .ReceiveItem
verbosegiveitem THUNDERSTONE
- iffalse UnknownScript_0x1896cc
+ iffalse .BagFull
setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
closetext
end
-UnknownScript_0x1896a5:
- writetext UnknownText_0x189760
+.ExcitedToSee:
+ writetext BillsGrandpaExcitedToSeeText
buttonsound
end
-UnknownScript_0x1896aa:
- writetext UnknownText_0x189784
+.SaidNo:
+ writetext BillsGrandpaYouDontHaveItTextText
waitbutton
closetext
end
-UnknownScript_0x1896b0:
- writetext UnknownText_0x1897a6
+.CorrectPokemon:
+ writetext BillsGrandpaShownPokemonText
buttonsound
end
-UnknownScript_0x1896b5:
- writetext UnknownText_0x1897e1
+.ReceiveItem:
+ writetext BillsGrandpaTokenOfAppreciationText
buttonsound
end
-UnknownScript_0x1896ba:
- writetext UnknownText_0x18980e
+.JustShowedSomething:
+ writetext BillsGrandpaComeAgainText
waitbutton
closetext
end
-UnknownScript_0x1896c0:
- writetext UnknownText_0x18982a
+.GotThunderstone:
+ writetext BillsGrandpaShownAllThePokemonText
waitbutton
closetext
end
-UnknownScript_0x1896c6:
- writetext UnknownText_0x189891
+.WrongPokemon:
+ writetext BillsGrandpaWrongPokemonText
waitbutton
closetext
end
-UnknownScript_0x1896cc:
+.BagFull:
closetext
end
-UnknownText_0x1896ce:
+BillsGrandpaIntroText:
text "Hm? You know BILL?"
line "He's my grandson."
@@ -222,23 +222,23 @@
line "house-sitting."
done
-UnknownText_0x189732:
+BillsGrandpaAskToSeeMonText:
text "If you have that"
line "#MON, may I see"
cont "it, please?"
done
-UnknownText_0x189760:
+BillsGrandpaExcitedToSeeText:
text "You will show me?"
line "How good of you!"
done
-UnknownText_0x189784:
+BillsGrandpaYouDontHaveItTextText:
text "You don't have it?"
line "That's too bad…"
done
-UnknownText_0x1897a6:
+BillsGrandpaShownPokemonText:
text "Ah, so that is"
line "@"
text_from_ram StringBuffer3
@@ -249,7 +249,7 @@
cont "you."
done
-UnknownText_0x1897e1:
+BillsGrandpaTokenOfAppreciationText:
text "Thanks!"
para "This is a token of"
@@ -256,12 +256,12 @@
line "my appreciation."
done
-UnknownText_0x18980e:
+BillsGrandpaComeAgainText:
text "Come visit again"
line "sometime."
done
-UnknownText_0x18982a:
+BillsGrandpaShownAllThePokemonText:
text "Thanks for showing"
line "me so many cute"
cont "#MON."
@@ -273,7 +273,7 @@
line "long life."
done
-UnknownText_0x189891:
+BillsGrandpaWrongPokemonText:
text "Hm?"
para "That's not the"
@@ -281,7 +281,7 @@
cont "told about."
done
-UnknownText_0x1898c0:
+BillsGrandpaLickitungText:
text "My grandson BILL"
line "told me about a"
@@ -289,7 +289,7 @@
line "long tongue."
done
-UnknownText_0x1898ff:
+BillsGrandpaOddishText:
text "Ah, my grandson"
line "mentioned a round,"
@@ -298,7 +298,7 @@
cont "on its head."
done
-UnknownText_0x189953:
+BillsGrandpaStaryuText:
text "Do you know of a"
line "sea #MON that"
@@ -316,7 +316,7 @@
line "like to see it."
done
-UnknownText_0x1899fe:
+BillsGrandpaGrowlitheText:
text "BILL told me about"
line "a #MON that is"
@@ -327,7 +327,7 @@
line "ROAR well."
done
-UnknownText_0x189a57:
+BillsGrandpaVulpixText:
text "I heard about a"
line "cute #MON that"
cont "has six tails."
@@ -337,7 +337,7 @@
cont "like that."
done
-UnknownText_0x189ab1:
+BillsGrandpaPichuText:
text "Do you know that"
line "hugely popular"
cont "#MON?"
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -34,68 +34,68 @@
appear BLACKTHORNCITY_YOUNGSTER2
return
-SuperNerdScript_0x1a46e8:
+BlackthornSuperNerdScript:
faceplayer
opentext
checkevent EVENT_BEAT_CLAIR
- iftrue UnknownScript_0x1a4702
+ iftrue .BeatClair
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x1a46fc
- writetext UnknownText_0x1a477a
+ iftrue .ClearedRadioTower
+ writetext Text_ClairIsOut
waitbutton
closetext
end
-UnknownScript_0x1a46fc:
- writetext UnknownText_0x1a47f3
+.ClearedRadioTower:
+ writetext Text_ClairIsIn
waitbutton
closetext
end
-UnknownScript_0x1a4702:
- writetext UnknownText_0x1a4865
+.BeatClair:
+ writetext Text_ClairIsBeaten
waitbutton
closetext
end
-GrampsScript_0x1a4708:
- jumptextfaceplayer UnknownText_0x1a48c3
+BlackthornGramps1Script:
+ jumptextfaceplayer BlackthornGrampsRefusesEntryText
-GrampsScript_0x1a470b:
- jumptextfaceplayer UnknownText_0x1a48fb
+BlackthornGramps2Script:
+ jumptextfaceplayer BlackthornGrampsGrantsEntryText
-BlackBeltScript_0x1a470e:
+BlackthornBlackBeltScript:
faceplayer
opentext
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x1a471c
- writetext UnknownText_0x1a494a
+ iftrue .ClearedRadioTower
+ writetext BlackBeltText_WeirdRadio
waitbutton
closetext
end
-UnknownScript_0x1a471c:
- writetext UnknownText_0x1a4983
+.ClearedRadioTower:
+ writetext BlackBeltText_VoicesInMyHead
waitbutton
closetext
end
-CooltrainerFScript_0x1a4722:
- jumptextfaceplayer UnknownText_0x1a49bd
+BlackthornCooltrainerF1Script:
+ jumptextfaceplayer BlackthornCooltrainerF1Text
-YoungsterScript_0x1a4725:
- jumptextfaceplayer UnknownText_0x1a49f1
+BlackthornYoungsterScript:
+ jumptextfaceplayer BlackthornYoungsterText
-CooltrainerFScript_0x1a4728:
- jumptextfaceplayer UnknownText_0x1a4b1e
+BlackthornCooltrainerF2Script:
+ jumptextfaceplayer BlackthornCooltrainerF2Text
SantosScript:
faceplayer
opentext
checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
- iftrue SantosSaturdayScript
+ iftrue .Saturday
checkcode VAR_WEEKDAY
- if_not_equal SATURDAY, SantosNotSaturdayScript
+ if_not_equal SATURDAY, .NotSaturday
checkevent EVENT_MET_SANTOS_OF_SATURDAY
iftrue .MetSantos
writetext MeetSantosText
@@ -105,7 +105,7 @@
writetext SantosGivesGiftText
buttonsound
verbosegiveitem SPELL_TAG
- iffalse SantosDoneScript
+ iffalse .Done
setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
writetext SantosGaveGiftText
waitbutton
@@ -112,14 +112,14 @@
closetext
end
-SantosSaturdayScript:
+.Saturday
writetext SantosSaturdayText
waitbutton
-SantosDoneScript:
+.Done
closetext
end
-SantosNotSaturdayScript:
+.NotSaturday
writetext SantosNotSaturdayText
waitbutton
closetext
@@ -146,7 +146,7 @@
BlackthornCityMartSign:
jumpstd martsign
-UnknownText_0x1a477a:
+Text_ClairIsOut:
text "I am sorry."
para "CLAIR, our GYM"
@@ -160,7 +160,7 @@
cont "will return."
done
-UnknownText_0x1a47f3:
+Text_ClairIsIn:
text "CLAIR, our GYM"
line "LEADER, is waiting"
cont "for you."
@@ -172,7 +172,7 @@
line "trainer to win."
done
-UnknownText_0x1a4865:
+Text_ClairIsBeaten:
text "You defeated"
line "CLAIR?"
@@ -185,7 +185,7 @@
line "LANCE."
done
-UnknownText_0x1a48c3:
+BlackthornGrampsRefusesEntryText:
text "No. Only chosen"
line "trainers may train"
@@ -193,7 +193,7 @@
line "Please leave."
done
-UnknownText_0x1a48fb:
+BlackthornGrampsGrantsEntryText:
text "If CLAIR allows"
line "it, her grand-"
cont "father--our MASTER"
@@ -202,13 +202,13 @@
para "You may enter."
done
-UnknownText_0x1a494a:
+BlackBeltText_WeirdRadio:
text "My radio's busted?"
line "Lately, I only get"
cont "this weird signal."
done
-UnknownText_0x1a4983:
+BlackBeltText_VoicesInMyHead:
text "Arooo! Voices in"
line "my head!"
@@ -216,13 +216,13 @@
line "to my radio!"
done
-UnknownText_0x1a49bd:
+BlackthornCooltrainerF1Text:
text "Are you going to"
line "make your #MON"
cont "forget some moves?"
done
-UnknownText_0x1a49f1:
+BlackthornYoungsterText:
text "Dragon masters all"
line "come from the city"
cont "of BLACKTHORN."
@@ -268,7 +268,7 @@
line "not Saturday…"
done
-UnknownText_0x1a4b1e:
+BlackthornCooltrainerF2Text:
text "Wow, you came"
line "through the ICE"
cont "PATH?"
@@ -344,12 +344,12 @@
.PersonEvents:
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, 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_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, 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_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_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_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a4725, -1
+ 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, 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, 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, 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, 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, BlackthornCooltrainerF1Script, -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_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
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -30,23 +30,23 @@
.skip3
return
-ClairScript_0x194e24:
+BlackthornGymClairScript:
faceplayer
opentext
checkflag ENGINE_RISINGBADGE
- iftrue UnknownScript_0x194e69
+ iftrue .AlreadyGotBadge
checkevent EVENT_BEAT_CLAIR
iftrue .FightDone
- writetext UnknownText_0x194efa
+ writetext ClairIntroText
waitbutton
closetext
- winlosstext UnknownText_0x194fd6, 0
+ winlosstext ClairWinText, 0
loadtrainer CLAIR, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_CLAIR
opentext
- writetext UnknownText_0x19500e
+ writetext ClairText_GoToDragonsDen
waitbutton
closetext
setevent EVENT_BEAT_COOLTRAINERM_PAUL
@@ -58,37 +58,38 @@
setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
end
+
.FightDone
- writetext UnknownText_0x195162
+ writetext ClairText_TooMuchToExpect
waitbutton
closetext
end
-UnknownScript_0x194e69:
+.AlreadyGotBadge
checkevent EVENT_GOT_TM24_DRAGONBREATH
- iftrue UnknownScript_0x194e94
- writetext UnknownText_0x195196
+ iftrue .GotTM24
+ writetext BlackthornGymClairText_YouKeptMeWaiting
buttonsound
giveitem TM_DRAGONBREATH
- iffalse UnknownScript_0x194e8e
+ iffalse .BagFull
itemtotext TM_DRAGONBREATH, $0
- writetext UnknownText_0x1951bf
+ writetext BlackthornGymText_ReceivedTM24
playsound SFX_ITEM
waitsfx
itemnotify
setevent EVENT_GOT_TM24_DRAGONBREATH
- writetext UnknownText_0x1951d1
+ writetext BlackthornGymClairText_DescribeTM24
buttonsound
- jump UnknownScript_0x194e94
+ jump .GotTM24
-UnknownScript_0x194e8e:
- writetext UnknownText_0x19524f
+.BagFull:
+ writetext BlackthornGymClairText_BagFull
waitbutton
closetext
end
-UnknownScript_0x194e94:
- writetext UnknownText_0x195272
+.GotTM24:
+ writetext BlackthornGymClairText_League
waitbutton
closetext
end
@@ -99,7 +100,7 @@
CooltrainermPaulScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1953f1
+ writetext CooltrainermPaulAfterText
waitbutton
closetext
end
@@ -110,7 +111,7 @@
CooltrainermMikeScript:
end_if_just_battled
opentext
- writetext UnknownText_0x195467
+ writetext CooltrainermMikeAfterText
waitbutton
closetext
end
@@ -121,7 +122,7 @@
CooltrainerfLolaScript:
end_if_just_battled
opentext
- writetext UnknownText_0x195516
+ writetext CooltrainerfLolaAfterText
waitbutton
closetext
end
@@ -150,7 +151,7 @@
trainertotext CLAIR, 1, $1
jumpstd gymstatue2
-UnknownText_0x194efa:
+ClairIntroText:
text "I am CLAIR."
para "The world's best"
@@ -175,7 +176,7 @@
line "opponent!"
done
-UnknownText_0x194fd6:
+ClairWinText:
text "I lost?"
para "I don't believe"
@@ -183,7 +184,7 @@
cont "some mistake…"
done
-UnknownText_0x19500e:
+ClairText_GoToDragonsDen:
text "I won't admit"
line "this."
@@ -218,7 +219,7 @@
cont "BADGE!"
done
-UnknownText_0x195162:
+ClairText_TooMuchToExpect:
text "What's the matter?"
para "Is it too much to"
@@ -225,7 +226,7 @@
line "expect of you?"
done
-UnknownText_0x195196:
+BlackthornGymClairText_YouKeptMeWaiting:
text "You've kept me"
line "waiting!"
@@ -232,12 +233,12 @@
para "Here! Take this!"
done
-UnknownText_0x1951bf:
+BlackthornGymText_ReceivedTM24:
text "<PLAYER> received"
line "TM24."
done
-UnknownText_0x1951d1:
+BlackthornGymClairText_DescribeTM24:
text "That contains"
line "DRAGONBREATH."
@@ -250,12 +251,12 @@
cont "to take it."
done
-UnknownText_0x19524f:
+BlackthornGymClairText_BagFull:
text "What is this? You"
line "don't have room?"
done
-UnknownText_0x195272:
+BlackthornGymClairText_League:
text "What's the matter?"
para "Aren't you headed"
@@ -299,7 +300,7 @@
line "lost?"
done
-UnknownText_0x1953f1:
+CooltrainermPaulAfterText:
text "LANCE told you"
line "that he'd like to"
@@ -317,7 +318,7 @@
text "That's odd."
done
-UnknownText_0x195467:
+CooltrainermMikeAfterText:
text "I know my short-"
line "comings now."
@@ -343,7 +344,7 @@
text "Way to go!"
done
-UnknownText_0x195516:
+CooltrainerfLolaAfterText:
text "Dragons are weak"
line "against dragon-"
cont "type moves."
@@ -411,7 +412,7 @@
.PersonEvents:
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, 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
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -27,17 +27,11 @@
db 0, 0 ; filler
.BoulderTable
- db 5, 4 ; warp, person
- dw .Disappear4
+ stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4
+ stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Disappear5
+ stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Disappear6
+ db -1 ; end
- db 3, 5 ; warp, person
- dw .Disappear5
-
- db 4, 6 ; warp, person
- dw .Disappear6
-
- db $ff ; end
-
.Disappear4
disappear BLACKTHORNGYM2F_BOULDER1
jump .Fall
@@ -74,7 +68,7 @@
CooltrainermCodyScript:
end_if_just_battled
opentext
- writetext UnknownText_0x1957d5
+ writetext CooltrainermCodyAfterText
waitbutton
closetext
end
@@ -85,7 +79,7 @@
CooltrainerfFranScript:
end_if_just_battled
opentext
- writetext UnknownText_0x195883
+ writetext CooltrainerfFranAfterText
waitbutton
closetext
end
@@ -101,7 +95,7 @@
line "had a dragon!"
done
-UnknownText_0x1957d5:
+CooltrainermCodyAfterText:
text "Members of our"
line "dragon-user clan"
@@ -125,7 +119,7 @@
text "Awww… I lost…"
done
-UnknownText_0x195883:
+CooltrainerfFranAfterText:
text "Uh-oh… CLAIR is"
line "going to be mad…"
done
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -143,8 +143,8 @@
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
-ItemFragment_0x185ccb:
- itemfragment HP_UP
+BurnedTower1FHPUp:
+ itemball HP_UP
MovementData_0x185ccd:
step_left
@@ -155,7 +155,7 @@
step_end
MovementData_0x185cd1:
- db $59 ; movement
+ run_before_fall
step_end
MovementData_0x185cd3:
@@ -292,18 +292,18 @@
db 14
warp_def $f, $9, 13, ECRUTEAK_CITY
warp_def $f, $a, 13, ECRUTEAK_CITY
- warp_def $9, $a, 1, BURNED_TOWER_B1F
- warp_def $5, $5, 1, BURNED_TOWER_B1F
- warp_def $6, $5, 1, BURNED_TOWER_B1F
- warp_def $6, $4, 1, BURNED_TOWER_B1F
- warp_def $4, $f, 2, BURNED_TOWER_B1F
- warp_def $5, $f, 2, BURNED_TOWER_B1F
- warp_def $7, $a, 3, BURNED_TOWER_B1F
- warp_def $e, $5, 4, BURNED_TOWER_B1F
- warp_def $e, $4, 4, BURNED_TOWER_B1F
- warp_def $e, $e, 5, BURNED_TOWER_B1F
- warp_def $e, $f, 5, BURNED_TOWER_B1F
- warp_def $f, $7, 6, BURNED_TOWER_B1F
+ warp_def $9, $a, 1, BURNED_TOWER_B1F
+ warp_def $5, $5, 1, BURNED_TOWER_B1F
+ warp_def $6, $5, 1, BURNED_TOWER_B1F
+ warp_def $6, $4, 1, BURNED_TOWER_B1F
+ warp_def $4, $f, 2, BURNED_TOWER_B1F
+ warp_def $5, $f, 2, BURNED_TOWER_B1F
+ warp_def $7, $a, 3, BURNED_TOWER_B1F
+ warp_def $e, $5, 4, BURNED_TOWER_B1F
+ warp_def $e, $4, 4, BURNED_TOWER_B1F
+ warp_def $e, $e, 5, BURNED_TOWER_B1F
+ warp_def $e, $f, 5, BURNED_TOWER_B1F
+ warp_def $f, $7, 6, BURNED_TOWER_B1F
.XYTriggers:
db 1
@@ -320,4 +320,4 @@
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_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
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -123,8 +123,8 @@
waitsfx
end
-ItemFragment_0x186231:
- itemfragment TM_ENDURE
+BurnedTowerB1FTMEndure:
+ itemball TM_ENDURE
BurnedTowerB1FBoulder:
jumpstd strengthboulder
@@ -269,5 +269,5 @@
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_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
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -42,30 +42,30 @@
closetext
playmusic MUSIC_SHOW_ME_AROUND
follow CHERRYGROVECITY_GRAMPS, PLAYER
- applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c195
+ applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement1
opentext
writetext GuideGentPokeCenterText
waitbutton
closetext
- applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c19b
+ applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
spriteface PLAYER, UP
opentext
writetext GuideGentMartText
waitbutton
closetext
- applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1a3
+ applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3
spriteface PLAYER, UP
opentext
writetext GuideGentRoute30Text
waitbutton
closetext
- applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1ac
+ applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4
spriteface PLAYER, LEFT
opentext
writetext GuideGentSeaText
waitbutton
closetext
- applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1b6
+ applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5
spriteface PLAYER, UP
pause 60
spriteface CHERRYGROVECITY_GRAMPS, LEFT
@@ -74,7 +74,7 @@
writetext GuideGentGiftText
buttonsound
stringtotext .mapcardname, $1
- scall .UnknownScript_0x19c097
+ scall .JumpstdReceiveItem
setflag ENGINE_MAP_CARD
writetext GotMapCardText
buttonsound
@@ -84,7 +84,7 @@
stopfollow
special RestartMapMusic
spriteface PLAYER, UP
- applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1cb
+ applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement6
playsound SFX_ENTER_DOOR
disappear CHERRYGROVECITY_GRAMPS
clearevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
@@ -91,7 +91,7 @@
waitsfx
end
-.UnknownScript_0x19c097
+.JumpstdReceiveItem
jumpstd receiveitem
end
@@ -104,10 +104,9 @@
closetext
end
-UnknownScript_0x19c0aa:
+CherrygroveSilverTriggerSouth:
moveperson CHERRYGROVECITY_SILVER, $27, $7
-
-UnknownScript_0x19c0ae:
+CherrygroveSilverTriggerNorth:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
@@ -121,10 +120,10 @@
waitbutton
closetext
checkevent EVENT_GOT_TOTODILE_FROM_ELM
- iftrue UnknownScript_0x19c0ee
+ iftrue .Totodile
checkevent EVENT_GOT_CHIKORITA_FROM_ELM
- iftrue UnknownScript_0x19c104
- winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
+ iftrue .Chikorita
+ winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_3
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
@@ -131,11 +130,11 @@
startbattle
reloadmapmusic
reloadmap
- iftrue UnknownScript_0x19c11a
- jump UnknownScript_0x19c126
+ iftrue .AfterVictorious
+ jump .AfterYourDefeat
-UnknownScript_0x19c0ee:
- winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
+.Totodile:
+ winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_1
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
@@ -142,11 +141,11 @@
startbattle
reloadmapmusic
reloadmap
- iftrue UnknownScript_0x19c11a
- jump UnknownScript_0x19c126
+ iftrue .AfterVictorious
+ jump .AfterYourDefeat
-UnknownScript_0x19c104:
- winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
+.Chikorita:
+ winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_2
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
@@ -153,24 +152,24 @@
startbattle
reloadmapmusic
reloadmap
- iftrue UnknownScript_0x19c11a
- jump UnknownScript_0x19c126
+ iftrue .AfterVictorious
+ jump .AfterYourDefeat
-UnknownScript_0x19c11a:
+.AfterVictorious:
playmusic MUSIC_RIVAL_AFTER
opentext
- writetext UnknownText_0x19c608
+ writetext CherrygroveRivalText_YouWon
waitbutton
closetext
- jump UnknownScript_0x19c12f
+ jump .FinishRival
-UnknownScript_0x19c126:
+.AfterYourDefeat:
playmusic MUSIC_RIVAL_AFTER
opentext
- writetext UnknownText_0x19c59e
+ writetext CherrygroveRivalText_YouLost
waitbutton
closetext
-UnknownScript_0x19c12f:
+.FinishRival:
playsound SFX_TACKLE
applymovement PLAYER, MovementData_0x19c1d4
spriteface PLAYER, LEFT
@@ -181,34 +180,34 @@
playmapmusic
end
-TeacherScript_0x19c146:
+CherrygroveTeacherScript:
faceplayer
opentext
checkflag ENGINE_MAP_CARD
- iftrue UnknownScript_0x19c154
- writetext UnknownText_0x19c650
+ iftrue .HaveMapCard
+ writetext CherrygroveTeacherText_NoMapCard
waitbutton
closetext
end
-UnknownScript_0x19c154:
- writetext UnknownText_0x19c6a8
+.HaveMapCard:
+ writetext CherrygroveTeacherText_HaveMapCard
waitbutton
closetext
end
-YoungsterScript_0x19c15a:
+CherrygroveYoungsterScript:
faceplayer
opentext
checkflag ENGINE_POKEDEX
- iftrue UnknownScript_0x19c168
- writetext UnknownText_0x19c6d6
+ iftrue .HavePokedex
+ writetext CherrygroveYoungsterText_NoPokedex
waitbutton
closetext
end
-UnknownScript_0x19c168:
- writetext UnknownText_0x19c701
+.HavePokedex:
+ writetext CherrygroveYoungsterText_HavePokedex
waitbutton
closetext
end
@@ -217,16 +216,16 @@
faceplayer
opentext
checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
- iftrue UnknownScript_0x19c183
- writetext UnknownText_0x19c766
+ iftrue .After
+ writetext MysticWaterGuyTextBefore
buttonsound
verbosegiveitem MYSTIC_WATER
- iffalse UnknownScript_0x19c187
+ iffalse .Exit
setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
-UnknownScript_0x19c183:
- writetext UnknownText_0x19c7c1
+.After:
+ writetext MysticWaterGuyTextAfter
waitbutton
-UnknownScript_0x19c187:
+.Exit:
closetext
end
@@ -242,7 +241,7 @@
CherrygroveCityMartSign:
jumpstd martsign
-MovementData_0x19c195:
+GuideGentMovement1:
step_left
step_left
step_up
@@ -250,7 +249,7 @@
turn_head_up
step_end
-MovementData_0x19c19b:
+GuideGentMovement2:
step_left
step_left
step_left
@@ -260,7 +259,7 @@
turn_head_up
step_end
-MovementData_0x19c1a3:
+GuideGentMovement3:
step_left
step_left
step_left
@@ -271,7 +270,7 @@
turn_head_up
step_end
-MovementData_0x19c1ac:
+GuideGentMovement4:
step_left
step_left
step_left
@@ -283,7 +282,7 @@
turn_head_left
step_end
-MovementData_0x19c1b6:
+GuideGentMovement5:
step_down
step_down
step_right
@@ -306,7 +305,7 @@
turn_head_up
step_end
-MovementData_0x19c1cb:
+GuideGentMovement6:
step_up
step_up
step_end
@@ -458,12 +457,12 @@
line "what I mean!"
done
-UnknownText_0x19c57f:
+SilverCherrygroveWinText:
text "Humph. Are you"
line "happy you won?"
done
-UnknownText_0x19c59e:
+CherrygroveRivalText_YouLost:
text "<......> <......> <......>"
para "My name's ???."
@@ -474,12 +473,12 @@
cont "trainer."
done
-UnknownText_0x19c5e6:
+SilverCherrygroveLossText:
text "Humph. That was a"
line "waste of time."
done
-UnknownText_0x19c608:
+CherrygroveRivalText_YouWon:
text "<......> <......> <......>"
para "My name's ???."
@@ -490,7 +489,7 @@
cont "trainer."
done
-UnknownText_0x19c650:
+CherrygroveTeacherText_NoMapCard:
text "Did you talk to"
line "the old man by the"
cont "#MON CENTER?"
@@ -500,19 +499,19 @@
cont "#GEAR."
done
-UnknownText_0x19c6a8:
+CherrygroveTeacherText_HaveMapCard:
text "When you're with"
line "#MON, going"
cont "anywhere is fun."
done
-UnknownText_0x19c6d6:
+CherrygroveYoungsterText_NoPokedex:
text "MR.#MON's house"
line "is still farther"
cont "up ahead."
done
-UnknownText_0x19c701:
+CherrygroveYoungsterText_HavePokedex:
text "I battled the"
line "trainers on the"
cont "road."
@@ -524,7 +523,7 @@
line "a #MON CENTER."
done
-UnknownText_0x19c766:
+MysticWaterGuyTextBefore:
text "A #MON I caught"
line "had an item."
@@ -535,7 +534,7 @@
line "so do you want it?"
done
-UnknownText_0x19c7c1:
+MysticWaterGuyTextAfter:
text "Back to fishing"
line "for me, then."
done
@@ -565,8 +564,8 @@
.XYTriggers:
db 2
- xy_trigger 1, $6, $21, $0, UnknownScript_0x19c0ae, $0, $0
- xy_trigger 1, $7, $21, $0, UnknownScript_0x19c0aa, $0, $0
+ xy_trigger 1, $6, $21, $0, CherrygroveSilverTriggerNorth, $0, $0
+ xy_trigger 1, $7, $21, $0, CherrygroveSilverTriggerSouth, $0, $0
.Signposts:
db 4
@@ -579,6 +578,6 @@
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_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_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_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, 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
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -27,11 +27,11 @@
closetext
end
-ItemFragment_0x18c73b:
- itemfragment REVIVE
+DarkCaveBlackthornEntranceRevive:
+ itemball REVIVE
-ItemFragment_0x18c73d:
- itemfragment TM_SNORE
+DarkCaveBlackthornEntranceTMSnore:
+ itemball TM_SNORE
UnknownText_0x18c73f:
text "Whoa! You startled"
@@ -79,5 +79,5 @@
.PersonEvents:
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_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, 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, 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_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -15,17 +15,17 @@
.MapCallbacks:
db 0
-ItemFragment_0x18c68e:
- itemfragment POTION
+DarkCaveVioletEntrancePotion:
+ itemball POTION
-ItemFragment_0x18c690:
- itemfragment FULL_HEAL
+DarkCaveVioletEntranceFullHeal:
+ itemball FULL_HEAL
-ItemFragment_0x18c692:
- itemfragment HYPER_POTION
+DarkCaveVioletEntranceHyperPotion:
+ itemball HYPER_POTION
-ItemFragment_0x18c694:
- itemfragment DIRE_HIT
+DarkCaveVioletEntranceDireHit:
+ itemball DIRE_HIT
DarkCaveVioletEntranceRock:
jumpstd smashrock
@@ -53,11 +53,11 @@
.PersonEvents:
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, 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, 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, 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, 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, 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_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_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -181,11 +181,11 @@
MapDragonsDenB1FSignpost0Script:
jumptext DragonShrineSignpostText
-ItemFragment_0x18c9a1:
- itemfragment CALCIUM
+DragonsDenB1FCalcium:
+ itemball CALCIUM
-ItemFragment_0x18c9a3:
- itemfragment MAX_ELIXER
+DragonsDenB1FMaxElixer:
+ itemball MAX_ELIXER
MapDragonsDenB1FSignpostItem1:
dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE
@@ -440,5 +440,5 @@
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, 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, 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, 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_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -18,8 +18,8 @@
MapFightingDojoSignpost1Script:
jumptext UnknownText_0x189be0
-ItemFragment_0x189b6a:
- itemfragment FOCUS_BAND
+FightingDojoFocusBand:
+ itemball FOCUS_BAND
UnknownText_0x189b6c:
text "Hello!"
@@ -62,4 +62,4 @@
.PersonEvents:
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_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
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -67,17 +67,17 @@
closetext
end
-ItemFragment_0x7d7c3:
- itemfragment ETHER
+GoldenrodDeptStoreB1FEther:
+ itemball ETHER
-ItemFragment_0x7d7c5:
- itemfragment AMULET_COIN
+GoldenrodDeptStoreB1FAmuletCoin:
+ itemball AMULET_COIN
-ItemFragment_0x7d7c7:
- itemfragment BURN_HEAL
+GoldenrodDeptStoreB1FBurnHeal:
+ itemball BURN_HEAL
-ItemFragment_0x7d7c9:
- itemfragment ULTRA_BALL
+GoldenrodDeptStoreB1FUltraBall:
+ itemball ULTRA_BALL
UnknownText_0x7d7cb:
text "Hey, kid! You're"
@@ -131,10 +131,10 @@
.PersonEvents:
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, 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, 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, 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, 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_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_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_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, 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
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -10,14 +10,14 @@
.MapCallbacks:
db 0
-ItemFragment_0x7e472:
- itemfragment HM_WATERFALL
+IcePath1FHMWaterfall:
+ itemball HM_WATERFALL
-ItemFragment_0x7e474:
- itemfragment PP_UP
+IcePath1FPPUp:
+ itemball PP_UP
-ItemFragment_0x7e476:
- itemfragment PROTEIN
+IcePath1FProtein:
+ itemball PROTEIN
IcePath1F_MapEventHeader:
; filler
@@ -38,6 +38,6 @@
.PersonEvents:
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, 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, 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, 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_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_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -25,20 +25,12 @@
db 0, 0 ; filler
.StoneTable:
- db 3, 2 ; warp, person
- dw .Boulder1
+ stonetable 3, ICEPATHB1F_BOULDER1, .Boulder1
+ stonetable 4, ICEPATHB1F_BOULDER2, .Boulder2
+ stonetable 5, ICEPATHB1F_BOULDER3, .Boulder3
+ stonetable 6, ICEPATHB1F_BOULDER4, .Boulder4
+ db -1
- db 4, 3 ; warp, person
- dw .Boulder2
-
- db 5, 4 ; warp, person
- dw .Boulder3
-
- db 6, 5 ; warp, person
- dw .Boulder4
-
- db -1 ; end
-
.Boulder1:
disappear ICEPATHB1F_BOULDER1
clearevent EVENT_BOULDER_IN_ICE_PATH_1A
@@ -63,7 +55,7 @@
pause 30
scall .BoulderFallsThrough
opentext
- writetext UnknownText_0x7e512
+ writetext IcePathBoulderFellThroughText
waitbutton
closetext
end
@@ -77,14 +69,14 @@
IcePathB1FBoulder:
jumpstd strengthboulder
-ItemFragment_0x7e50d:
- itemfragment IRON
+IcePathB1FIron:
+ itemball IRON
MapIcePathB1FSignpostItem0:
dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
-UnknownText_0x7e512:
+IcePathBoulderFellThroughText:
text "The boulder fell"
line "through."
done
@@ -118,4 +110,4 @@
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, 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
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -8,8 +8,8 @@
.MapCallbacks:
db 0
-ItemFragment_0x7e646:
- itemfragment TM_REST
+IcePathB2FBlackthornSideTMRest:
+ itemball TM_REST
MapIcePathB2FBlackthornSideSignpostItem0:
dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL
@@ -33,4 +33,4 @@
.PersonEvents:
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
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -16,11 +16,11 @@
BoulderScript_0x7e5a3:
jumptext UnknownText_0x7e5ad
-ItemFragment_0x7e5a6:
- itemfragment FULL_HEAL
+IcePathB2FMahoganySideFullHeal:
+ itemball FULL_HEAL
-ItemFragment_0x7e5a8:
- itemfragment MAX_POTION
+IcePathB2FMahoganySideMaxPotion:
+ itemball MAX_POTION
MapIcePathB2FMahoganySideSignpostItem0:
dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
@@ -57,5 +57,5 @@
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, 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, 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, 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_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -9,8 +9,8 @@
.MapCallbacks:
db 0
-ItemFragment_0x7e66f:
- itemfragment NEVERMELTICE
+IcePathB3FNevermeltice:
+ itemball NEVERMELTICE
IcePathB3FRock:
jumpstd smashrock
@@ -32,5 +32,5 @@
.PersonEvents:
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
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -404,17 +404,17 @@
IlexForestLassScript:
jumptextfaceplayer Text_IlexForestLass
-ItemFragment_0x6ee10:
- itemfragment REVIVE
+IlexForestRevive:
+ itemball REVIVE
-ItemFragment_0x6ee12:
- itemfragment X_ATTACK
+IlexForestXAttack:
+ itemball X_ATTACK
-ItemFragment_0x6ee14:
- itemfragment ANTIDOTE
+IlexForestAntidote:
+ itemball ANTIDOTE
-ItemFragment_0x6ee16:
- itemfragment ETHER
+IlexForestEther:
+ itemball ETHER
MapIlexForestSignpostItem1:
dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER
@@ -969,10 +969,10 @@
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_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_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_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, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6ee14, 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, 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_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
+ person_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -230,11 +230,11 @@
closetext
end
-ItemFragment_0x70148:
- itemfragment ELIXER
+LakeofRageElixer:
+ itemball ELIXER
-ItemFragment_0x7014a:
- itemfragment TM_DETECT
+LakeofRageTMDetect:
+ itemball TM_DETECT
MapLakeofRageSignpostItem2:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
@@ -533,5 +533,5 @@
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_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, 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, 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_ITEMBALL, 0, LakeofRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -42,26 +42,26 @@
MountMortar1FBoulder:
jumpstd strengthboulder
-ItemFragment_0x7de7c:
- itemfragment ESCAPE_ROPE
+MountMortar1FInsideEscapeRope:
+ itemball ESCAPE_ROPE
-ItemFragment_0x7de7e:
- itemfragment MAX_REVIVE
+MountMortar1FInsideMaxRevive:
+ itemball MAX_REVIVE
-ItemFragment_0x7de80:
- itemfragment HYPER_POTION
+MountMortar1FInsideHyperPotion:
+ itemball HYPER_POTION
-ItemFragment_0x7de82:
- itemfragment MAX_POTION
+MountMortar1FInsideMaxPotion:
+ itemball MAX_POTION
-ItemFragment_0x7de84:
- itemfragment NUGGET
+MountMortar1FInsideNugget:
+ itemball NUGGET
-ItemFragment_0x7de86:
- itemfragment IRON
+MountMortar1FInsideIron:
+ itemball IRON
-ItemFragment_0x7de88:
- itemfragment ULTRA_BALL
+MountMortar1FInsideUltraBall:
+ itemball ULTRA_BALL
MapMountMortar1FInsideSignpostItem0:
dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL
@@ -140,12 +140,12 @@
.PersonEvents:
db 10
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, 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, 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, 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, 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, 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_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_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_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_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, 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, 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, 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_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -9,11 +9,11 @@
.MapCallbacks:
db 0
-ItemFragment_0x7ddf6:
- itemfragment ETHER
+MountMortar1FOutsideEther:
+ itemball ETHER
-ItemFragment_0x7ddf8:
- itemfragment REVIVE
+MountMortar1FOutsideRevive:
+ itemball REVIVE
MapMountMortar1FOutsideSignpostItem0:
dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION
@@ -44,5 +44,5 @@
.PersonEvents:
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, 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, 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_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -25,23 +25,23 @@
closetext
end
-ItemFragment_0x7e0de:
- itemfragment MAX_POTION
+MountMortar2FInsideMaxPotion:
+ itemball MAX_POTION
-ItemFragment_0x7e0e0:
- itemfragment RARE_CANDY
+MountMortar2FInsideRareCandy:
+ itemball RARE_CANDY
-ItemFragment_0x7e0e2:
- itemfragment TM_DEFENSE_CURL
+MountMortar2FInsideTMDefenseCurl:
+ itemball TM_DEFENSE_CURL
-ItemFragment_0x7e0e4:
- itemfragment DRAGON_SCALE
+MountMortar2FInsideDragonScale:
+ itemball DRAGON_SCALE
-ItemFragment_0x7e0e6:
- itemfragment ELIXER
+MountMortar2FInsideElixer:
+ itemball ELIXER
-ItemFragment_0x7e0e8:
- itemfragment ESCAPE_ROPE
+MountMortar2FInsideEscapeRope:
+ itemball ESCAPE_ROPE
MapMountMortar2FInsideSignpostItem0:
dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
@@ -85,10 +85,10 @@
.PersonEvents:
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, 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, 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, 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, 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, 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, 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_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_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_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_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_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
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -56,20 +56,20 @@
MountMortarB1FBoulder:
jumpstd strengthboulder
-ItemFragment_0x7e240:
- itemfragment HYPER_POTION
+MountMortarB1FHyperPotion:
+ itemball HYPER_POTION
-ItemFragment_0x7e242:
- itemfragment CARBOS
+MountMortarB1FCarbos:
+ itemball CARBOS
-ItemFragment_0x7e244:
- itemfragment FULL_RESTORE
+MountMortarB1FFullRestore:
+ itemball FULL_RESTORE
-ItemFragment_0x7e246:
- itemfragment MAX_ETHER
+MountMortarB1FMaxEther:
+ itemball MAX_ETHER
-ItemFragment_0x7e248:
- itemfragment PP_UP
+MountMortarB1FPPUp:
+ itemball PP_UP
MapMountMortarB1FSignpostItem0:
dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
@@ -153,10 +153,10 @@
.PersonEvents:
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, 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, 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_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_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, 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, 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, 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_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_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -298,11 +298,11 @@
MapNationalParkSignpost3Script:
jumptext UnknownText_0x5c7c6
-ItemFragment_0x5c1cc:
- itemfragment PARLYZ_HEAL
+NationalParkParlyzHeal:
+ itemball PARLYZ_HEAL
-ItemFragment_0x5c1ce:
- itemfragment TM_DIG
+NationalParkTMDig:
+ itemball TM_DIG
MapNationalParkSignpostItem2:
dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
@@ -548,6 +548,6 @@
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_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_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
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -108,11 +108,11 @@
MapNationalParkBugContestSignpost3Script:
jumptext UnknownText_0x5cc1d
-ItemFragment_0x5c945:
- itemfragment PARLYZ_HEAL
+NationalParkBugContestParlyzHeal:
+ itemball PARLYZ_HEAL
-ItemFragment_0x5c947:
- itemfragment TM_DIG
+NationalParkBugContestTMDig:
+ itemball TM_DIG
MapNationalParkBugContestSignpostItem2:
dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
@@ -254,5 +254,5 @@
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, 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, 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, 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_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -11,7 +11,7 @@
.MapCallbacks:
db 0
-UnknownScript_0x19b3c7:
+.DummyTrigger:
end
Oak:
@@ -27,7 +27,7 @@
.CheckBadges
checkcode VAR_BADGES
if_equal 16, .OpenMtSilver
- if_equal 8, .Complain
+ if_equal 8, .Complain
jump .AhGood
.CheckPokedex
@@ -55,14 +55,14 @@
buttonsound
jump .CheckPokedex
-ScientistScript_0x19b40f:
- jumptextfaceplayer UnknownText_0x19b7fb
+OaksAssistant1Script:
+ jumptextfaceplayer OaksAssistant1Text
-ScientistScript_0x19b412:
- jumptextfaceplayer UnknownText_0x19b859
+OaksAssistant2Script:
+ jumptextfaceplayer OaksAssistant2Text
-ScientistScript_0x19b415:
- jumptextfaceplayer UnknownText_0x19b8a7
+OaksAssistant3Script:
+ jumptextfaceplayer OaksAssistant3Text
OaksLabBookshelf:
jumpstd difficultbookshelf
@@ -184,7 +184,7 @@
line "<PLAY_G>!"
done
-UnknownText_0x19b7fb:
+OaksAssistant1Text:
text "The PROF's #MON"
line "TALK radio program"
@@ -195,7 +195,7 @@
line "like to hear it."
done
-UnknownText_0x19b859:
+OaksAssistant2Text:
text "Thanks to your"
line "work on the #-"
cont "DEX, the PROF's"
@@ -204,7 +204,7 @@
line "along great."
done
-UnknownText_0x19b8a7:
+OaksAssistant3Text:
text "Don't tell anyone,"
line "but PROF.OAK'S"
@@ -290,6 +290,6 @@
.PersonEvents:
db 4
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, 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, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x19b415, -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, OaksAssistant2Script, -1
+ person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant3Script, -1
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -44,8 +44,8 @@
closetext
end
-ItemFragment_0x5b279:
- itemfragment ETHER
+OlivineLighthouse3FEther:
+ itemball ETHER
Bird_keeperTheoSeenText:
text "Why are you here?"
@@ -139,4 +139,4 @@
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_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
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -34,14 +34,14 @@
closetext
end
-ItemFragment_0x609aa:
- itemfragment RARE_CANDY
+OlivineLighthouse5FRareCandy:
+ itemball RARE_CANDY
-ItemFragment_0x609ac:
- itemfragment SUPER_REPEL
+OlivineLighthouse5FSuperRepel:
+ itemball SUPER_REPEL
-ItemFragment_0x609ae:
- itemfragment TM_SWAGGER
+OlivineLighthouse5FTMSwagger:
+ itemball TM_SWAGGER
MapOlivineLighthouse5FSignpostItem0:
dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION
@@ -116,6 +116,6 @@
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_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, 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, 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, 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_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_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -127,8 +127,8 @@
special FadeInPalettes
end
-ItemFragment_0x60c66:
- itemfragment SUPER_POTION
+OlivineLighthouse6FSuperPotion:
+ itemball SUPER_POTION
MovementData_0x60c68:
slow_step_up
@@ -277,4 +277,4 @@
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_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
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -143,8 +143,8 @@
Ben:
jumptextfaceplayer BenText
-ItemFragment_0x600fe:
- itemfragment ULTRA_BALL
+RadioTower5FUltraBall:
+ itemball ULTRA_BALL
MapRadioTower5FSignpost0Script:
jumptext SignpostRadioTower5FOffice
@@ -450,4 +450,4 @@
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_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
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -9,11 +9,11 @@
.MapCallbacks:
db 0
-ItemFragment_0x743b5:
- itemfragment ELIXER
+RockTunnel1FElixer:
+ itemball ELIXER
-ItemFragment_0x743b7:
- itemfragment TM_STEEL_WING
+RockTunnel1FTMSteelWing:
+ itemball TM_STEEL_WING
MapRockTunnel1FSignpostItem0:
dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY
@@ -46,5 +46,5 @@
.PersonEvents:
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, 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, 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_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -10,14 +10,14 @@
.MapCallbacks:
db 0
-ItemFragment_0x74409:
- itemfragment IRON
+RockTunnelB1FIron:
+ itemball IRON
-ItemFragment_0x7440b:
- itemfragment PP_UP
+RockTunnelB1FPPUp:
+ itemball PP_UP
-ItemFragment_0x7440d:
- itemfragment REVIVE
+RockTunnelB1FRevive:
+ itemball REVIVE
MapRockTunnelB1FSignpostItem0:
dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
@@ -43,6 +43,6 @@
.PersonEvents:
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, 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, 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, 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_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_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -63,11 +63,11 @@
MapRoute12Signpost1Script:
jumptext UnknownText_0x1a72c1
-ItemFragment_0x1a700b:
- itemfragment CALCIUM
+Route12Calcium:
+ itemball CALCIUM
-ItemFragment_0x1a700d:
- itemfragment NUGGET
+Route12Nugget:
+ itemball NUGGET
MapRoute12SignpostItem2:
dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER
@@ -190,5 +190,5 @@
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, 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, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a700d, EVENT_ROUTE_12_NUGGET
+ 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_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -83,8 +83,8 @@
MapRoute15Signpost0Script:
jumptext UnknownText_0x1aa8e3
-ItemFragment_0x1aa5e4:
- itemfragment PP_UP
+Route15PPUp:
+ itemball PP_UP
TeacherColetteSeenText:
text "Have you forgotten"
@@ -225,4 +225,4 @@
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, 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
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -54,17 +54,17 @@
MapRoute2Signpost1Script:
jumptext UnknownText_0x1ac49f
-ItemFragment_0x1ac2fe:
- itemfragment DIRE_HIT
+Route2DireHit:
+ itemball DIRE_HIT
-ItemFragment_0x1ac300:
- itemfragment MAX_POTION
+Route2MaxPotion:
+ itemball MAX_POTION
-ItemFragment_0x1ac302:
- itemfragment CARBOS
+Route2Carbos:
+ itemball CARBOS
-ItemFragment_0x1ac304:
- itemfragment ELIXER
+Route2Elixer:
+ itemball ELIXER
FruitTreeScript_0x1ac306:
fruittree FRUITTREE_ROUTE_2
@@ -175,8 +175,8 @@
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, 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, 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, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ac302, 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, 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_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
+ 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_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
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -189,8 +189,8 @@
MapRoute25Signpost0Script:
jumptext UnknownText_0x19f567
-ItemFragment_0x19efe3:
- itemfragment PROTEIN
+Route25Protein:
+ itemball PROTEIN
MapRoute25SignpostItem1:
dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION
@@ -462,4 +462,4 @@
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_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
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -251,8 +251,8 @@
FruitTreeScript_0x1a4ec2:
fruittree FRUITTREE_ROUTE_26
-ItemFragment_0x1a4ec4:
- itemfragment MAX_ELIXER
+Route26MaxElixer:
+ itemball MAX_ELIXER
CooltrainermJakeSeenText:
text "I'm making my"
@@ -438,4 +438,4 @@
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_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
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -303,11 +303,11 @@
MapRoute27Signpost0Script:
jumptext UnknownText_0x1a0e7f
-ItemFragment_0x1a0a62:
- itemfragment TM_SOLARBEAM
+Route27TMSolarbeam:
+ itemball TM_SOLARBEAM
-ItemFragment_0x1a0a64:
- itemfragment RARE_CANDY
+Route27RareCandy:
+ itemball RARE_CANDY
MovementData_0x1a0a66:
step_left
@@ -496,6 +496,6 @@
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, 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, 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, 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_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
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -216,8 +216,8 @@
FruitTreeScript_0x1a1089:
fruittree FRUITTREE_ROUTE_29
-ItemFragment_0x1a108b:
- itemfragment POTION
+Route29Potion:
+ itemball POTION
MovementData_0x1a108d:
step_up
@@ -447,4 +447,4 @@
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_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
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -238,8 +238,8 @@
MapRoute30Signpost3Script:
jumptext UnknownText_0x1a1b66
-ItemFragment_0x1a17f5:
- itemfragment ANTIDOTE
+Route30Antidote:
+ itemball ANTIDOTE
FruitTreeScript_0x1a17f7:
fruittree FRUITTREE_ROUTE_30_1
@@ -439,4 +439,4 @@
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_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
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -263,11 +263,11 @@
FruitTreeScript_0x1a55f9:
fruittree FRUITTREE_ROUTE_31
-ItemFragment_0x1a55fb:
- itemfragment POTION
+Route31Potion:
+ itemball POTION
-ItemFragment_0x1a55fd:
- itemfragment POKE_BALL
+Route31PokeBall:
+ itemball POKE_BALL
UnknownText_0x1a55ff:
text "DARK CAVE…"
@@ -444,5 +444,5 @@
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_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, 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, 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_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -492,11 +492,11 @@
closetext
end
-ItemFragment_0x190773:
- itemfragment GREAT_BALL
+Route32GreatBall:
+ itemball GREAT_BALL
-ItemFragment_0x190775:
- itemfragment REPEL
+Route32Repel:
+ itemball REPEL
Route32Sign:
jumptext Route32SignText
@@ -972,7 +972,7 @@
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_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_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
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -487,8 +487,8 @@
MapRoute34Signpost2Script:
jumptext UnknownText_0x78a52
-ItemFragment_0x7832b:
- itemfragment NUGGET
+Route34Nugget:
+ itemball NUGGET
MapRoute34SignpostItem3:
dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY
@@ -802,4 +802,4 @@
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, 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
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -270,8 +270,8 @@
MapRoute35Signpost1Script:
jumptext UnknownText_0x19cf94
-ItemFragment_0x19ca7c:
- itemfragment TM_ROLLOUT
+Route35TMRollout:
+ itemball TM_ROLLOUT
FruitTreeScript_0x19ca7e:
fruittree FRUITTREE_ROUTE_35
@@ -492,4 +492,4 @@
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_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
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -47,8 +47,8 @@
MapRoute4Signpost0Script:
jumptext UnknownText_0x1ae384
-ItemFragment_0x1ae20f:
- itemfragment HP_UP
+Route4HPUp:
+ itemball HP_UP
MapRoute4SignpostItem1:
dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
@@ -142,4 +142,4 @@
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, 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
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -198,11 +198,11 @@
MapRoute42Signpost3Script:
jumptext UnknownText_0x1a95a1
-ItemFragment_0x1a9349:
- itemfragment ULTRA_BALL
+Route42UltraBall:
+ itemball ULTRA_BALL
-ItemFragment_0x1a934b:
- itemfragment SUPER_POTION
+Route42SuperPotion:
+ itemball SUPER_POTION
FruitTreeScript_0x1a934d:
fruittree FRUITTREE_ROUTE_42_1
@@ -353,6 +353,6 @@
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, 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, 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, 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_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
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -324,8 +324,8 @@
FruitTreeScript_0x19d266:
fruittree FRUITTREE_ROUTE_43
-ItemFragment_0x19d268:
- itemfragment MAX_ETHER
+Route43MaxEther:
+ itemball MAX_ETHER
PokemaniacBenSeenText:
text "I love #MON!"
@@ -533,4 +533,4 @@
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_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
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -308,14 +308,14 @@
FruitTreeScript_0x19da40:
fruittree FRUITTREE_ROUTE_44
-ItemFragment_0x19da42:
- itemfragment MAX_REVIVE
+Route44MaxRevive:
+ itemball MAX_REVIVE
-ItemFragment_0x19da44:
- itemfragment ULTRA_BALL
+Route44UltraBall:
+ itemball ULTRA_BALL
-ItemFragment_0x19da46:
- itemfragment MAX_REPEL
+Route44MaxRepel:
+ itemball MAX_REPEL
MapRoute44SignpostItem2:
dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
@@ -534,6 +534,6 @@
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_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, 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, 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, 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_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
+ person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -299,17 +299,17 @@
FruitTreeScript_0x19e294:
fruittree FRUITTREE_ROUTE_45
-ItemFragment_0x19e296:
- itemfragment NUGGET
+Route45Nugget:
+ itemball NUGGET
-ItemFragment_0x19e298:
- itemfragment REVIVE
+Route45Revive:
+ itemball REVIVE
-ItemFragment_0x19e29a:
- itemfragment ELIXER
+Route45Elixer:
+ itemball ELIXER
-ItemFragment_0x19e29c:
- itemfragment MAX_POTION
+Route45MaxPotion:
+ itemball MAX_POTION
MapRoute45SignpostItem1:
dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP
@@ -558,8 +558,8 @@
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_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, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19e298, 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, 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, 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_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
+ 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_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
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -161,8 +161,8 @@
MapRoute46Signpost0Script:
jumptext UnknownText_0x1a99be
-ItemFragment_0x1a978d:
- itemfragment X_SPEED
+Route46XSpeed:
+ itemball X_SPEED
FruitTreeScript_0x1a978f:
fruittree FRUITTREE_ROUTE_46_1
@@ -274,4 +274,4 @@
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, 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
--- a/maps/RuinsofAlphAerodactylItemRoom.asm
+++ b/maps/RuinsofAlphAerodactylItemRoom.asm
@@ -11,17 +11,17 @@
.MapCallbacks:
db 0
-ItemFragment_0x59ab6:
- itemfragment GOLD_BERRY
+RuinsofAlphAerodactylItemRoomGoldBerry:
+ itemball GOLD_BERRY
-ItemFragment_0x59ab8:
- itemfragment MOON_STONE
+RuinsofAlphAerodactylItemRoomMoonStone:
+ itemball MOON_STONE
-ItemFragment_0x59aba:
- itemfragment HEAL_POWDER
+RuinsofAlphAerodactylItemRoomHealPowder:
+ itemball HEAL_POWDER
-ItemFragment_0x59abc:
- itemfragment ENERGY_ROOT
+RuinsofAlphAerodactylItemRoomEnergyRoot:
+ itemball ENERGY_ROOT
MapRuinsofAlphAerodactylItemRoomSignpost1Script:
jumptext UnknownText_0x59ac1
@@ -53,7 +53,7 @@
.PersonEvents:
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, 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, 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, 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, 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_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_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_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
--- a/maps/RuinsofAlphHoOhItemRoom.asm
+++ b/maps/RuinsofAlphHoOhItemRoom.asm
@@ -11,17 +11,17 @@
.MapCallbacks:
db 0
-ItemFragment_0x59918:
- itemfragment GOLD_BERRY
+RuinsofAlphHoOhItemRoomGoldBerry:
+ itemball GOLD_BERRY
-ItemFragment_0x5991a:
- itemfragment MYSTERYBERRY
+RuinsofAlphHoOhItemRoomMysteryberry:
+ itemball MYSTERYBERRY
-ItemFragment_0x5991c:
- itemfragment REVIVAL_HERB
+RuinsofAlphHoOhItemRoomRevivalHerb:
+ itemball REVIVAL_HERB
-ItemFragment_0x5991e:
- itemfragment CHARCOAL
+RuinsofAlphHoOhItemRoomCharcoal:
+ itemball CHARCOAL
MapRuinsofAlphHoOhItemRoomSignpost1Script:
jumptext UnknownText_0x59923
@@ -53,7 +53,7 @@
.PersonEvents:
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, 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, 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, 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, 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_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_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_ITEMBALL, 0, RuinsofAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
--- a/maps/RuinsofAlphKabutoItemRoom.asm
+++ b/maps/RuinsofAlphKabutoItemRoom.asm
@@ -11,17 +11,17 @@
.MapCallbacks:
db 0
-ItemFragment_0x599a2:
- itemfragment BERRY
+RuinsofAlphKabutoItemRoomBerry:
+ itemball BERRY
-ItemFragment_0x599a4:
- itemfragment PSNCUREBERRY
+RuinsofAlphKabutoItemRoomPsncureberry:
+ itemball PSNCUREBERRY
-ItemFragment_0x599a6:
- itemfragment HEAL_POWDER
+RuinsofAlphKabutoItemRoomHealPowder:
+ itemball HEAL_POWDER
-ItemFragment_0x599a8:
- itemfragment ENERGYPOWDER
+RuinsofAlphKabutoItemRoomEnergypowder:
+ itemball ENERGYPOWDER
MapRuinsofAlphKabutoItemRoomSignpost1Script:
jumptext UnknownText_0x599ad
@@ -53,7 +53,7 @@
.PersonEvents:
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, 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, 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, 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, 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_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_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_ITEMBALL, 0, RuinsofAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
--- a/maps/RuinsofAlphOmanyteItemRoom.asm
+++ b/maps/RuinsofAlphOmanyteItemRoom.asm
@@ -11,17 +11,17 @@
.MapCallbacks:
db 0
-ItemFragment_0x59a2c:
- itemfragment MYSTERYBERRY
+RuinsofAlphOmanyteItemRoomMysteryberry:
+ itemball MYSTERYBERRY
-ItemFragment_0x59a2e:
- itemfragment MYSTIC_WATER
+RuinsofAlphOmanyteItemRoomMysticWater:
+ itemball MYSTIC_WATER
-ItemFragment_0x59a30:
- itemfragment STARDUST
+RuinsofAlphOmanyteItemRoomStardust:
+ itemball STARDUST
-ItemFragment_0x59a32:
- itemfragment STAR_PIECE
+RuinsofAlphOmanyteItemRoomStarPiece:
+ itemball STAR_PIECE
MapRuinsofAlphOmanyteItemRoomSignpost1Script:
jumptext UnknownText_0x59a37
@@ -53,7 +53,7 @@
.PersonEvents:
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, 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, 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, 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, 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_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_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_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -9,11 +9,11 @@
.MapCallbacks:
db 0
-ItemFragment_0x18c65e:
- itemfragment MAX_REVIVE
+SilverCaveItemRoomsMaxRevive:
+ itemball MAX_REVIVE
-ItemFragment_0x18c660:
- itemfragment FULL_RESTORE
+SilverCaveItemRoomsFullRestore:
+ itemball FULL_RESTORE
SilverCaveItemRooms_MapEventHeader:
; filler
@@ -32,5 +32,5 @@
.PersonEvents:
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, 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, 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_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -11,17 +11,17 @@
.MapCallbacks:
db 0
-ItemFragment_0x18c554:
- itemfragment MAX_ELIXER
+SilverCaveRoom1MaxElixer:
+ itemball MAX_ELIXER
-ItemFragment_0x18c556:
- itemfragment PROTEIN
+SilverCaveRoom1Protein:
+ itemball PROTEIN
-ItemFragment_0x18c558:
- itemfragment ESCAPE_ROPE
+SilverCaveRoom1EscapeRope:
+ itemball ESCAPE_ROPE
-ItemFragment_0x18c55a:
- itemfragment ULTRA_BALL
+SilverCaveRoom1UltraBall:
+ itemball ULTRA_BALL
MapSilverCaveRoom1SignpostItem0:
dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT
@@ -50,7 +50,7 @@
.PersonEvents:
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, 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, 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, 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, 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_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_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_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -10,14 +10,14 @@
.MapCallbacks:
db 0
-ItemFragment_0x18c5b2:
- itemfragment CALCIUM
+SilverCaveRoom2Calcium:
+ itemball CALCIUM
-ItemFragment_0x18c5b4:
- itemfragment ULTRA_BALL
+SilverCaveRoom2UltraBall:
+ itemball ULTRA_BALL
-ItemFragment_0x18c5b6:
- itemfragment PP_UP
+SilverCaveRoom2PPUp:
+ itemball PP_UP
MapSilverCaveRoom2SignpostItem0:
dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION
@@ -43,6 +43,6 @@
.PersonEvents:
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, 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, 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, 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_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_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -123,8 +123,8 @@
SlowpokeWellB1FBoulder:
jumpstd strengthboulder
-ItemFragment_0x5a6a3:
- itemfragment SUPER_POTION
+SlowpokeWellB1FSuperPotion:
+ itemball SUPER_POTION
KurtSlowpokeWellVictoryMovementData:
step_left
@@ -345,4 +345,4 @@
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_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
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -29,8 +29,8 @@
closetext
end
-ItemFragment_0x5ad28:
- itemfragment TM_RAIN_DANCE
+SlowpokeWellB2FTMRainDance:
+ itemball TM_RAIN_DANCE
UnknownText_0x5ad2a:
text "I'm waiting to see"
@@ -78,4 +78,4 @@
.PersonEvents:
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_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
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -36,8 +36,8 @@
closetext
end
-ItemFragment_0x18451e:
- itemfragment PARLYZ_HEAL
+SproutTower1FParlyzHeal:
+ itemball PARLYZ_HEAL
MapSproutTower1FSignpost1Script:
jumptext UnknownText_0x1846d6
@@ -129,4 +129,4 @@
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_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
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -35,8 +35,8 @@
MapSproutTower2FSignpost0Script:
jumptext UnknownText_0x1848c8
-ItemFragment_0x1847a7:
- itemfragment X_ACCURACY
+SproutTower2FXAccuracy:
+ itemball X_ACCURACY
SageNicoSeenText:
text "However hard we"
@@ -106,4 +106,4 @@
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, 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
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -133,11 +133,11 @@
MapSproutTower3FSignpost5Script:
jumptext UnknownText_0x184f61
-ItemFragment_0x184a19:
- itemfragment POTION
+SproutTower3FPotion:
+ itemball POTION
-ItemFragment_0x184a1b:
- itemfragment ESCAPE_ROPE
+SproutTower3FEscapeRope:
+ itemball ESCAPE_ROPE
MovementData_0x184a1d:
step_up
@@ -358,6 +358,6 @@
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, 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, 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, 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_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
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -535,14 +535,14 @@
closetext
end
-ItemFragment_0x6cac4:
- itemfragment HYPER_POTION
+TeamRocketBaseB1FHyperPotion:
+ itemball HYPER_POTION
-ItemFragment_0x6cac6:
- itemfragment NUGGET
+TeamRocketBaseB1FNugget:
+ itemball NUGGET
-ItemFragment_0x6cac8:
- itemfragment GUARD_SPEC
+TeamRocketBaseB1FGuardSpec:
+ itemball GUARD_SPEC
MapTeamRocketBaseB1FSignpostItem8:
dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE
@@ -797,6 +797,6 @@
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_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, 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, 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, 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_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_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -359,8 +359,8 @@
closetext
end
-ItemFragment_0x6d20d:
- itemfragment TM_THIEF
+TeamRocketBaseB2FTMThief:
+ itemball TM_THIEF
MapTeamRocketBaseB2FSignpostItem22:
dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
@@ -981,4 +981,4 @@
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, 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
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -210,20 +210,20 @@
MapTeamRocketBaseB3FSignpost9Script:
jumpstd teamrocketoath
-ItemFragment_0x6e120:
- itemfragment PROTEIN
+TeamRocketBaseB3FProtein:
+ itemball PROTEIN
-ItemFragment_0x6e122:
- itemfragment X_SPECIAL
+TeamRocketBaseB3FXSpecial:
+ itemball X_SPECIAL
-ItemFragment_0x6e124:
- itemfragment FULL_HEAL
+TeamRocketBaseB3FFullHeal:
+ itemball FULL_HEAL
-ItemFragment_0x6e126:
- itemfragment ICE_HEAL
+TeamRocketBaseB3FIceHeal:
+ itemball ICE_HEAL
-ItemFragment_0x6e128:
- itemfragment ULTRA_BALL
+TeamRocketBaseB3FUltraBall:
+ itemball ULTRA_BALL
MovementData_0x6e12a:
step_right
@@ -612,8 +612,8 @@
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_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, 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, 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, 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, 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, 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_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_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_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_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -8,8 +8,8 @@
.MapCallbacks:
db 0
-ItemFragment_0x185a37:
- itemfragment FULL_HEAL
+TinTower3FFullHeal:
+ itemball FULL_HEAL
TinTower3F_MapEventHeader:
; filler
@@ -28,4 +28,4 @@
.PersonEvents:
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
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -10,14 +10,14 @@
.MapCallbacks:
db 0
-ItemFragment_0x185a58:
- itemfragment ULTRA_BALL
+TinTower4FUltraBall:
+ itemball ULTRA_BALL
-ItemFragment_0x185a5a:
- itemfragment PP_UP
+TinTower4FPPUp:
+ itemball PP_UP
-ItemFragment_0x185a5c:
- itemfragment ESCAPE_ROPE
+TinTower4FEscapeRope:
+ itemball ESCAPE_ROPE
MapTinTower4FSignpostItem0:
dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION
@@ -43,6 +43,6 @@
.PersonEvents:
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, 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, 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, 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_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_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -8,8 +8,8 @@
.MapCallbacks:
db 0
-ItemFragment_0x185aa9:
- itemfragment RARE_CANDY
+TinTower5FRareCandy:
+ itemball RARE_CANDY
MapTinTower5FSignpostItem0:
dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE
@@ -40,4 +40,4 @@
.PersonEvents:
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
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -8,8 +8,8 @@
.MapCallbacks:
db 0
-ItemFragment_0x185ae4:
- itemfragment MAX_POTION
+TinTower6FMaxPotion:
+ itemball MAX_POTION
TinTower6F_MapEventHeader:
; filler
@@ -28,4 +28,4 @@
.PersonEvents:
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
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -8,8 +8,8 @@
.MapCallbacks:
db 0
-ItemFragment_0x185b05:
- itemfragment MAX_REVIVE
+TinTower7FMaxRevive:
+ itemball MAX_REVIVE
TinTower7F_MapEventHeader:
; filler
@@ -31,4 +31,4 @@
.PersonEvents:
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
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -10,14 +10,14 @@
.MapCallbacks:
db 0
-ItemFragment_0x185b35:
- itemfragment NUGGET
+TinTower8FNugget:
+ itemball NUGGET
-ItemFragment_0x185b37:
- itemfragment MAX_ELIXER
+TinTower8FMaxElixer:
+ itemball MAX_ELIXER
-ItemFragment_0x185b39:
- itemfragment FULL_RESTORE
+TinTower8FFullRestore:
+ itemball FULL_RESTORE
TinTower8F_MapEventHeader:
; filler
@@ -40,6 +40,6 @@
.PersonEvents:
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, 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, 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, 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_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_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -8,8 +8,8 @@
.MapCallbacks:
db 0
-ItemFragment_0x185b88:
- itemfragment HP_UP
+TinTower9FHPUp:
+ itemball HP_UP
UnknownText_0x185b8a:
text "HO-OH: Shaoooh!"
@@ -41,4 +41,4 @@
.PersonEvents:
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
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -8,8 +8,8 @@
.MapCallbacks:
db 0
-ItemFragment_0x18db02:
- itemfragment MOON_STONE
+TohjoFallsMoonStone:
+ itemball MOON_STONE
TohjoFalls_MapEventHeader:
; filler
@@ -28,4 +28,4 @@
.PersonEvents:
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
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -628,11 +628,11 @@
clearevent EVENT_SWITCH_14
end
-ItemFragment_0x7ce7d:
- itemfragment SMOKE_BALL
+UndergroundPathSwitchRoomEntrancesSmokeBall:
+ itemball SMOKE_BALL
-ItemFragment_0x7ce7f:
- itemfragment FULL_HEAL
+UndergroundPathSwitchRoomEntrancesFullHeal:
+ itemball FULL_HEAL
MapUndergroundPathSwitchRoomEntrancesSignpostItem4:
dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
@@ -976,6 +976,6 @@
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_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, 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, 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_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
--- a/maps/UndergroundWarehouse.asm
+++ b/maps/UndergroundWarehouse.asm
@@ -91,14 +91,14 @@
closetext
end
-ItemFragment_0x7d9e4:
- itemfragment MAX_ETHER
+UndergroundWarehouseMaxEther:
+ itemball MAX_ETHER
-ItemFragment_0x7d9e6:
- itemfragment TM_SLEEP_TALK
+UndergroundWarehouseTMSleepTalk:
+ itemball TM_SLEEP_TALK
-ItemFragment_0x7d9e8:
- itemfragment ULTRA_BALL
+UndergroundWarehouseUltraBall:
+ itemball ULTRA_BALL
GruntM24SeenText:
text "How did you get"
@@ -235,6 +235,6 @@
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_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, 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, 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, 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_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_ITEMBALL, 0, UndergroundWarehouseUltraBall, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -71,17 +71,17 @@
closetext
end
-ItemFragment_0x59c00:
- itemfragment GREAT_BALL
+UnionCave1FGreatBall:
+ itemball GREAT_BALL
-ItemFragment_0x59c02:
- itemfragment X_ATTACK
+UnionCave1FXAttack:
+ itemball X_ATTACK
-ItemFragment_0x59c04:
- itemfragment POTION
+UnionCave1FPotion:
+ itemball POTION
-ItemFragment_0x59c06:
- itemfragment AWAKENING
+UnionCave1FAwakening:
+ itemball AWAKENING
UnknownScript_0x59c08:
jumptext UnknownText_0x59f29
@@ -223,7 +223,7 @@
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, 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, 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, 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, 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, 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_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_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION
+ person_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -58,11 +58,11 @@
closetext
end
-ItemFragment_0x5a016:
- itemfragment TM_SWIFT
+UnionCaveB1FTMSwift:
+ itemball TM_SWIFT
-ItemFragment_0x5a018:
- itemfragment X_DEFEND
+UnionCaveB1FXDefend:
+ itemball X_DEFEND
UnionCaveB1FBoulder:
jumpstd strengthboulder
@@ -176,6 +176,6 @@
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, 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_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
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -73,11 +73,11 @@
closetext
end
-ItemFragment_0x5a36a:
- itemfragment ELIXER
+UnionCaveB2FElixer:
+ itemball ELIXER
-ItemFragment_0x5a36c:
- itemfragment HYPER_POTION
+UnionCaveB2FHyperPotion:
+ itemball HYPER_POTION
CooltrainermNickSeenText:
text "There are two"
@@ -163,6 +163,6 @@
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, 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, 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, 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_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
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -98,20 +98,20 @@
closetext
end
-ItemFragment_0x74529:
- itemfragment TM_EARTHQUAKE
+VictoryRoadTMEarthquake:
+ itemball TM_EARTHQUAKE
-ItemFragment_0x7452b:
- itemfragment MAX_REVIVE
+VictoryRoadMaxRevive:
+ itemball MAX_REVIVE
-ItemFragment_0x7452d:
- itemfragment FULL_RESTORE
+VictoryRoadFullRestore:
+ itemball FULL_RESTORE
-ItemFragment_0x7452f:
- itemfragment FULL_HEAL
+VictoryRoadFullHeal:
+ itemball FULL_HEAL
-ItemFragment_0x74531:
- itemfragment HP_UP
+VictoryRoadHPUp:
+ itemball HP_UP
MapVictoryRoadSignpostItem0:
dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION
@@ -272,8 +272,8 @@
.PersonEvents:
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_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, 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, 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, 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, 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, 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_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
+ 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_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL
+ person_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -90,11 +90,11 @@
VioletCityMartSign:
jumpstd martsign
-ItemFragment_0x1a8421:
- itemfragment PP_UP
+VioletCityPPUp:
+ itemball PP_UP
-ItemFragment_0x1a8423:
- itemfragment RARE_CANDY
+VioletCityRareCandy:
+ itemball RARE_CANDY
FruitTreeScript_0x1a8425:
fruittree FRUITTREE_VIOLET_CITY
@@ -317,5 +317,5 @@
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_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, 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, 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_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -407,8 +407,8 @@
closetext
end
-ItemFragment_0x7c306:
- itemfragment COIN_CASE
+WarehouseEntranceCoinCase:
+ itemball COIN_CASE
MapWarehouseEntranceSignpost1Script:
jumptext UnknownText_0x7c91a
@@ -684,7 +684,7 @@
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, 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_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
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -13,20 +13,20 @@
.MapCallbacks:
db 0
-ItemFragment_0x18c410:
- itemfragment FULL_RESTORE
+WhirlIslandB1FFullRestore:
+ itemball FULL_RESTORE
-ItemFragment_0x18c412:
- itemfragment CARBOS
+WhirlIslandB1FCarbos:
+ itemball CARBOS
-ItemFragment_0x18c414:
- itemfragment CALCIUM
+WhirlIslandB1FCalcium:
+ itemball CALCIUM
-ItemFragment_0x18c416:
- itemfragment NUGGET
+WhirlIslandB1FNugget:
+ itemball NUGGET
-ItemFragment_0x18c418:
- itemfragment ESCAPE_ROPE
+WhirlIslandB1FEscapeRope:
+ itemball ESCAPE_ROPE
WhirlIslandB1FBoulder:
jumpstd strengthboulder
@@ -70,9 +70,9 @@
.PersonEvents:
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, 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, 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, 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, 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, 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_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
+ 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_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET
+ 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
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -10,14 +10,14 @@
.MapCallbacks:
db 0
-ItemFragment_0x18c4b8:
- itemfragment FULL_RESTORE
+WhirlIslandB2FFullRestore:
+ itemball FULL_RESTORE
-ItemFragment_0x18c4ba:
- itemfragment MAX_REVIVE
+WhirlIslandB2FMaxRevive:
+ itemball MAX_REVIVE
-ItemFragment_0x18c4bc:
- itemfragment MAX_ELIXER
+WhirlIslandB2FMaxElixer:
+ itemball MAX_ELIXER
WhirlIslandB2F_MapEventHeader:
; filler
@@ -38,6 +38,6 @@
.PersonEvents:
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, 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, 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, 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_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_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -8,8 +8,8 @@
.MapCallbacks:
db 0
-ItemFragment_0x18c396:
- itemfragment ULTRA_BALL
+WhirlIslandNEUltraBall:
+ itemball ULTRA_BALL
WhirlIslandNE_MapEventHeader:
; filler
@@ -29,4 +29,4 @@
.PersonEvents:
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
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -8,8 +8,8 @@
.MapCallbacks:
db 0
-ItemFragment_0x18c3bc:
- itemfragment ULTRA_BALL
+WhirlIslandSWUltraBall:
+ itemball ULTRA_BALL
WhirlIslandSW_MapEventHeader:
; filler
@@ -31,4 +31,4 @@
.PersonEvents:
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