pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

No more ItemFragment

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

2
constants/map_constants.asm
View File

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

4
engine/events.asm
View File

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

4
engine/movement.asm
View File

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

2
event/halloffame.asm
View File

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

2
home/map.asm
View File

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

5
home/mobile.asm
View File

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

8
items/item_effects.asm
View File

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

8
macros/map.asm
View File

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

5
macros/movement.asm
View File

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

42
maps/BattleTowerOutside.asm
View File

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

226
maps/BillsHouse.asm
View File

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

94
maps/BlackthornCity.asm
View File

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

67
maps/BlackthornGym1F.asm
View File

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

22
maps/BlackthornGym2F.asm
View File

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

32
maps/BurnedTower1F.asm
View File

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

6
maps/BurnedTowerB1F.asm
View File

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

131
maps/CherrygroveCity.asm
View File

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

12
maps/DarkCaveBlackthornEntrance.asm
View File

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

24
maps/DarkCaveVioletEntrance.asm
View File

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

12
maps/DragonsDenB1F.asm
View File

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

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