dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #241 from GriffinRichards/doc-viridian

Browse Source 
Document Viridian City scripts and adjacent routes
This commit is contained in:
PikalaxALT
2020-01-26 15:32:39 -05:00
committed by GitHub
parent 905912e278 97d2555fad
commit a2c6174ee9
63 changed files with 853 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+4 -4
View File
@@ -652,7 +652,7 @@
.4byte \pointer2 @ text
.4byte \pointer3 @ text
.4byte \pointer4 @ event script
.elseif \type == TRAINER_BATTLE_TUTORIAL
.elseif \type == TRAINER_BATTLE_EARLY_RIVAL
.4byte \pointer1 @ text
.4byte \pointer2 @ text
.endif
@@ -699,9 +699,9 @@
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, \trainer, 0, \lose_text
.endm
@
.macro trainerbattle_tutorial trainer:req, unk:req, intro_text:req, lose_text:req
trainerbattle TRAINER_BATTLE_TUTORIAL, \trainer, \unk, \intro_text, \lose_text
@ Starts a trainer battle with victory text if the player loses. If flags is nonzero, the player will be healed after battle (and its assumed to be the tutorial battle)
.macro trainerbattle_earlyrival trainer:req, flags:req, defeat_text:req, victory_text:req
trainerbattle TRAINER_BATTLE_EARLY_RIVAL, \trainer, \flags, \defeat_text, \victory_text
.endm
@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes.
data/event_scripts.s
+4 -31
View File
@@ -637,6 +637,8 @@ gStdScriptsEnd::
.include "data/maps/Route18/text.inc"
.include "data/maps/Route19/text.inc"
.include "data/maps/Route20/text.inc"
.include "data/maps/Route21_North/text.inc"
.include "data/maps/Route21_South/text.inc"
.include "data/maps/Route22/text.inc"
.include "data/maps/Route23/text.inc"
.include "data/maps/Route24/text.inc"
@@ -941,23 +943,7 @@ Text_DugUpItemFromGround:: @ 81A5700
.string "from deep in the ground.$"
.include "data/text/route23.inc"
Text_1A58A7:: @ 81A58A7
.string "Let's see…\n"
.string "Uh-oh! You have caught only\l"
.string "{STR_VAR_3} kinds of POKéMON!\p"
.string "You need {STR_VAR_1} kinds\n"
.string "if you want the {STR_VAR_2}.$"
Text_1A5909:: @ 81A5909
.string "…Oh. I see.\p"
.string "When you get {STR_VAR_1} kinds of POKéMON,\n"
.string "come back for the {STR_VAR_2}.$"
Text_1A594D:: @ 81A594D
.string "Oh! I see you don't have any\n"
.string "room for the {STR_VAR_2}.$"
.include "data/text/aide.inc"
.include "data/text/ingame_trade.inc"
Text_CardKeyOpenedDoor:: @ 81A5B88
@@ -1425,20 +1411,7 @@ EventScript_1A7AB9:: @ 81A7AB9
special Special_GetElevatorFloor
return
EventScript_1A7ABD:: @ 81A7ABD
msgbox Text_1A58A7
release
end
EventScript_1A7AC7:: @ 81A7AC7
msgbox Text_1A594D
release
end
EventScript_1A7AD1:: @ 81A7AD1
msgbox Text_1A5909
release
end
.include "data/scripts/aide.inc"
gUnknown_81A7ADB:: @ 81A7ADB
special sub_80CADC4
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+3 -3
View File
@@ -346,7 +346,7 @@ EventScript_16939C:: @ 816939C
end
EventScript_1693AC:: @ 81693AC
trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
goto EventScript_1694C2
end
@@ -402,7 +402,7 @@ EventScript_169414:: @ 8169414
end
EventScript_169424:: @ 8169424
trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
goto EventScript_1694C2
end
@@ -461,7 +461,7 @@ EventScript_16948F:: @ 816948F
end
EventScript_16949F:: @ 816949F
trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
goto EventScript_1694C2
end
data/maps/PalletTown_ProfessorOaksLab/text.inc
+2 -1
View File
@@ -36,7 +36,8 @@ Text_18DDEA:: @ 818DDEA
.string "Unbelievable!\l"
.string "I picked the wrong POKéMON!$"
Text_18DE1A:: @ 818DE1A
@ Also used for early Route 22 battle
Text_RivalVictory:: @ 818DE1A
.string "{RIVAL}: Yeah!\n"
.string "Am I great or what?$"
data/maps/Route1/map.json
+3 -3
View File
@@ -34,7 +34,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route1_EventScript_167EFE",
"script": "Route1_EventScript_MartClerk",
"flag": "0"
},
{
@@ -47,7 +47,7 @@
"movement_range_y": 3,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route1_EventScript_167F52",
"script": "Route1_EventScript_Boy",
"flag": "0"
}
],
@@ -59,7 +59,7 @@
"x": 9,
"y": 31,
"elevation": 0,
"script": "Route1_EventScript_167F5B"
"script": "Route1_EventScript_RouteSign"
}
]
}
data/maps/Route1/scripts.inc
+10 -10
View File
@@ -1,11 +1,11 @@
Route1_MapScripts:: @ 8167EFD
.byte 0
Route1_EventScript_167EFE:: @ 8167EFE
Route1_EventScript_MartClerk:: @ 8167EFE
lock
faceplayer
goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, EventScript_167F48
msgbox gUnknown_818329D
goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, Route1_EventScript_AlreadyGotPotion
msgbox Route1_Text_WorkAtPokeMartTakeSample
textcolor 3
checkitemspace ITEM_POTION, 1
compare VAR_RESULT, FALSE
@@ -16,21 +16,21 @@ Route1_EventScript_167EFE:: @ 8167EFE
waitmessage
waitfanfare
additem ITEM_POTION
msgbox gUnknown_8183387
msgbox Route1_Text_PutPotionAway
call EventScript_1A6675
setflag FLAG_GOT_POTION_ON_ROUTE_1
release
end
EventScript_167F48:: @ 8167F48
msgbox gUnknown_8183347
Route1_EventScript_AlreadyGotPotion:: @ 8167F48
msgbox Route1_Text_ComeSeeUsIfYouNeedPokeBalls
release
end
Route1_EventScript_167F52:: @ 8167F52
msgbox gUnknown_81833B9, MSGBOX_NPC
Route1_EventScript_Boy:: @ 8167F52
msgbox Route1_Text_CanJumpFromLedges, MSGBOX_NPC
end
Route1_EventScript_167F5B:: @ 8167F5B
msgbox gUnknown_818343A, MSGBOX_SIGN
Route1_EventScript_RouteSign:: @ 8167F5B
msgbox Route1_Text_RouteSign, MSGBOX_SIGN
end
data/maps/Route1/text.inc
+5 -5
View File
@@ -1,4 +1,4 @@
gUnknown_818329D:: @ 818329D
Route1_Text_WorkAtPokeMartTakeSample:: @ 818329D
.string "Hi!\n"
.string "I work at a POKéMON MART.\p"
.string "It's part of a convenient chain\n"
@@ -7,22 +7,22 @@ gUnknown_818329D:: @ 818329D
.string "I know, I'll give you a sample.\n"
.string "Here you go!$"
gUnknown_8183347:: @ 8183347
Route1_Text_ComeSeeUsIfYouNeedPokeBalls:: @ 8183347
.string "Please come see us if you need\n"
.string "POKé BALLS for catching POKéMON.$"
gUnknown_8183387:: @ 8183387
Route1_Text_PutPotionAway:: @ 8183387
.string "{PLAYER} put the POTION away in\n"
.string "the BAG's ITEMS POCKET.$"
gUnknown_81833B9:: @ 81833B9
Route1_Text_CanJumpFromLedges:: @ 81833B9
.string "See those ledges along the road?\p"
.string "It's a bit scary, but you can jump\n"
.string "from them.\p"
.string "You can get back to PALLET TOWN\n"
.string "quicker that way.$"
gUnknown_818343A:: @ 818343A
Route1_Text_RouteSign:: @ 818343A
.string "ROUTE 1\n"
.string "PALLET TOWN - VIRIDIAN CITY$"
data/maps/Route10_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -34,17 +34,17 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7
msgbox gUnknown_819E5FB, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7AD1
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_16FCF1
compare VAR_0x8006, 20
goto_if_lt EventScript_1A7ABD
goto_if_lt Aide_EventScript_HaventCaughtEnough
msgbox gUnknown_819E733
checkitemspace ITEM_EVERSTONE, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
goto_if_eq Aide_EventScript_NoRoomForItem
giveitem_msg gUnknown_819E786, ITEM_EVERSTONE
setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
msgbox gUnknown_819E7AF
data/maps/Route11_EastEntrance_2F/scripts.inc
+3 -3
View File
@@ -61,17 +61,17 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A
msgbox gUnknown_819E9E5, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7AD1
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_16FE64
compare VAR_0x8006, 30
goto_if_lt EventScript_1A7ABD
goto_if_lt Aide_EventScript_HaventCaughtEnough
msgbox gUnknown_819EAE4
checkitemspace ITEM_ITEMFINDER, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
goto_if_eq Aide_EventScript_NoRoomForItem
giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER
setflag FLAG_GOT_ITEMFINDER
msgbox gUnknown_819EB59
data/maps/Route15_WestEntrance_2F/scripts.inc
+3 -3
View File
@@ -24,17 +24,17 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B
msgbox gUnknown_819F5AB, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7AD1
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_170145
compare VAR_0x8006, 50
goto_if_lt EventScript_1A7ABD
goto_if_lt Aide_EventScript_HaventCaughtEnough
msgbox gUnknown_819F6AA
checkitemspace ITEM_EXP_SHARE, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
goto_if_eq Aide_EventScript_NoRoomForItem
giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE
setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE
msgbox gUnknown_819F71F
data/maps/Route16_NorthEntrance_2F/scripts.inc
+3 -3
View File
@@ -24,17 +24,17 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365
msgbox gUnknown_819FB0E, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7AD1
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_17036F
compare VAR_0x8006, 40
goto_if_lt EventScript_1A7ABD
goto_if_lt Aide_EventScript_HaventCaughtEnough
msgbox gUnknown_819FC15
checkitemspace ITEM_AMULET_COIN, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
goto_if_eq Aide_EventScript_NoRoomForItem
giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN
setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
msgbox gUnknown_819FC93
data/maps/Route2/map.json
+2 -2
View File
@@ -195,14 +195,14 @@
"x": 14,
"y": 12,
"elevation": 0,
"script": "Route2_EventScript_167F6E"
"script": "Route2_EventScript_DiglettsCaveSign"
},
{
"type": "bg_event_type_0",
"x": 7,
"y": 73,
"elevation": 0,
"script": "Route2_EventScript_167F65"
"script": "Route2_EventScript_RouteSign"
}
]
}
data/maps/Route2/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
Route2_MapScripts:: @ 8167F64
.byte 0
Route2_EventScript_167F65:: @ 8167F65
msgbox gUnknown_818345E, MSGBOX_SIGN
Route2_EventScript_RouteSign:: @ 8167F65
msgbox Route2_Text_RouteSign, MSGBOX_SIGN
end
Route2_EventScript_167F6E:: @ 8167F6E
msgbox gUnknown_8183482, MSGBOX_SIGN
Route2_EventScript_DiglettsCaveSign:: @ 8167F6E
msgbox Route2_Text_DiglettsCave, MSGBOX_SIGN
end
data/maps/Route2/text.inc
+2 -2
View File
@@ -1,7 +1,7 @@
gUnknown_818345E:: @ 818345E
Route2_Text_RouteSign:: @ 818345E
.string "ROUTE 2\n"
.string "VIRIDIAN CITY - PEWTER CITY$"
gUnknown_8183482:: @ 8183482
Route2_Text_DiglettsCave:: @ 8183482
.string "DIGLETT'S CAVE$"
data/maps/Route21_North/text.inc
+48
View File
@@ -0,0 +1,48 @@
Text_1882E1:: @ 81882E1
.string "Strong TRAINERS and WATER POKéMON\n"
.string "are common sights in these parts.\p"
.string "They say that MISTY of the\n"
.string "CERULEAN GYM trains here.$"
Text_18835A:: @ 818835A
.string "You want to know if the fish are\n"
.string "biting?$"
Text_188383:: @ 8188383
.string "Dang!$"
Text_188389:: @ 8188389
.string "I can't catch anything good.\n"
.string "Not one good POKéMON to be had!$"
Text_1883C6:: @ 81883C6
.string "I got a big haul!\n"
.string "Wanna go for it?$"
Text_1883E9:: @ 81883E9
.string "Heheh, MAGIKARP just don't make\n"
.string "the grade, do they?$"
Text_18841D:: @ 818841D
.string "I seem to only catch MAGIKARP!$"
Text_18843C:: @ 818843C
.string "The sea cleanses my body and soul!$"
Text_18845F:: @ 818845F
.string "Ayah!$"
Text_188465:: @ 8188465
.string "The sea is great and all, but I\n"
.string "like the mountains, too.$"
Text_18849E:: @ 818849E
.string "おれだって　たまには\n"
.string "およぎに　くるぜ！$"
Text_1884B3:: @ 81884B3
.string "ぐわわ！$"
Text_1884B8:: @ 81884B8
.string "うきやすそう　だと？\n"
.string "うるせー　おおきな　おせわだッ！$"
data/maps/Route21_South/text.inc
+87
View File
@@ -0,0 +1,87 @@
Text_1884D4:: @ 81884D4
.string "I caught my POKéMON at sea.$"
Text_1884F0:: @ 81884F0
.string "Diver!!\n"
.string "Down!!$"
Text_1884FF:: @ 81884FF
.string "Where'd you catch your POKéMON?$"
Text_18851F:: @ 818851F
.string "Right now, I'm in a triathlon meet.$"
Text_188543:: @ 8188543
.string "Pant…\n"
.string "Pant… Pant…$"
Text_188555:: @ 8188555
.string "I'm beat! But, I still have the\n"
.string "bike race and marathon left!$"
Text_188592:: @ 8188592
.string "Ahh!\n"
.string "Feel the sun and the wind!$"
Text_1885B2:: @ 81885B2
.string "Yow!\n"
.string "I lost!$"
Text_1885BF:: @ 81885BF
.string "I'm sunburnt to a crisp!$"
Text_1885D8:: @ 81885D8
.string "Hey, don't scare away the fish!$"
Text_1885F8:: @ 81885F8
.string "Sorry! I'm just so frustrated from\n"
.string "not catching anything.$"
Text_188632:: @ 8188632
.string "Sheesh, I haven't caught a thing.\n"
.string "Could this place actually be a\l"
.string "giant pool or something?$"
Text_18868C:: @ 818868C
.string "Keep me company till I get a hit.$"
Text_1886AE:: @ 81886AE
.string "That burned some time.$"
Text_1886C5:: @ 81886C5
.string "Oh wait!\n"
.string "I got a bite! Yeah!$"
Text_1886E2:: @ 81886E2
.string "LIL: Huh? A battle?\n"
.string "IAN, can't you do it alone?$"
Text_188712:: @ 8188712
.string "LIL: Oh, see?\n"
.string "We lost. Happy now?$"
Text_188734:: @ 8188734
.string "LIL: I'm tired.\n"
.string "Can't we go home already?$"
Text_18875E:: @ 818875E
.string "LIL: Huh? A battle?\n"
.string "I can't be bothered to do it alone.\l"
.string "Bring two POKéMON, won't you?$"
Text_1887B4:: @ 81887B4
.string "IAN: My sis doesn't get enough\n"
.string "exercise, so I made her come.$"
Text_1887F1:: @ 81887F1
.string "IAN: Awww, Sis!\n"
.string "Get it together!$"
Text_188812:: @ 8188812
.string "IAN: Come on, Sis!\p"
.string "You're not going to lose weight\n"
.string "like this!$"
Text_188850:: @ 8188850
.string "IAN: We want a two-on-two battle.\n"
.string "So can you bring two POKéMON?$"
data/maps/Route22/map.json
+7 -7
View File
@@ -62,7 +62,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 1,
"script": "Route22_EventScript_16828C"
"script": "Route22_EventScript_EarlyRivalTriggerTop"
},
{
"type": "trigger",
@@ -71,7 +71,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 1,
"script": "Route22_EventScript_168298"
"script": "Route22_EventScript_EarlyRivalTriggerMid"
},
{
"type": "trigger",
@@ -80,7 +80,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 1,
"script": "Route22_EventScript_1682AB"
"script": "Route22_EventScript_EarlyRivalTriggerBottom"
},
{
"type": "trigger",
@@ -89,7 +89,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 3,
"script": "Route22_EventScript_1683ED"
"script": "Route22_EventScript_LateRivalTriggerTop"
},
{
"type": "trigger",
@@ -98,7 +98,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 3,
"script": "Route22_EventScript_1683F9"
"script": "Route22_EventScript_LateRivalTriggerMid"
},
{
"type": "trigger",
@@ -107,7 +107,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 3,
"script": "Route22_EventScript_16840C"
"script": "Route22_EventScript_LateRivalTriggerBottom"
}
],
"bg_events": [
@@ -116,7 +116,7 @@
"x": 7,
"y": 12,
"elevation": 0,
"script": "Route22_EventScript_1684E2"
"script": "Route22_EventScript_LeagueGateSign"
}
]
}
data/maps/Route22/scripts.inc
+69 -81
View File
@@ -1,100 +1,94 @@
Route22_MapScripts:: @ 816828B
.byte 0
Route22_EventScript_16828C:: @ 816828C
Route22_EventScript_EarlyRivalTriggerTop:: @ 816828C
lockall
setvar VAR_TEMP_1, 0
goto EventScript_1682BE
EventScript_168297:: @ 8168297
goto Route22_EventScript_EarlyRival
end
Route22_EventScript_168298:: @ 8168298
Route22_EventScript_EarlyRivalTriggerMid:: @ 8168298
lockall
setvar VAR_TEMP_1, 1
setobjectxyperm 1, 25, 5
goto EventScript_1682BE
EventScript_1682AA:: @ 81682AA
goto Route22_EventScript_EarlyRival
end
Route22_EventScript_1682AB:: @ 81682AB
Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB
lockall
setvar VAR_TEMP_1, 2
setobjectxyperm 1, 25, 5
goto EventScript_1682BE
EventScript_1682BD:: @ 81682BD
goto Route22_EventScript_EarlyRival
end
EventScript_1682BE:: @ 81682BE
Route22_EventScript_EarlyRival:: @ 81682BE
textcolor 0
playbgm MUS_RIVAL1, 0
addobject 1
compare VAR_TEMP_1, 0
call_if_eq EventScript_168350
call_if_eq Route22_EventScript_EarlyRivalApproach
compare VAR_TEMP_1, 1
call_if_eq EventScript_168350
call_if_eq Route22_EventScript_EarlyRivalApproach
compare VAR_TEMP_1, 2
call_if_eq EventScript_16835B
call_if_eq Route22_EventScript_EarlyRivalApproachBottom
delay 6
msgbox gUnknown_8188890
msgbox Route22_Text_EarlyRivalIntro
compare VAR_STARTER_MON, 2
call_if_eq EventScript_16836D
call_if_eq Route22_EventScript_EarlyRivalSquirtle
compare VAR_STARTER_MON, 1
call_if_eq EventScript_16837C
call_if_eq Route22_EventScript_EarlyRivalBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq EventScript_16838B
msgbox gUnknown_8188974
call_if_eq Route22_EventScript_EarlyRivalCharmander
msgbox Route22_Text_EarlyRivalPostBattle
closemessage
delay 10
playbgm MUS_RIVAL2, 0
compare VAR_TEMP_1, 0
call_if_eq EventScript_16839A
call_if_eq Route22_EventScript_EarlyRivalExit
compare VAR_TEMP_1, 1
call_if_eq EventScript_16839A
call_if_eq Route22_EventScript_EarlyRivalExit
compare VAR_TEMP_1, 2
call_if_eq EventScript_1683A5
call_if_eq Route22_EventScript_EarlyRivalExitBottom
fadedefaultbgm
removeobject 1
setvar VAR_MAP_SCENE_ROUTE22, 2
releaseall
end
EventScript_168350:: @ 8168350
applymovement 1, Movement_1683D1
Route22_EventScript_EarlyRivalApproach:: @ 8168350
applymovement 1, Route22_Movement_RivalApproach
waitmovement 0
return
EventScript_16835B:: @ 816835B
applymovement 1, Movement_1683D9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
Route22_EventScript_EarlyRivalApproachBottom:: @ 816835B
applymovement 1, Route22_Movement_RivalApproachBottom
applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
waitmovement 0
return
EventScript_16836D:: @ 816836D
trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
Route22_EventScript_EarlyRivalSquirtle:: @ 816836D
trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
return
EventScript_16837C:: @ 816837C
trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
Route22_EventScript_EarlyRivalBulbasaur:: @ 816837C
trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
return
EventScript_16838B:: @ 816838B
trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
Route22_EventScript_EarlyRivalCharmander:: @ 816838B
trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
return
EventScript_16839A:: @ 816839A
applymovement 1, Movement_1683B8
Route22_EventScript_EarlyRivalExit:: @ 816839A
applymovement 1, Route22_Movement_EarlyRivalExit
waitmovement 0
return
EventScript_1683A5:: @ 81683A5
applymovement 1, Movement_1683C5
Route22_EventScript_EarlyRivalExitBottom:: @ 81683A5
applymovement 1, Route22_Movement_EarlyRivalExitBottom
waitmovement 0
return
Movement_1683B0:: @ 8
Route22_Movement_UnusedRivalExit:: @ 8
walk_right
walk_right
walk_right
@@ -104,7 +98,7 @@ Movement_1683B0:: @ 8
walk_right
step_end
Movement_1683B8:: @ 81683B8
Route22_Movement_EarlyRivalExit:: @ 81683B8
walk_down
walk_right
walk_right
@@ -119,7 +113,7 @@ Movement_1683B8:: @ 81683B8
walk_down
step_end
Movement_1683C5:: @ 81683C5
Route22_Movement_EarlyRivalExitBottom:: @ 81683C5
walk_right
walk_right
walk_right
@@ -133,7 +127,7 @@ Movement_1683C5:: @ 81683C5
walk_down
step_end
Movement_1683D1:: @ 81683D1
Route22_Movement_RivalApproach:: @ 81683D1
walk_right
walk_right
walk_right
@@ -143,7 +137,7 @@ Movement_1683D1:: @ 81683D1
walk_right
step_end
Movement_1683D9:: @ 81683D9
Route22_Movement_RivalApproachBottom:: @ 81683D9
walk_right
walk_right
walk_right
@@ -155,7 +149,7 @@ Movement_1683D9:: @ 81683D9
walk_in_place_fastest_down
step_end
Movement_1683E3:: @ 81683E3
Route22_Movement_PlayerFaceRival:: @ 81683E3
delay_16
delay_16
delay_16
@@ -167,55 +161,49 @@ Movement_1683E3:: @ 81683E3
walk_in_place_fastest_up
step_end
Route22_EventScript_1683ED:: @ 81683ED
Route22_EventScript_LateRivalTriggerTop:: @ 81683ED
lockall
setvar VAR_TEMP_1, 0
goto EventScript_16841F
EventScript_1683F8:: @ 81683F8
goto Route22_EventScript_LateRival
end
Route22_EventScript_1683F9:: @ 81683F9
Route22_EventScript_LateRivalTriggerMid:: @ 81683F9
lockall
setvar VAR_TEMP_1, 1
setobjectxyperm 1, 25, 5
goto EventScript_16841F
EventScript_16840B:: @ 816840B
goto Route22_EventScript_LateRival
end
Route22_EventScript_16840C:: @ 816840C
Route22_EventScript_LateRivalTriggerBottom:: @ 816840C
lockall
setvar VAR_TEMP_1, 2
setobjectxyperm 1, 25, 5
goto EventScript_16841F
EventScript_16841E:: @ 816841E
goto Route22_EventScript_LateRival
end
EventScript_16841F:: @ 816841F
Route22_EventScript_LateRival:: @ 816841F
textcolor 0
playbgm MUS_RIVAL1, 0
addobject 1
compare VAR_TEMP_1, 0
call_if_eq EventScript_16849C
call_if_eq Route22_EventScript_LateRivalApproach
compare VAR_TEMP_1, 1
call_if_eq EventScript_16849C
call_if_eq Route22_EventScript_LateRivalApproach
compare VAR_TEMP_1, 2
call_if_eq EventScript_1684A7
msgbox gUnknown_8188A3C
call_if_eq Route22_EventScript_LateRivalApproachBottom
msgbox Route22_Text_LateRivalIntro
setvar VAR_LAST_TALKED, 1
compare VAR_STARTER_MON, 2
call_if_eq EventScript_1684B9
call_if_eq Route22_EventScript_LateRivalSquirtle
compare VAR_STARTER_MON, 1
call_if_eq EventScript_1684C4
call_if_eq Route22_EventScript_LateRivalBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq EventScript_1684CF
msgbox gUnknown_8188B29
call_if_eq Route22_EventScript_LateRivalCharmander
msgbox Route22_Text_LateRivalPostBattle
closemessage
delay 10
playbgm MUS_RIVAL2, 0
applymovement 1, Movement_1684DA
applymovement 1, Route22_Movement_LateRivalExit
waitmovement 0
fadedefaultbgm
removeobject 1
@@ -223,30 +211,30 @@ EventScript_16841F:: @ 816841F
releaseall
end
EventScript_16849C:: @ 816849C
applymovement 1, Movement_1683D1
Route22_EventScript_LateRivalApproach:: @ 816849C
applymovement 1, Route22_Movement_RivalApproach
waitmovement 0
return
EventScript_1684A7:: @ 81684A7
applymovement 1, Movement_1683D9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
Route22_EventScript_LateRivalApproachBottom:: @ 81684A7
applymovement 1, Route22_Movement_RivalApproachBottom
applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
waitmovement 0
return
EventScript_1684B9:: @ 81684B9
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08
Route22_EventScript_LateRivalSquirtle:: @ 81684B9
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Route22_Text_LateRivalDefeat
return
EventScript_1684C4:: @ 81684C4
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08
Route22_EventScript_LateRivalBulbasaur:: @ 81684C4
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Route22_Text_LateRivalDefeat
return
EventScript_1684CF:: @ 81684CF
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08
Route22_EventScript_LateRivalCharmander:: @ 81684CF
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Route22_Text_LateRivalDefeat
return
Movement_1684DA:: @ 81684DA
Route22_Movement_LateRivalExit:: @ 81684DA
walk_left
walk_left
walk_left
@@ -256,6 +244,6 @@ Movement_1684DA:: @ 81684DA
walk_left
step_end
Route22_EventScript_1684E2:: @ 81684E2
msgbox gUnknown_8188BFF, MSGBOX_SIGN
Route22_EventScript_LeagueGateSign:: @ 81684E2
msgbox Route22_Text_LeagueGateSign, MSGBOX_SIGN
end
data/maps/Route22/text.inc
+11 -146
View File
@@ -1,141 +1,4 @@
Text_1882E1:: @ 81882E1
.string "Strong TRAINERS and WATER POKéMON\n"
.string "are common sights in these parts.\p"
.string "They say that MISTY of the\n"
.string "CERULEAN GYM trains here.$"
Text_18835A:: @ 818835A
.string "You want to know if the fish are\n"
.string "biting?$"
Text_188383:: @ 8188383
.string "Dang!$"
Text_188389:: @ 8188389
.string "I can't catch anything good.\n"
.string "Not one good POKéMON to be had!$"
Text_1883C6:: @ 81883C6
.string "I got a big haul!\n"
.string "Wanna go for it?$"
Text_1883E9:: @ 81883E9
.string "Heheh, MAGIKARP just don't make\n"
.string "the grade, do they?$"
Text_18841D:: @ 818841D
.string "I seem to only catch MAGIKARP!$"
Text_18843C:: @ 818843C
.string "The sea cleanses my body and soul!$"
Text_18845F:: @ 818845F
.string "Ayah!$"
Text_188465:: @ 8188465
.string "The sea is great and all, but I\n"
.string "like the mountains, too.$"
Text_18849E:: @ 818849E
.string "おれだって　たまには\n"
.string "およぎに　くるぜ！$"
Text_1884B3:: @ 81884B3
.string "ぐわわ！$"
Text_1884B8:: @ 81884B8
.string "うきやすそう　だと？\n"
.string "うるせー　おおきな　おせわだッ！$"
Text_1884D4:: @ 81884D4
.string "I caught my POKéMON at sea.$"
Text_1884F0:: @ 81884F0
.string "Diver!!\n"
.string "Down!!$"
Text_1884FF:: @ 81884FF
.string "Where'd you catch your POKéMON?$"
Text_18851F:: @ 818851F
.string "Right now, I'm in a triathlon meet.$"
Text_188543:: @ 8188543
.string "Pant…\n"
.string "Pant… Pant…$"
Text_188555:: @ 8188555
.string "I'm beat! But, I still have the\n"
.string "bike race and marathon left!$"
Text_188592:: @ 8188592
.string "Ahh!\n"
.string "Feel the sun and the wind!$"
Text_1885B2:: @ 81885B2
.string "Yow!\n"
.string "I lost!$"
Text_1885BF:: @ 81885BF
.string "I'm sunburnt to a crisp!$"
Text_1885D8:: @ 81885D8
.string "Hey, don't scare away the fish!$"
Text_1885F8:: @ 81885F8
.string "Sorry! I'm just so frustrated from\n"
.string "not catching anything.$"
Text_188632:: @ 8188632
.string "Sheesh, I haven't caught a thing.\n"
.string "Could this place actually be a\l"
.string "giant pool or something?$"
Text_18868C:: @ 818868C
.string "Keep me company till I get a hit.$"
Text_1886AE:: @ 81886AE
.string "That burned some time.$"
Text_1886C5:: @ 81886C5
.string "Oh wait!\n"
.string "I got a bite! Yeah!$"
Text_1886E2:: @ 81886E2
.string "LIL: Huh? A battle?\n"
.string "IAN, can't you do it alone?$"
Text_188712:: @ 8188712
.string "LIL: Oh, see?\n"
.string "We lost. Happy now?$"
Text_188734:: @ 8188734
.string "LIL: I'm tired.\n"
.string "Can't we go home already?$"
Text_18875E:: @ 818875E
.string "LIL: Huh? A battle?\n"
.string "I can't be bothered to do it alone.\l"
.string "Bring two POKéMON, won't you?$"
Text_1887B4:: @ 81887B4
.string "IAN: My sis doesn't get enough\n"
.string "exercise, so I made her come.$"
Text_1887F1:: @ 81887F1
.string "IAN: Awww, Sis!\n"
.string "Get it together!$"
Text_188812:: @ 8188812
.string "IAN: Come on, Sis!\p"
.string "You're not going to lose weight\n"
.string "like this!$"
Text_188850:: @ 8188850
.string "IAN: We want a two-on-two battle.\n"
.string "So can you bring two POKéMON?$"
gUnknown_8188890:: @ 8188890
Route22_Text_EarlyRivalIntro:: @ 8188890
.string "{RIVAL}: Hey! {PLAYER}!\p"
.string "You're off to the POKéMON LEAGUE?\n"
.string "Forget about it!\p"
@@ -146,11 +9,11 @@ gUnknown_8188890:: @ 8188890
.string "By the way, did your POKéMON get\n"
.string "any stronger?$"
Text_188959:: @ 8188959
Route22_Text_EarlyRivalDefeat:: @ 8188959
.string "Awww!\n"
.string "You just lucked out!$"
gUnknown_8188974:: @ 8188974
Route22_Text_EarlyRivalPostBattle:: @ 8188974
.string "I heard the POKéMON LEAGUE is\n"
.string "crawling with tough TRAINERS.\p"
.string "I have to figure out how to get\n"
@@ -158,14 +21,15 @@ gUnknown_8188974:: @ 8188974
.string "You should quit dawdling and get a\n"
.string "move on!$"
Text_188A07:: @ 8188A07
@ Translated in RB as "{RIVAL}: What? Why do I have 2 POKéMON? You should catch some more too!"
Route22_Text_RivalShouldCatchSomeMons:: @ 8188A07
.string "{RIVAL}“なんだ？\n"
.string "ポケモン　2ひきも\l"
.string "もってるの　なぜか　だって？\p"
.string "おまえも\n"
.string "つかまえれば　いい　じゃん！$"
gUnknown_8188A3C:: @ 8188A3C
Route22_Text_LateRivalIntro:: @ 8188A3C
.string "{RIVAL}: What? {PLAYER}!\n"
.string "What a surprise to see you here!\p"
.string "So you're going to the POKéMON\n"
@@ -176,18 +40,19 @@ gUnknown_8188A3C:: @ 8188A3C
.string "warm-up for the POKéMON LEAGUE!\p"
.string "Come on!$"
Text_188B08:: @ 8188B08
Route22_Text_LateRivalDefeat:: @ 8188B08
.string "What!?\p"
.string "I was just careless, you!$"
gUnknown_8188B29:: @ 8188B29
Route22_Text_LateRivalPostBattle:: @ 8188B29
.string "That loosened me up.\n"
.string "I'm ready for the POKéMON LEAGUE!\p"
.string "{PLAYER}, you need more practice.\p"
.string "But hey, you know that!\n"
.string "I'm out of here. Smell ya!$"
Text_188BAF:: @ 8188BAF
@ Translated in RB as "{RIVAL}: Hahaha! {PLAYER}! That's your best? You're nowhere near as good as me, pal! Go train some more! You loser!"
Route22_Text_LateRivalVictory:: @ 8188BAF
.string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n"
.string "それで　がんばってるのかよ！\l"
.string "おれの　さいのうに　くらべりゃ\l"
@@ -195,7 +60,7 @@ Text_188BAF:: @ 8188BAF
.string "もっと　れんしゅう　こいよ！\n"
.string "あははーッ！$"
gUnknown_8188BFF:: @ 8188BFF
Route22_Text_LeagueGateSign:: @ 8188BFF
.string "POKéMON LEAGUE\n"
.string "Front Gate$"
data/maps/Route2_EastBuilding/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_EastBuilding_EventScript_16F67F",
"script": "Route2_EastBuilding_EventScript_Aide",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_EastBuilding_EventScript_16F714",
"script": "Route2_EastBuilding_EventScript_Rocker",
"flag": "0"
}
],
data/maps/Route2_EastBuilding/scripts.inc
+20 -18
View File
@@ -1,40 +1,42 @@
.equ REQUIRED_SEEN_MONS, 10
Route2_EastBuilding_MapScripts:: @ 816F67E
.byte 0
Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
Route2_EastBuilding_EventScript_Aide:: @ 816F67F
lock
faceplayer
call EventScript_16F70B
goto_if_set FLAG_GOT_HM05, EventScript_16F701
msgbox gUnknown_819D64F, MSGBOX_YESNO
call Route2_EastBuilding_EventScript_GetAideRequestInfo
goto_if_set FLAG_GOT_HM05, Route2_EastBuilding_EventScript_AlreadyGotHM05
msgbox Route2_EastBuilding_Text_GiveHM05IfSeen10Mons, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7AD1
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_16F70B
compare VAR_0x8006, 10
goto_if_lt EventScript_1A7ABD
msgbox gUnknown_819D74E
call Route2_EastBuilding_EventScript_GetAideRequestInfo
compare VAR_0x8006, REQUIRED_SEEN_MONS
goto_if_lt Aide_EventScript_HaventCaughtEnough
msgbox Route2_EastBuilding_Text_GreatHereYouGo
checkitemspace ITEM_HM05, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
giveitem_msg gUnknown_819D7A1, ITEM_HM05
goto_if_eq Aide_EventScript_NoRoomForItem
giveitem_msg Route2_EastBuilding_Text_ReceivedHM05FromAide, ITEM_HM05
setflag FLAG_GOT_HM05
msgbox gUnknown_819D7C1
msgbox Route2_EastBuilding_Text_ExplainHM05
release
end
EventScript_16F701:: @ 816F701
msgbox gUnknown_819D7C1
Route2_EastBuilding_EventScript_AlreadyGotHM05:: @ 816F701
msgbox Route2_EastBuilding_Text_ExplainHM05
release
end
EventScript_16F70B:: @ 816F70B
getnumberstring 0, 10
Route2_EastBuilding_EventScript_GetAideRequestInfo:: @ 816F70B
getnumberstring 0, REQUIRED_SEEN_MONS
getitemname 1, ITEM_HM05
return
Route2_EastBuilding_EventScript_16F714:: @ 816F714
msgbox gUnknown_819D81E, MSGBOX_NPC
Route2_EastBuilding_EventScript_Rocker:: @ 816F714
msgbox Route2_EastBuilding_Text_CanGetThroughRockTunnel, MSGBOX_NPC
end
data/maps/Route2_EastBuilding/text.inc
+5 -5
View File
@@ -1,4 +1,4 @@
gUnknown_819D64F:: @ 819D64F
Route2_EastBuilding_Text_GiveHM05IfSeen10Mons:: @ 819D64F
.string "Hi! Remember me?\n"
.string "I'm one of PROF. OAK's AIDES.\p"
.string "If your POKéDEX has complete data\n"
@@ -10,23 +10,23 @@ gUnknown_819D64F:: @ 819D64F
.string "Have you gathered data on at least\n"
.string "ten kinds of POKéMON?$"
gUnknown_819D74E:: @ 819D74E
Route2_EastBuilding_Text_GreatHereYouGo:: @ 819D74E
.string "Great! You have caught or owned\n"
.string "{STR_VAR_3} kinds of POKéMON!\p"
.string "Congratulations!\n"
.string "Here you go!$"
gUnknown_819D7A1:: @ 819D7A1
Route2_EastBuilding_Text_ReceivedHM05FromAide:: @ 819D7A1
.string "{PLAYER} received HM05\n"
.string "from the AIDE.$"
gUnknown_819D7C1:: @ 819D7C1
Route2_EastBuilding_Text_ExplainHM05:: @ 819D7C1
.string "HM05 contains the hidden move\n"
.string "FLASH.\p"
.string "FLASH lights up even the darkest\n"
.string "of caves and dungeons.$"
gUnknown_819D81E:: @ 819D81E
Route2_EastBuilding_Text_CanGetThroughRockTunnel:: @ 819D81E
.string "Once a POKéMON learns FLASH, you\n"
.string "can get through ROCK TUNNEL.$"
data/maps/Route2_House/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_House_EventScript_16F5F9",
"script": "Route2_House_EventScript_Scientist",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_House_EventScript_16F602",
"script": "Route2_House_EventScript_Reyley",
"flag": "0"
}
],
data/maps/Route2_House/scripts.inc
+10 -10
View File
@@ -1,43 +1,43 @@
Route2_House_MapScripts:: @ 816F5F8
.byte 0
Route2_House_EventScript_16F5F9:: @ 816F5F9
msgbox gUnknown_819D5E7, MSGBOX_NPC
Route2_House_EventScript_Scientist:: @ 816F5F9
msgbox Route2_House_Text_FaintedMonsCanUseFieldMoves, MSGBOX_NPC
end
Route2_House_EventScript_16F602:: @ 816F602
Route2_House_EventScript_Reyley:: @ 816F602
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_MR_MIME
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674
goto_if_set FLAG_DID_MIMIEN_TRADE, Route2_House_EventScript_AlreadyTraded
msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16F65C
goto_if_eq Route2_House_EventScript_DeclineTrade
call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16F65C
goto_if_ge Route2_House_EventScript_DeclineTrade
call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16F666
goto_if_ne Route2_House_EventScript_NotRequestedMon
call EventScript_DoInGameTrade
msgbox Trade_Text_HeyThanks
setflag FLAG_DID_MIMIEN_TRADE
release
end
EventScript_16F65C:: @ 816F65C
Route2_House_EventScript_DeclineTrade:: @ 816F65C
msgbox Trade_Text_AwwOhWell
release
end
EventScript_16F666:: @ 816F666
Route2_House_EventScript_NotRequestedMon:: @ 816F666
getspeciesname 0, VAR_0x8009
msgbox Trade_Text_WhatThatsNoMon
release
end
EventScript_16F674:: @ 816F674
Route2_House_EventScript_AlreadyTraded:: @ 816F674
msgbox Trade_Text_IsntMyOldMonGreat
release
end
data/maps/Route2_House/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_819D5E7:: @ 819D5E7
Route2_House_Text_FaintedMonsCanUseFieldMoves:: @ 819D5E7
.string "A fainted POKéMON just has no\n"
.string "energy left to battle.\p"
.string "It can still use moves like CUT\n"
data/maps/Route2_ViridianForest_NorthEntrance/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_ViridianForest_NorthEntrance_EventScript_16F71E",
"script": "Route2_ViridianForest_NorthEntrance_EventScript_Youngster",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_ViridianForest_NorthEntrance_EventScript_16F727",
"script": "Route2_ViridianForest_NorthEntrance_EventScript_OldMan",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_ViridianForest_NorthEntrance_EventScript_16F730",
"script": "Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF",
"flag": "0"
}
],
data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc
+6 -6
View File
@@ -1,14 +1,14 @@
Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D
.byte 0
Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E
msgbox gUnknown_819D85C, MSGBOX_NPC
Route2_ViridianForest_NorthEntrance_EventScript_Youngster:: @ 816F71E
msgbox Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests, MSGBOX_NPC
end
Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727
msgbox gUnknown_819D8D0, MSGBOX_NPC
Route2_ViridianForest_NorthEntrance_EventScript_OldMan:: @ 816F727
msgbox Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees, MSGBOX_NPC
end
Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730
msgbox gUnknown_819D93B, MSGBOX_NPC
Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF:: @ 816F730
msgbox Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution, MSGBOX_NPC
end
data/maps/Route2_ViridianForest_NorthEntrance/text.inc
+3 -3
View File
@@ -1,16 +1,16 @@
gUnknown_819D85C:: @ 819D85C
Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests:: @ 819D85C
.string "Many POKéMON live only in forests \n"
.string "and caves.\p"
.string "You need to be persistent and look\n"
.string "everywhere to get different kinds.$"
gUnknown_819D8D0:: @ 819D8D0
Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees:: @ 819D8D0
.string "Have you noticed the skinny trees\n"
.string "on the roadside?\p"
.string "They can be cut down by a special\n"
.string "POKéMON move, I hear.$"
gUnknown_819D93B:: @ 819D93B
Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution:: @ 819D93B
.string "Do you know the evolution-cancel\n"
.string "technique?\p"
.string "When a POKéMON is evolving, you\n"
data/maps/Route2_ViridianForest_SouthEntrance/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5E6",
"script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman1",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5EF",
"script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman2",
"flag": "0"
}
],
data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5
.byte 0
Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6
msgbox gUnknown_819D52C, MSGBOX_NPC
Route2_ViridianForest_SouthEntrance_EventScript_Woman1:: @ 816F5E6
msgbox Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze, MSGBOX_NPC
end
Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF
msgbox gUnknown_819D58B, MSGBOX_NPC
Route2_ViridianForest_SouthEntrance_EventScript_Woman2:: @ 816F5EF
msgbox Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite, MSGBOX_NPC
end
data/maps/Route2_ViridianForest_SouthEntrance/text.inc
+2 -2
View File
@@ -1,9 +1,9 @@
gUnknown_819D52C:: @ 819D52C
Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze:: @ 819D52C
.string "Are you going to VIRIDIAN FOREST?\n"
.string "It's a natural maze in there.\l"
.string "Be careful you don't get lost.$"
gUnknown_819D58B:: @ 819D58B
Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite:: @ 819D58B
.string "RATTATA may be small, but don't\n"
.string "underestimate its wicked bite.\p"
.string "Have you caught one already?$"
data/maps/ViridianCity/map.json
+14 -14
View File
@@ -65,7 +65,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_EventScript_1659CA",
"script": "ViridianCity_EventScript_OldMan",
"flag": "0"
},
{
@@ -78,7 +78,7 @@
"movement_range_y": 3,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_EventScript_1659F6",
"script": "ViridianCity_EventScript_TutorialOldMan",
"flag": "0"
},
{
@@ -91,7 +91,7 @@
"movement_range_y": 3,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_EventScript_165AC4",
"script": "ViridianCity_EventScript_Woman",
"flag": "0"
},
{
@@ -104,7 +104,7 @@
"movement_range_y": 2,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_EventScript_165A8F",
"script": "ViridianCity_EventScript_Youngster",
"flag": "0"
},
{
@@ -117,7 +117,7 @@
"movement_range_y": 2,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_EventScript_1659C1",
"script": "ViridianCity_EventScript_Boy",
"flag": "0"
},
{
@@ -192,7 +192,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN",
"var_value": 0,
"script": "ViridianCity_EventScript_165AF6"
"script": "ViridianCity_EventScript_RoadBlocked"
},
{
"type": "trigger",
@@ -201,7 +201,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR",
"var_value": 0,
"script": "ViridianCity_EventScript_16596D"
"script": "ViridianCity_EventScript_GymDoorLocked"
},
{
"type": "trigger",
@@ -210,7 +210,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN",
"var_value": 1,
"script": "ViridianCity_EventScript_165B10"
"script": "ViridianCity_EventScript_TutorialTriggerLeft"
},
{
"type": "trigger",
@@ -219,7 +219,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN",
"var_value": 1,
"script": "ViridianCity_EventScript_165B2E"
"script": "ViridianCity_EventScript_TutorialTriggerRight"
}
],
"bg_events": [
@@ -228,35 +228,35 @@
"x": 23,
"y": 1,
"elevation": 3,
"script": "ViridianCity_EventScript_16599D"
"script": "ViridianCity_EventScript_TrainerTips1"
},
{
"type": "bg_event_type_0",
"x": 32,
"y": 10,
"elevation": 0,
"script": "ViridianCity_EventScript_1659AF"
"script": "ViridianCity_EventScript_GymSign"
},
{
"type": "bg_event_type_0",
"x": 20,
"y": 31,
"elevation": 0,
"script": "ViridianCity_EventScript_1659A6"
"script": "ViridianCity_EventScript_TrainerTips2"
},
{
"type": "bg_event_type_0",
"x": 20,
"y": 16,
"elevation": 0,
"script": "ViridianCity_EventScript_165994"
"script": "ViridianCity_EventScript_CitySign"
},
{
"type": "bg_event_type_0",
"x": 36,
"y": 10,
"elevation": 0,
"script": "ViridianCity_EventScript_1659B8"
"script": "ViridianCity_EventScript_GymDoor"
}
]
}
data/maps/ViridianCity/scripts.inc
+87 -82
View File
@@ -1,3 +1,5 @@
.equ LOCALID_TUTORIAL_MAN, 4
ViridianCity_MapScripts:: @ 81658D3
map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition
.byte 0
@@ -5,32 +7,32 @@ ViridianCity_MapScripts:: @ 81658D3
ViridianCity_OnTransition:: @ 81658D9
setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY
compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0
call_if_eq EventScript_165920
call_if_eq ViridianCity_EventScript_SetOldManBlockingRoad
compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1
call_if_eq EventScript_16590F
call_if_eq ViridianCity_EventScript_SetOldManStandingByRoad
compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2
call_if_ge EventScript_165909
call_if_ge ViridianCity_EventScript_SetOldManNormal
compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0
call_if_eq EventScript_165931
call_if_eq ViridianCity_EventScript_TryUnlockGym
end
EventScript_165909:: @ 8165909
ViridianCity_EventScript_SetOldManNormal:: @ 8165909
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1
return
EventScript_16590F:: @ 816590F
ViridianCity_EventScript_SetOldManStandingByRoad:: @ 816590F
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1
setobjectxyperm 4, 21, 8
setobjectmovementtype 4, 1
setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 8
setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_LOOK_AROUND
return
EventScript_165920:: @ 8165920
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_VIRIDIAN_DRUNK
setobjectxyperm 4, 21, 11
setobjectmovementtype 4, 8
ViridianCity_EventScript_SetOldManBlockingRoad:: @ 8165920
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN
setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 11
setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_FACE_DOWN
return
EventScript_165931:: @ 8165931
ViridianCity_EventScript_TryUnlockGym:: @ 8165931
goto_if_unset FLAG_BADGE02_GET, EventScript_Return
goto_if_unset FLAG_BADGE03_GET, EventScript_Return
goto_if_unset FLAG_BADGE04_GET, EventScript_Return
@@ -40,106 +42,109 @@ EventScript_165931:: @ 8165931
setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1
return
ViridianCity_EventScript_16596D:: @ 816596D
ViridianCity_EventScript_GymDoorLocked:: @ 816596D
lockall
textcolor 3
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
msgbox gUnknown_817E2F5
msgbox ViridianCity_Text_GymDoorsAreLocked
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_165992
applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_JumpDownLedge
waitmovement 0
releaseall
end
Movement_165992:: @ 8165992
ViridianCity_Movement_JumpDownLedge:: @ 8165992
jump_2_down
step_end
ViridianCity_EventScript_165994:: @ 8165994
msgbox gUnknown_817E1BB, MSGBOX_SIGN
ViridianCity_EventScript_CitySign:: @ 8165994
msgbox ViridianCity_Text_CitySign, MSGBOX_SIGN
end
ViridianCity_EventScript_16599D:: @ 816599D
msgbox gUnknown_817E1E7, MSGBOX_SIGN
ViridianCity_EventScript_TrainerTips1:: @ 816599D
msgbox ViridianCity_Text_CatchMonsForEasierBattles, MSGBOX_SIGN
end
ViridianCity_EventScript_1659A6:: @ 81659A6
msgbox gUnknown_817E24D, MSGBOX_SIGN
ViridianCity_EventScript_TrainerTips2:: @ 81659A6
msgbox ViridianCity_Text_MovesLimitedByPP, MSGBOX_SIGN
end
ViridianCity_EventScript_1659AF:: @ 81659AF
msgbox gUnknown_817E2DB, MSGBOX_SIGN
ViridianCity_EventScript_GymSign:: @ 81659AF
msgbox ViridianCity_Text_GymSign, MSGBOX_SIGN
end
ViridianCity_EventScript_1659B8:: @ 81659B8
msgbox gUnknown_817E2F5, MSGBOX_SIGN
ViridianCity_EventScript_GymDoor:: @ 81659B8
msgbox ViridianCity_Text_GymDoorsAreLocked, MSGBOX_SIGN
end
ViridianCity_EventScript_1659C1:: @ 81659C1
msgbox gUnknown_817DABB, MSGBOX_NPC
ViridianCity_EventScript_Boy:: @ 81659C1
msgbox ViridianCity_Text_CanCarryMonsAnywhere, MSGBOX_NPC
end
ViridianCity_EventScript_1659CA:: @ 81659CA
@ Other old man, not the tutorial old man
ViridianCity_EventScript_OldMan:: @ 81659CA
lock
faceplayer
compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1
goto_if_eq EventScript_1659EC
msgbox gUnknown_817DB39
goto_if_eq ViridianCity_EventScript_OldManGymLeaderReturned
msgbox ViridianCity_Text_GymClosedWonderWhoLeaderIs
closemessage
applymovement 3, Movement_FaceOriginalDirection
waitmovement 0
release
end
EventScript_1659EC:: @ 81659EC
msgbox gUnknown_817DB78
ViridianCity_EventScript_OldManGymLeaderReturned:: @ 81659EC
msgbox ViridianCity_Text_ViridiansGymLeaderReturned
release
end
ViridianCity_EventScript_1659F6:: @ 81659F6
ViridianCity_EventScript_TutorialOldMan:: @ 81659F6
lock
faceplayer
goto_if_set FLAG_BADGE01_GET, EventScript_165A23
goto_if_set FLAG_BADGE01_GET, ViridianCity_EventScript_AskIfTeachyTVHelpful
compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2
goto_if_ge EventScript_165A4A
goto_if_ge ViridianCity_EventScript_TutorialCompleted
compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1
goto_if_eq EventScript_165A54
goto_if_eq ViridianCity_EventScript_TutorialStart
compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0
goto_if_eq EventScript_165A84
goto_if_eq ViridianCity_EventScript_TutorialNotReady
end
EventScript_165A23:: @ 8165A23
msgbox gUnknown_817E046, MSGBOX_YESNO
ViridianCity_EventScript_AskIfTeachyTVHelpful:: @ 8165A23
msgbox ViridianCity_Text_HowsTeachyTVHelping, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_165A40
msgbox gUnknown_817E0EA
goto_if_eq ViridianCity_EventScript_TeachyTVNotHelpful
msgbox ViridianCity_Text_MyGrandsonOnTheShow
release
end
EventScript_165A40:: @ 8165A40
msgbox gUnknown_817E14E
ViridianCity_EventScript_TeachyTVNotHelpful:: @ 8165A40
msgbox ViridianCity_Text_TooBusyForTeachyTV
release
end
EventScript_165A4A:: @ 8165A4A
msgbox gUnknown_817DF61
ViridianCity_EventScript_TutorialCompleted:: @ 8165A4A
msgbox ViridianCity_Text_WeakenMonsFirstToCatch
release
end
EventScript_165A54:: @ 8165A54
call EventScript_165B4C
ViridianCity_EventScript_TutorialStart:: @ 8165A54
call ViridianCity_EventScript_DoTutorialBattle
release
end
EventScript_165A5B:: @ 8165A5B
msgbox gUnknown_817DEEB
@ Unused
ViridianCity_EventScript_WatchToLearnBasics:: @ 8165A5B
msgbox ViridianCity_Text_WatchThatToLearnBasics
release
end
EventScript_165A65:: @ 8165A65
msgbox gUnknown_817DE9B
@ Unused. Starts battle after the post battle text, which is odd.
ViridianCity_EventScript_TutorialUnused:: @ 8165A65
msgbox ViridianCity_Text_ThatWasEducationalTakeThis
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special ScrSpecial_StartOldManTutorialBattle
@@ -147,43 +152,43 @@ EventScript_165A65:: @ 8165A65
release
end
EventScript_165A84:: @ 8165A84
msgbox gUnknown_817DD03
ViridianCity_EventScript_TutorialNotReady:: @ 8165A84
msgbox ViridianCity_Text_ThisIsPrivateProperty
closemessage
release
end
ViridianCity_EventScript_165A8F:: @ 8165A8F
ViridianCity_EventScript_Youngster:: @ 8165A8F
lock
faceplayer
msgbox gUnknown_817DB98, MSGBOX_YESNO
msgbox ViridianCity_Text_WantToKnowAboutCaterpillarMons, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_165AB0
goto_if_eq ViridianCity_EventScript_YoungsterExplainCaterpillars
compare VAR_RESULT, NO
goto_if_eq EventScript_165ABA
goto_if_eq ViridianCity_EventScript_YoungsterDeclineExplanation
end
EventScript_165AB0:: @ 8165AB0
msgbox gUnknown_817DBE4
ViridianCity_EventScript_YoungsterExplainCaterpillars:: @ 8165AB0
msgbox ViridianCity_Text_ExplainCaterpieWeedle
release
end
EventScript_165ABA:: @ 8165ABA
msgbox gUnknown_817DBD5
ViridianCity_EventScript_YoungsterDeclineExplanation:: @ 8165ABA
msgbox ViridianCity_Text_OhOkayThen
release
end
ViridianCity_EventScript_165AC4:: @ 8165AC4
ViridianCity_EventScript_Woman:: @ 8165AC4
lock
faceplayer
compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0
goto_if_eq EventScript_165ADB
msgbox gUnknown_817DC99
goto_if_eq ViridianCity_EventScript_WomanRoadBlocked
msgbox ViridianCity_Text_GoShoppingInPewterOccasionally
release
end
EventScript_165ADB:: @ 8165ADB
msgbox gUnknown_817DC4E
ViridianCity_EventScript_WomanRoadBlocked:: @ 8165ADB
msgbox ViridianCity_Text_GrandpaHasntHadCoffeeYet
closemessage
applymovement 5, Movement_FaceOriginalDirection
waitmovement 0
@@ -194,44 +199,44 @@ ViridianCity_EventScript_DreamEaterTutor:: @ 8165AF0
goto EventScript_DreamEaterTutor
end
ViridianCity_EventScript_165AF6:: @ 8165AF6
ViridianCity_EventScript_RoadBlocked:: @ 8165AF6
lockall
textcolor 0
msgbox gUnknown_817DD03
msgbox ViridianCity_Text_ThisIsPrivateProperty
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_165B0E
applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_WalkDown
waitmovement 0
releaseall
end
Movement_165B0E:: @ 8165B0E
ViridianCity_Movement_WalkDown:: @ 8165B0E
walk_down
step_end
ViridianCity_EventScript_165B10:: @ 8165B10
ViridianCity_EventScript_TutorialTriggerLeft:: @ 8165B10
lockall
textcolor 0
applymovement 4, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
call EventScript_165B4C
call ViridianCity_EventScript_DoTutorialBattle
release
end
ViridianCity_EventScript_165B2E:: @ 8165B2E
ViridianCity_EventScript_TutorialTriggerRight:: @ 8165B2E
lockall
textcolor 0
applymovement 4, Movement_WalkInPlaceFastestRight
applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestRight
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
call EventScript_165B4C
call ViridianCity_EventScript_DoTutorialBattle
release
end
EventScript_165B4C:: @ 8165B4C
msgbox gUnknown_817DD4E
ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C
msgbox ViridianCity_Text_ShowYouHowToCatchMons
closemessage
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
@@ -239,8 +244,8 @@ EventScript_165B4C:: @ 8165B4C
waitstate
lock
faceplayer
msgbox gUnknown_817DE9B
msgbox ViridianCity_Text_ThatWasEducationalTakeThis
setvar VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2
giveitem ITEM_TEACHY_TV
msgbox gUnknown_817DEEB
msgbox ViridianCity_Text_WatchThatToLearnBasics
return
data/maps/ViridianCity/text.inc
+21 -21
View File
@@ -1,47 +1,47 @@
gUnknown_817DABB:: @ 817DABB
ViridianCity_Text_CanCarryMonsAnywhere:: @ 817DABB
.string "Those POKé BALLS at your waist!\n"
.string "You have POKéMON, don't you?\p"
.string "It's great that you can carry and\n"
.string "use POKéMON anytime, anywhere.$"
gUnknown_817DB39:: @ 817DB39
ViridianCity_Text_GymClosedWonderWhoLeaderIs:: @ 817DB39
.string "This POKéMON GYM is always closed.\p"
.string "I wonder who the LEADER is?$"
gUnknown_817DB78:: @ 817DB78
ViridianCity_Text_ViridiansGymLeaderReturned:: @ 817DB78
.string "VIRIDIAN GYM's LEADER returned!$"
gUnknown_817DB98:: @ 817DB98
ViridianCity_Text_WantToKnowAboutCaterpillarMons:: @ 817DB98
.string "You want to know about the two\n"
.string "kinds of caterpillar POKéMON?$"
gUnknown_817DBD5:: @ 817DBD5
ViridianCity_Text_OhOkayThen:: @ 817DBD5
.string "Oh, okay then!$"
gUnknown_817DBE4:: @ 817DBE4
ViridianCity_Text_ExplainCaterpieWeedle:: @ 817DBE4
.string "CATERPIE has no poison,\n"
.string "but WEEDLE does.\p"
.string "Watch that your POKéMON aren't\n"
.string "stabbed by WEEDLE's POISON STING.$"
gUnknown_817DC4E:: @ 817DC4E
ViridianCity_Text_GrandpaHasntHadCoffeeYet:: @ 817DC4E
.string "Oh, Grandpa!\n"
.string "Don't be so mean!\p"
.string "I'm so sorry.\n"
.string "He hasn't had his coffee yet.$"
gUnknown_817DC99:: @ 817DC99
ViridianCity_Text_GoShoppingInPewterOccasionally:: @ 817DC99
.string "I go shopping in PEWTER CITY\n"
.string "occasionally.\p"
.string "I have to take the winding trail in\n"
.string "VIRIDIAN FOREST when I go.$"
gUnknown_817DD03:: @ 817DD03
ViridianCity_Text_ThisIsPrivateProperty:: @ 817DD03
.string "I absolutely forbid you from\n"
.string "going through here!\p"
.string "This is private property!$"
gUnknown_817DD4E:: @ 817DD4E
ViridianCity_Text_ShowYouHowToCatchMons:: @ 817DD4E
.string "Well, now, I've had my coffee, and\n"
.string "that's what I need to get going!\p"
.string "Hm?\n"
@@ -58,18 +58,18 @@ gUnknown_817DD4E:: @ 817DD4E
.string "I suppose I had better show you\n"
.string "then!$"
gUnknown_817DE9B:: @ 817DE9B
ViridianCity_Text_ThatWasEducationalTakeThis:: @ 817DE9B
.string "There! Now tell me, that was\n"
.string "educational, was it not?\p"
.string "And here, take this, too.$"
gUnknown_817DEEB:: @ 817DEEB
ViridianCity_Text_WatchThatToLearnBasics:: @ 817DEEB
.string "If there's something you don't\n"
.string "understand, watch that.\p"
.string "It will teach you about the basics\n"
.string "of being a POKéMON TRAINER.$"
gUnknown_817DF61:: @ 817DF61
ViridianCity_Text_WeakenMonsFirstToCatch:: @ 817DF61
.string "Well, now, I've had my coffee, and\n"
.string "that's what I need to get going!\p"
.string "But I made it too strong.\n"
@@ -79,7 +79,7 @@ gUnknown_817DF61:: @ 817DF61
.string "At first, focus on weakening the\n"
.string "POKéMON before trying to catch it.$"
gUnknown_817E046:: @ 817E046
ViridianCity_Text_HowsTeachyTVHelping:: @ 817E046
.string "Well, now, I've had my coffee, and\n"
.string "that's what I need to get going!\p"
.string "But I made it too strong.\n"
@@ -87,39 +87,39 @@ gUnknown_817E046:: @ 817E046
.string "Incidentally, is my old TEACHY TV\n"
.string "helping you?$"
gUnknown_817E0EA:: @ 817E0EA
ViridianCity_Text_MyGrandsonOnTheShow:: @ 817E0EA
.string "Wahaha!\n"
.string "It's my grandson on the show!\p"
.string "Since he's the one doing the\n"
.string "teaching, you're bound to learn.$"
gUnknown_817E14E:: @ 817E14E
ViridianCity_Text_TooBusyForTeachyTV:: @ 817E14E
.string "Hm… You're too busy to not even\n"
.string "have the time for TEACHY TV…\p"
.string "Time is money, and neither should\n"
.string "be ill spent…$"
gUnknown_817E1BB:: @ 817E1BB
ViridianCity_Text_CitySign:: @ 817E1BB
.string "VIRIDIAN CITY \n"
.string "The Eternally Green Paradise$"
gUnknown_817E1E7:: @ 817E1E7
ViridianCity_Text_CatchMonsForEasierBattles:: @ 817E1E7
.string "TRAINER TIPS\p"
.string "Catch POKéMON and expand your\n"
.string "collection.\p"
.string "The more you have, the easier it\n"
.string "is to battle.$"
gUnknown_817E24D:: @ 817E24D
ViridianCity_Text_MovesLimitedByPP:: @ 817E24D
.string "TRAINER TIPS\p"
.string "The battle moves of POKéMON are\n"
.string "limited by their POWER POINTS, PP.\p"
.string "To replenish PP, rest your tired\n"
.string "POKéMON at a POKéMON CENTER.$"
gUnknown_817E2DB:: @ 817E2DB
ViridianCity_Text_GymSign:: @ 817E2DB
.string "VIRIDIAN CITY POKéMON GYM$"
gUnknown_817E2F5:: @ 817E2F5
ViridianCity_Text_GymDoorsAreLocked:: @ 817E2F5
.string "VIRIDIAN GYM's doors are locked…$"
data/maps/ViridianCity_Gym/map.json
+12 -12
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "ViridianCity_Gym_EventScript_169FD6",
"script": "ViridianCity_Gym_EventScript_Takashi",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "ViridianCity_Gym_EventScript_16A004",
"script": "ViridianCity_Gym_EventScript_Yuji",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "ViridianCity_Gym_EventScript_169FA8",
"script": "ViridianCity_Gym_EventScript_Atsushi",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "ViridianCity_Gym_EventScript_169F7A",
"script": "ViridianCity_Gym_EventScript_Jason",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "ViridianCity_Gym_EventScript_169F91",
"script": "ViridianCity_Gym_EventScript_Cole",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "ViridianCity_Gym_EventScript_169FBF",
"script": "ViridianCity_Gym_EventScript_Kiyo",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "ViridianCity_Gym_EventScript_169FED",
"script": "ViridianCity_Gym_EventScript_Samuel",
"flag": "0"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_Gym_EventScript_169ECA",
"script": "ViridianCity_Gym_EventScript_Giovanni",
"flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "ViridianCity_Gym_EventScript_16A01B",
"script": "ViridianCity_Gym_EventScript_Warren",
"flag": "0"
},
{
@@ -140,7 +140,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_Gym_EventScript_16A032",
"script": "ViridianCity_Gym_EventScript_GymGuy",
"flag": "0"
}
],
@@ -174,14 +174,14 @@
"x": 15,
"y": 20,
"elevation": 0,
"script": "ViridianCity_Gym_EventScript_16A05E"
"script": "ViridianCity_Gym_EventScript_GymStatue"
},
{
"type": "bg_event_type_0",
"x": 19,
"y": 20,
"elevation": 0,
"script": "ViridianCity_Gym_EventScript_16A05E"
"script": "ViridianCity_Gym_EventScript_GymStatue"
},
{
"type": "hidden_item",
data/maps/ViridianCity_Gym/scripts.inc
+47 -47
View File
@@ -1,11 +1,11 @@
ViridianCity_Gym_MapScripts:: @ 8169EC9
.byte 0
ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
ViridianCity_Gym_EventScript_Giovanni:: @ 8169ECA
famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_GIOVANNI, Text_18F352, Text_18F43F, EventScript_169F04, NO_MUSIC
goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, EventScript_169F2F
msgbox gUnknown_818F4A2
trainerbattle_single TRAINER_LEADER_GIOVANNI, ViridianCity_Gym_Text_GiovanniIntro, ViridianCity_Gym_Text_GiovanniDefeat, ViridianCity_Gym_EventScript_DefeatedGiovanni, NO_MUSIC
goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, ViridianCity_Gym_EventScript_GiveTM26
msgbox ViridianCity_Gym_Text_GiovanniPostBattle
closemessage
fadescreen FADE_TO_BLACK
removeobject 8
@@ -13,94 +13,94 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
release
end
EventScript_169F04:: @ 8169F04
ViridianCity_Gym_EventScript_DefeatedGiovanni:: @ 8169F04
famechecker FAMECHECKER_GIOVANNI, 3
setflag FLAG_HIDE_MISC_KANTO_ROCKETS
setflag FLAG_DEFEATED_LEADER_GIOVANNI
setflag FLAG_BADGE08_GET
setvar VAR_MAP_SCENE_ROUTE22, 3
set_gym_trainers 8
goto EventScript_169F2F
goto ViridianCity_Gym_EventScript_GiveTM26
end
EventScript_169F2F:: @ 8169F2F
msgbox gUnknown_818F586
ViridianCity_Gym_EventScript_GiveTM26:: @ 8169F2F
msgbox ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis
checkitemspace ITEM_TM26, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_169F70
giveitem_msg gUnknown_818F675, ITEM_TM26
goto_if_eq ViridianCity_Gym_EventScript_NoRoomForTM26
giveitem_msg ViridianCity_Gym_Text_ReceivedTM26FromGiovanni, ITEM_TM26
setflag FLAG_GOT_TM26_FROM_GIOVANNI
msgbox gUnknown_818F695
msgbox ViridianCity_Gym_Text_ExplainTM26
release
end
EventScript_169F70:: @ 8169F70
msgbox gUnknown_818F71B
ViridianCity_Gym_EventScript_NoRoomForTM26:: @ 8169F70
msgbox ViridianCity_Gym_Text_YouDoNotHaveSpace
release
end
ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A
trainerbattle_single TRAINER_TAMER_JASON, Text_18F7F3, Text_18F824
msgbox gUnknown_818F840, MSGBOX_AUTOCLOSE
ViridianCity_Gym_EventScript_Jason:: @ 8169F7A
trainerbattle_single TRAINER_TAMER_JASON, ViridianCity_Gym_Text_JasonIntro, ViridianCity_Gym_Text_JasonDefeat
msgbox ViridianCity_Gym_Text_JasonPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_169F91:: @ 8169F91
trainerbattle_single TRAINER_TAMER_COLE, Text_18F98A, Text_18F9BB
msgbox gUnknown_818F9CC, MSGBOX_AUTOCLOSE
ViridianCity_Gym_EventScript_Cole:: @ 8169F91
trainerbattle_single TRAINER_TAMER_COLE, ViridianCity_Gym_Text_ColeIntro, ViridianCity_Gym_Text_ColeDefeat
msgbox ViridianCity_Gym_Text_ColePostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8
trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, Text_18F7AD, Text_18F7D6
msgbox gUnknown_818F7DD, MSGBOX_AUTOCLOSE
ViridianCity_Gym_EventScript_Atsushi:: @ 8169FA8
trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, ViridianCity_Gym_Text_AtsushiIntro, ViridianCity_Gym_Text_AtsushiDefeat
msgbox ViridianCity_Gym_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF
trainerbattle_single TRAINER_BLACK_BELT_KIYO, Text_18F86C, Text_18F899
msgbox gUnknown_818F8A0, MSGBOX_AUTOCLOSE
ViridianCity_Gym_EventScript_Kiyo:: @ 8169FBF
trainerbattle_single TRAINER_BLACK_BELT_KIYO, ViridianCity_Gym_Text_KiyoIntro, ViridianCity_Gym_Text_KiyoDefeat
msgbox ViridianCity_Gym_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6
trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, Text_18F92C, Text_18F95A
msgbox gUnknown_818F960, MSGBOX_AUTOCLOSE
ViridianCity_Gym_EventScript_Takashi:: @ 8169FD6
trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, ViridianCity_Gym_Text_TakashiIntro, ViridianCity_Gym_Text_TakashiDefeat
msgbox ViridianCity_Gym_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_169FED:: @ 8169FED
trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, Text_18F9E7, Text_18FA2D
msgbox gUnknown_818FA3B, MSGBOX_AUTOCLOSE
ViridianCity_Gym_EventScript_Samuel:: @ 8169FED
trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, ViridianCity_Gym_Text_SamuelIntro, ViridianCity_Gym_Text_SamuelDefeat
msgbox ViridianCity_Gym_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_16A004:: @ 816A004
trainerbattle_single TRAINER_COOLTRAINER_YUJI, Text_18F73B, Text_18F769
msgbox gUnknown_818F77B, MSGBOX_AUTOCLOSE
ViridianCity_Gym_EventScript_Yuji:: @ 816A004
trainerbattle_single TRAINER_COOLTRAINER_YUJI, ViridianCity_Gym_Text_YujiIntro, ViridianCity_Gym_Text_YujiDefeat
msgbox ViridianCity_Gym_Text_YujiPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_16A01B:: @ 816A01B
trainerbattle_single TRAINER_COOLTRAINER_WARREN, Text_18F8CB, Text_18F8EE
msgbox gUnknown_818F8FE, MSGBOX_AUTOCLOSE
ViridianCity_Gym_EventScript_Warren:: @ 816A01B
trainerbattle_single TRAINER_COOLTRAINER_WARREN, ViridianCity_Gym_Text_WarrenIntro, ViridianCity_Gym_Text_WarrenDefeat
msgbox ViridianCity_Gym_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE
end
ViridianCity_Gym_EventScript_16A032:: @ 816A032
ViridianCity_Gym_EventScript_GymGuy:: @ 816A032
lock
faceplayer
goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, EventScript_16A047
msgbox gUnknown_818FA81
goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, ViridianCity_Gym_EventScript_GymGuyPostVictory
msgbox ViridianCity_Gym_Text_GymGuyAdvice
release
end
EventScript_16A047:: @ 816A047
ViridianCity_Gym_EventScript_GymGuyPostVictory:: @ 816A047
famechecker FAMECHECKER_GIOVANNI, 4
msgbox gUnknown_818FB56
msgbox ViridianCity_Gym_Text_GymGuyPostVictory
release
end
ViridianCity_Gym_EventScript_16A05E:: @ 816A05E
ViridianCity_Gym_EventScript_GymStatue:: @ 816A05E
lockall
goto_if_set FLAG_BADGE08_GET, EventScript_16A072
msgbox gUnknown_818FB8D
goto_if_set FLAG_BADGE08_GET, ViridianCity_Gym_EventScript_GymStatuePostVictory
msgbox ViridianCity_Gym_Text_GymStatue
releaseall
end
EventScript_16A072:: @ 816A072
msgbox gUnknown_818FBC1
ViridianCity_Gym_EventScript_GymStatuePostVictory:: @ 816A072
msgbox ViridianCity_Gym_Text_GymStatuePlayerWon
releaseall
end
data/maps/ViridianCity_Gym/text.inc
+35 -35
View File
@@ -1,4 +1,4 @@
Text_18F352:: @ 818F352
ViridianCity_Gym_Text_GiovanniIntro:: @ 818F352
.string "Fwahahaha!\n"
.string "Welcome to my hideout!\p"
.string "It shall be so until I can restore\n"
@@ -9,14 +9,14 @@ Text_18F352:: @ 818F352
.string "Once more, you shall face\n"
.string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ROCKET}$"
Text_18F43F:: @ 818F43F
ViridianCity_Gym_Text_GiovanniDefeat:: @ 818F43F
.string "Ha!\n"
.string "That was a truly intense fight.\l"
.string "You have won!\p"
.string "As proof, here is the EARTHBADGE!\n"
.string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$"
gUnknown_818F4A2:: @ 818F4A2
ViridianCity_Gym_Text_GiovanniPostBattle:: @ 818F4A2
.string "Having lost in this fashion, \n"
.string "I can't face my followers.\l"
.string "I have betrayed their trust.\p"
@@ -27,7 +27,7 @@ gUnknown_818F4A2:: @ 818F4A2
.string "Let us meet again someday!\n"
.string "Farewell!$"
gUnknown_818F586:: @ 818F586
ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis:: @ 818F586
.string "The EARTHBADGE makes POKéMON of\n"
.string "any level obey without question.\p"
.string "It is evidence of your mastery as\n"
@@ -38,111 +38,111 @@ gUnknown_818F586:: @ 818F586
.string "Consider it a gift for your POKéMON\n"
.string "LEAGUE challenge.$"
gUnknown_818F675:: @ 818F675
ViridianCity_Gym_Text_ReceivedTM26FromGiovanni:: @ 818F675
.string "{PLAYER} received TM26\n"
.string "from GIOVANNI.$"
gUnknown_818F695:: @ 818F695
ViridianCity_Gym_Text_ExplainTM26:: @ 818F695
.string "TM26 contains EARTHQUAKE.\p"
.string "It is a powerful attack that causes\n"
.string "a massive tremor.\p"
.string "I made it when I ran the GYM here,\n"
.string "far too long ago… $"
gUnknown_818F71B:: @ 818F71B
ViridianCity_Gym_Text_YouDoNotHaveSpace:: @ 818F71B
.string "You do not have space for this!$"
Text_18F73B:: @ 818F73B
ViridianCity_Gym_Text_YujiIntro:: @ 818F73B
.string "Heh!\n"
.string "You must be running out of steam\l"
.string "by now!$"
Text_18F769:: @ 818F769
ViridianCity_Gym_Text_YujiDefeat:: @ 818F769
.string "I ran out of gas!$"
gUnknown_818F77B:: @ 818F77B
ViridianCity_Gym_Text_YujiPostBattle:: @ 818F77B
.string "You'll need power to keep up with\n"
.string "our GYM LEADER.$"
Text_18F7AD:: @ 818F7AD
ViridianCity_Gym_Text_AtsushiIntro:: @ 818F7AD
.string "Rrrroar!\n"
.string "I'm working myself into a rage!$"
Text_18F7D6:: @ 818F7D6
ViridianCity_Gym_Text_AtsushiDefeat:: @ 818F7D6
.string "Wargh!$"
gUnknown_818F7DD:: @ 818F7DD
ViridianCity_Gym_Text_AtsushiPostBattle:: @ 818F7DD
.string "I'm still not worthy!$"
Text_18F7F3:: @ 818F7F3
ViridianCity_Gym_Text_JasonIntro:: @ 818F7F3
.string "POKéMON and I, we make wonderful\n"
.string "music together!$"
Text_18F824:: @ 818F824
ViridianCity_Gym_Text_JasonDefeat:: @ 818F824
.string "You are in perfect harmony!$"
gUnknown_818F840:: @ 818F840
ViridianCity_Gym_Text_JasonPostBattle:: @ 818F840
.string "Do you know the identity of our\n"
.string "GYM LEADER?$"
Text_18F86C:: @ 818F86C
ViridianCity_Gym_Text_KiyoIntro:: @ 818F86C
.string "Karate is the ultimate form of\n"
.string "martial arts!$"
Text_18F899:: @ 818F899
ViridianCity_Gym_Text_KiyoDefeat:: @ 818F899
.string "Aiyah!$"
gUnknown_818F8A0:: @ 818F8A0
ViridianCity_Gym_Text_KiyoPostBattle:: @ 818F8A0
.string "If my POKéMON were as good at\n"
.string "karate as I…$"
Text_18F8CB:: @ 818F8CB
ViridianCity_Gym_Text_WarrenIntro:: @ 818F8CB
.string "The truly talented win with style.$"
Text_18F8EE:: @ 818F8EE
ViridianCity_Gym_Text_WarrenDefeat:: @ 818F8EE
.string "I lost my grip!$"
gUnknown_818F8FE:: @ 818F8FE
ViridianCity_Gym_Text_WarrenPostBattle:: @ 818F8FE
.string "The LEADER will scold me for\n"
.string "losing this way…$"
Text_18F92C:: @ 818F92C
ViridianCity_Gym_Text_TakashiIntro:: @ 818F92C
.string "I'm the KARATE KING!\n"
.string "Your fate rests with me!$"
Text_18F95A:: @ 818F95A
ViridianCity_Gym_Text_TakashiDefeat:: @ 818F95A
.string "Ayah!$"
gUnknown_818F960:: @ 818F960
ViridianCity_Gym_Text_TakashiPostBattle:: @ 818F960
.string "The POKéMON LEAGUE?\n"
.string "You? Don't get cocky!$"
Text_18F98A:: @ 818F98A
ViridianCity_Gym_Text_ColeIntro:: @ 818F98A
.string "Your POKéMON will cower at the\n"
.string "crack of my whip!$"
Text_18F9BB:: @ 818F9BB
ViridianCity_Gym_Text_ColeDefeat:: @ 818F9BB
.string "Yowch!\n"
.string "Whiplash!$"
gUnknown_818F9CC:: @ 818F9CC
ViridianCity_Gym_Text_ColePostBattle:: @ 818F9CC
.string "Wait!\n"
.string "I was just careless!$"
Text_18F9E7:: @ 818F9E7
ViridianCity_Gym_Text_SamuelIntro:: @ 818F9E7
.string "VIRIDIAN GYM was closed for a\n"
.string "long time.\p"
.string "But now, our LEADER is back!$"
Text_18FA2D:: @ 818FA2D
ViridianCity_Gym_Text_SamuelDefeat:: @ 818FA2D
.string "I was beaten?$"
gUnknown_818FA3B:: @ 818FA3B
ViridianCity_Gym_Text_SamuelPostBattle:: @ 818FA3B
.string "You can go on to the POKéMON\n"
.string "LEAGUE only by defeating our GYM\l"
.string "LEADER!$"
gUnknown_818FA81:: @ 818FA81
ViridianCity_Gym_Text_GymGuyAdvice:: @ 818FA81
.string "Yo!\n"
.string "Champ in the making!\p"
.string "Even I don't know the VIRIDIAN\n"
@@ -153,17 +153,17 @@ gUnknown_818FA81:: @ 818FA81
.string "Also, I heard that the TRAINERS\n"
.string "here like GROUND-type POKéMON.$"
gUnknown_818FB56:: @ 818FB56
ViridianCity_Gym_Text_GymGuyPostVictory:: @ 818FB56
.string "Blow me away! GIOVANNI was the\n"
.string "GYM LEADER of VIRIDIAN?$"
gUnknown_818FB8D:: @ 818FB8D
ViridianCity_Gym_Text_GymStatue:: @ 818FB8D
.string "VIRIDIAN POKéMON GYM\n"
.string "LEADER: ?\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
gUnknown_818FBC1:: @ 818FBC1
ViridianCity_Gym_Text_GymStatuePlayerWon:: @ 818FBC1
.string "VIRIDIAN POKéMON GYM\n"
.string "LEADER: GIOVANNI\p"
.string "WINNING TRAINERS:\n"
data/maps/ViridianCity_House1/map.json
+4 -4
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_House1_EventScript_169E9B",
"script": "ViridianCity_House1_EventScript_BaldingMan",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 2,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_House1_EventScript_169EA4",
"script": "ViridianCity_House1_EventScript_LittleGirl",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_House1_EventScript_169EAD",
"script": "ViridianCity_House1_EventScript_Speary",
"flag": "0"
}
],
@@ -83,7 +83,7 @@
"x": 7,
"y": 1,
"elevation": 0,
"script": "ViridianCity_House1_EventScript_169EC0"
"script": "ViridianCity_House1_EventScript_NicknameSign"
}
]
}
data/maps/ViridianCity_House1/scripts.inc
+8 -8
View File
@@ -1,24 +1,24 @@
ViridianCity_House1_MapScripts:: @ 8169E9A
.byte 0
ViridianCity_House1_EventScript_169E9B:: @ 8169E9B
msgbox gUnknown_818F292, MSGBOX_NPC
ViridianCity_House1_EventScript_BaldingMan:: @ 8169E9B
msgbox ViridianCity_House1_Text_NicknamingIsFun, MSGBOX_NPC
end
ViridianCity_House1_EventScript_169EA4:: @ 8169EA4
msgbox gUnknown_818F30F, MSGBOX_NPC
ViridianCity_House1_EventScript_LittleGirl:: @ 8169EA4
msgbox ViridianCity_House1_Text_MyDaddyLovesMonsToo, MSGBOX_NPC
end
ViridianCity_House1_EventScript_169EAD:: @ 8169EAD
ViridianCity_House1_EventScript_Speary:: @ 8169EAD
lock
faceplayer
waitse
playmoncry SPECIES_SPEAROW, 0
msgbox gUnknown_818F32C
msgbox ViridianCity_House1_Text_Speary
waitmoncry
release
end
ViridianCity_House1_EventScript_169EC0:: @ 8169EC0
msgbox gUnknown_818F33D, MSGBOX_SIGN
ViridianCity_House1_EventScript_NicknameSign:: @ 8169EC0
msgbox ViridianCity_House1_Text_SpearowNameSpeary, MSGBOX_SIGN
end
data/maps/ViridianCity_House1/text.inc
+4 -4
View File
@@ -1,16 +1,16 @@
gUnknown_818F292:: @ 818F292
ViridianCity_House1_Text_NicknamingIsFun:: @ 818F292
.string "Coming up with nicknames is fun,\n"
.string "but it's not so easy to do.\p"
.string "Clever names are nice, but simple\n"
.string "names are easier to remember.$"
gUnknown_818F30F:: @ 818F30F
ViridianCity_House1_Text_MyDaddyLovesMonsToo:: @ 818F30F
.string "My daddy loves POKéMON, too.$"
gUnknown_818F32C:: @ 818F32C
ViridianCity_House1_Text_Speary:: @ 818F32C
.string "SPEARY: Tetweet!$"
gUnknown_818F33D:: @ 818F33D
ViridianCity_House1_Text_SpearowNameSpeary:: @ 818F33D
.string "SPEAROW\n"
.string "Name: SPEARY$"
data/maps/ViridianCity_House2/map.json
+7 -7
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_House2_EventScript_16A094",
"script": "ViridianCity_House2_EventScript_Woman",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_House2_EventScript_16A07D",
"script": "ViridianCity_House2_EventScript_Lass",
"flag": "0"
}
],
@@ -70,35 +70,35 @@
"x": 4,
"y": 4,
"elevation": 0,
"script": "ViridianCity_House2_EventScript_16A0AB"
"script": "ViridianCity_House2_EventScript_Notebook"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 1,
"elevation": 0,
"script": "ViridianCity_House2_EventScript_16A11D"
"script": "ViridianCity_House2_EventScript_Blackboard"
},
{
"type": "bg_event_type_0",
"x": 4,
"y": 1,
"elevation": 0,
"script": "ViridianCity_House2_EventScript_16A11D"
"script": "ViridianCity_House2_EventScript_Blackboard"
},
{
"type": "bg_event_type_1",
"x": 9,
"y": 2,
"elevation": 0,
"script": "ViridianCity_House2_EventScript_1ACD65"
"script": "ViridianCity_House2_EventScript_PokemonJournal"
},
{
"type": "bg_event_type_1",
"x": 8,
"y": 2,
"elevation": 0,
"script": "ViridianCity_House2_EventScript_1ACD65"
"script": "ViridianCity_House2_EventScript_PokemonJournal"
}
]
}
data/maps/ViridianCity_House2/scripts.inc
+45 -45
View File
@@ -1,97 +1,97 @@
ViridianCity_House2_MapScripts:: @ 816A07C
.byte 0
ViridianCity_House2_EventScript_16A07D:: @ 816A07D
ViridianCity_House2_EventScript_Lass:: @ 816A07D
lock
faceplayer
msgbox gUnknown_818FC00
msgbox ViridianCity_House2_Text_TryingToMemorizeNotes
closemessage
applymovement 2, Movement_WalkInPlaceFastestUp
waitmovement 0
release
end
ViridianCity_House2_EventScript_16A094:: @ 816A094
ViridianCity_House2_EventScript_Woman:: @ 816A094
lock
faceplayer
msgbox gUnknown_818FC2B
msgbox ViridianCity_House2_Text_ReadBlackboardCarefully
closemessage
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB
ViridianCity_House2_EventScript_Notebook:: @ 816A0AB
lockall
msgbox gUnknown_818FC65
msgbox gUnknown_818FF19, MSGBOX_YESNO
msgbox ViridianCity_House2_Text_NotebookFirstPage
msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16A11B
msgbox gUnknown_818FD23
msgbox gUnknown_818FF19, MSGBOX_YESNO
goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook
msgbox ViridianCity_House2_Text_NotebookSecondPage
msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16A11B
msgbox gUnknown_818FDA8
msgbox gUnknown_818FF19, MSGBOX_YESNO
goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook
msgbox ViridianCity_House2_Text_NotebookThirdPage
msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16A11B
msgbox gUnknown_818FE5C
goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook
msgbox ViridianCity_House2_Text_NotebookFourthPage
applymovement 2, Movement_WalkInPlaceFastestUp
waitmovement 0
textcolor 1
msgbox gUnknown_818FF28
msgbox ViridianCity_House2_Text_HeyDontLookAtMyNotes
releaseall
end
EventScript_16A11B:: @ 816A11B
ViridianCity_House2_EventScript_StopReadingNotebook:: @ 816A11B
releaseall
end
ViridianCity_House2_EventScript_16A11D:: @ 816A11D
ViridianCity_House2_EventScript_Blackboard:: @ 816A11D
lockall
msgbox gUnknown_818FF4B
goto EventScript_16A12C
msgbox ViridianCity_House2_Text_BlackboardListsStatusProblems
goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
end
EventScript_16A12C:: @ 816A12C
message Text_18FF88
ViridianCity_House2_EventScript_ChooseBlackboardTopic:: @ 816A12C
message ViridianCity_House2_Text_ReadWhichTopic
waitmessage
multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE
switch VAR_RESULT
case 0, EventScript_16A18B
case 1, EventScript_16A1A7
case 2, EventScript_16A1C3
case 3, EventScript_16A199
case 4, EventScript_16A1B5
case 5, EventScript_16A1D1
case 127, EventScript_16A1D1
case 0, ViridianCity_House2_EventScript_ReadSleep
case 1, ViridianCity_House2_EventScript_ReadPoison
case 2, ViridianCity_House2_EventScript_ReadParalysis
case 3, ViridianCity_House2_EventScript_ReadBurn
case 4, ViridianCity_House2_EventScript_ReadFreeze
case 5, ViridianCity_House2_EventScript_ExitBlackboard
case 127, ViridianCity_House2_EventScript_ExitBlackboard
end
EventScript_16A18B:: @ 816A18B
msgbox gUnknown_818FFA9
goto EventScript_16A12C
ViridianCity_House2_EventScript_ReadSleep:: @ 816A18B
msgbox ViridianCity_House2_Text_ExplainSleep
goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
end
EventScript_16A199:: @ 816A199
msgbox gUnknown_8190025
goto EventScript_16A12C
ViridianCity_House2_EventScript_ReadBurn:: @ 816A199
msgbox ViridianCity_House2_Text_ExplainBurn
goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
end
EventScript_16A1A7:: @ 816A1A7
msgbox gUnknown_819009F
goto EventScript_16A12C
ViridianCity_House2_EventScript_ReadPoison:: @ 816A1A7
msgbox ViridianCity_House2_Text_ExplainPoison
goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
end
EventScript_16A1B5:: @ 816A1B5
msgbox gUnknown_819010F
goto EventScript_16A12C
ViridianCity_House2_EventScript_ReadFreeze:: @ 816A1B5
msgbox ViridianCity_House2_Text_ExplainFreeze
goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
end
EventScript_16A1C3:: @ 816A1C3
msgbox gUnknown_8190199
goto EventScript_16A12C
ViridianCity_House2_EventScript_ReadParalysis:: @ 816A1C3
msgbox ViridianCity_House2_Text_ExplainParalysis
goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
end
EventScript_16A1D1:: @ 816A1D1
ViridianCity_House2_EventScript_ExitBlackboard:: @ 816A1D1
releaseall
end
data/maps/ViridianCity_House2/text.inc
+15 -15
View File
@@ -1,13 +1,13 @@
gUnknown_818FC00:: @ 818FC00
ViridianCity_House2_Text_TryingToMemorizeNotes:: @ 818FC00
.string "Whew! I'm trying to memorize all my\n"
.string "notes.$"
gUnknown_818FC2B:: @ 818FC2B
ViridianCity_House2_Text_ReadBlackboardCarefully:: @ 818FC2B
.string "Okay!\p"
.string "Be sure to read what's on the\n"
.string "blackboard carefully!$"
gUnknown_818FC65:: @ 818FC65
ViridianCity_House2_Text_NotebookFirstPage:: @ 818FC65
.string "Let's check out the notebook.\p"
.string "First page…\p"
.string "POKé BALLS are used to catch\n"
@@ -17,14 +17,14 @@ gUnknown_818FC65:: @ 818FC65
.string "People who raise and battle\n"
.string "with POKéMON are called TRAINERS.$"
gUnknown_818FD23:: @ 818FD23
ViridianCity_House2_Text_NotebookSecondPage:: @ 818FD23
.string "Second page…\p"
.string "A healthy POKéMON may be hard to\n"
.string "catch, so weaken it first.\p"
.string "Poison, burn, or cause another\n"
.string "status problem to weaken it.$"
gUnknown_818FDA8:: @ 818FDA8
ViridianCity_House2_Text_NotebookThirdPage:: @ 818FDA8
.string "Third page…\p"
.string "POKéMON TRAINERS seek others to\n"
.string "engage in POKéMON battles.\p"
@@ -33,7 +33,7 @@ gUnknown_818FDA8:: @ 818FDA8
.string "Battles are constantly waged at\n"
.string "POKéMON GYMS everywhere.$"
gUnknown_818FE5C:: @ 818FE5C
ViridianCity_House2_Text_NotebookFourthPage:: @ 818FE5C
.string "Fourth page…\p"
.string "The ultimate goal for all POKéMON\n"
.string "TRAINERS is simple.\p"
@@ -43,21 +43,21 @@ gUnknown_818FE5C:: @ 818FE5C
.string "The ELITE FOUR of the POKéMON\n"
.string "LEAGUE!$"
gUnknown_818FF19:: @ 818FF19
ViridianCity_House2_Text_TurnThePage:: @ 818FF19
.string "Turn the page?$"
gUnknown_818FF28:: @ 818FF28
ViridianCity_House2_Text_HeyDontLookAtMyNotes:: @ 818FF28
.string "GIRL: Hey!\n"
.string "Don't look at my notes!$"
gUnknown_818FF4B:: @ 818FF4B
ViridianCity_House2_Text_BlackboardListsStatusProblems:: @ 818FF4B
.string "The blackboard lists POKéMON\n"
.string "STATUS problems during battles.$"
Text_18FF88:: @ 818FF88
ViridianCity_House2_Text_ReadWhichTopic:: @ 818FF88
.string "Which topic do you want to read?$"
gUnknown_818FFA9:: @ 818FFA9
ViridianCity_House2_Text_ExplainSleep:: @ 818FFA9
.string "A POKéMON can't attack if it's\n"
.string "asleep.\p"
.string "POKéMON will stay asleep even\n"
@@ -65,19 +65,19 @@ gUnknown_818FFA9:: @ 818FFA9
.string "Use AWAKENING to awaken one\n"
.string "from sleep.$"
gUnknown_8190025:: @ 8190025
ViridianCity_House2_Text_ExplainBurn:: @ 8190025
.string "A burn reduces ATTACK power.\n"
.string "It also causes ongoing HP loss.\p"
.string "A burn remains after a battle.\n"
.string "Use BURN HEAL to cure a burn.$"
gUnknown_819009F:: @ 819009F
ViridianCity_House2_Text_ExplainPoison:: @ 819009F
.string "When poisoned, a POKéMON's health\n"
.string "steadily drops.\p"
.string "Poison lingers after battles.\n"
.string "Use an ANTIDOTE to cure poison!$"
gUnknown_819010F:: @ 819010F
ViridianCity_House2_Text_ExplainFreeze:: @ 819010F
.string "A frozen POKéMON becomes\n"
.string "helplessly immobile.\p"
.string "It stays frozen even after the\n"
@@ -85,7 +85,7 @@ gUnknown_819010F:: @ 819010F
.string "Use ICE HEAL to thaw out the\n"
.string "suffering POKéMON.$"
gUnknown_8190199:: @ 8190199
ViridianCity_House2_Text_ExplainParalysis:: @ 8190199
.string "Paralysis reduces SPEED and may\n"
.string "prevent the POKéMON from moving.\p"
.string "Paralysis remains after battles.\n"
data/maps/ViridianCity_Mart/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_Mart_EventScript_16A268",
"script": "ViridianCity_Mart_EventScript_Clerk",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_Mart_EventScript_16A2B7",
"script": "ViridianCity_Mart_EventScript_Youngster",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_Mart_EventScript_16A2AE",
"script": "ViridianCity_Mart_EventScript_Woman",
"flag": "0"
}
],
data/maps/ViridianCity_Mart/scripts.inc
+23 -23
View File
@@ -4,36 +4,36 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3
.byte 0
ViridianCity_Mart_OnLoad:: @ 816A1DE
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_16A1E8
goto_if_unset FLAG_SYS_POKEDEX_GET, ViridianCity_Mart_EventScript_HideQuestionnaire
end
EventScript_16A1E8:: @ 816A1E8
setmetatile 1, 3, 703, 1
setmetatile 1, 4, 704, 1
ViridianCity_Mart_EventScript_HideQuestionnaire:: @ 816A1E8
setmetatile 1, 3, METATILE_Shop_CounterMid_Top, 1
setmetatile 1, 4, METATILE_Shop_CounterMid_Bottom, 1
end
ViridianCity_Mart_OnFrame:: @ 816A1FB
map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, EventScript_16A205
map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, ViridianCity_Mart_EventScript_ParcelScene
.2byte 0
EventScript_16A205:: @ 816A205
ViridianCity_Mart_EventScript_ParcelScene:: @ 816A205
lockall
textcolor 0
applymovement 1, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_819021A
msgbox ViridianCity_Mart_Text_YouCameFromPallet
closemessage
applymovement 1, Movement_16A262
applymovement OBJ_EVENT_ID_PLAYER, Movement_16A25C
applymovement 1, ViridianCity_Mart_Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Mart_Movement_ApproachCounter
waitmovement 0
msgbox gUnknown_819023A
msgbox ViridianCity_Mart_Text_TakeThisToProfOak
setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
giveitem_msg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5
giveitem_msg ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk, ITEM_OAKS_PARCEL, 1, MUS_FAN5
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5
releaseall
end
Movement_16A25C:: @ 816A25C
ViridianCity_Mart_Movement_ApproachCounter:: @ 816A25C
walk_up
walk_up
walk_up
@@ -41,7 +41,7 @@ Movement_16A25C:: @ 816A25C
walk_in_place_fastest_left
step_end
Movement_16A262:: @ 816A262
ViridianCity_Mart_Movement_FacePlayer:: @ 816A262
delay_16
delay_16
delay_16
@@ -49,21 +49,21 @@ Movement_16A262:: @ 816A262
walk_in_place_fastest_right
step_end
ViridianCity_Mart_EventScript_16A268:: @ 816A268
ViridianCity_Mart_EventScript_Clerk:: @ 816A268
lock
faceplayer
compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
goto_if_eq EventScript_16A2A4
goto_if_eq ViridianCity_Mart_EventScript_SayHiToOak
goto_if_questlog EventScript_ReleaseEnd
message Text_MayIHelpYou
waitmessage
pokemart Items_16A298
pokemart ViridianCity_Mart_Items
msgbox Text_PleaseComeAgain
release
end
.align 2
Items_16A298:: @ 816A298
ViridianCity_Mart_Items:: @ 816A298
.2byte ITEM_POKE_BALL
.2byte ITEM_POTION
.2byte ITEM_ANTIDOTE
@@ -72,15 +72,15 @@ Items_16A298:: @ 816A298
release
end
EventScript_16A2A4:: @ 816A2A4
msgbox Text_1902BF
ViridianCity_Mart_EventScript_SayHiToOak:: @ 816A2A4
msgbox ViridianCity_Mart_Text_SayHiToOakForMe
release
end
ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE
msgbox gUnknown_81902F5, MSGBOX_NPC
ViridianCity_Mart_EventScript_Woman:: @ 816A2AE
msgbox ViridianCity_Mart_Text_ShopDoesGoodBusinessInAntidotes, MSGBOX_NPC
end
ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7
msgbox gUnknown_819032C, MSGBOX_NPC
ViridianCity_Mart_EventScript_Youngster:: @ 816A2B7
msgbox ViridianCity_Mart_Text_GotToBuySomePotions, MSGBOX_NPC
end
data/maps/ViridianCity_Mart/text.inc
+6 -6
View File
@@ -1,25 +1,25 @@
gUnknown_819021A:: @ 819021A
ViridianCity_Mart_Text_YouCameFromPallet:: @ 819021A
.string "Hey!\n"
.string "You came from PALLET TOWN?$"
gUnknown_819023A:: @ 819023A
ViridianCity_Mart_Text_TakeThisToProfOak:: @ 819023A
.string "You know PROF. OAK, right?\p"
.string "His order came in.\n"
.string "Can I get you to take it to him?$"
gUnknown_8190289:: @ 8190289
ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk:: @ 8190289
.string "{PLAYER} received OAK'S PARCEL\n"
.string "from the POKéMON MART clerk.$"
Text_1902BF:: @ 81902BF
ViridianCity_Mart_Text_SayHiToOakForMe:: @ 81902BF
.string "Okay, thanks! Please say hi to\n"
.string "PROF. OAK for me, too.$"
gUnknown_81902F5:: @ 81902F5
ViridianCity_Mart_Text_ShopDoesGoodBusinessInAntidotes:: @ 81902F5
.string "This shop does good business in\n"
.string "ANTIDOTES, I've heard.$"
gUnknown_819032C:: @ 819032C
ViridianCity_Mart_Text_GotToBuySomePotions:: @ 819032C
.string "I've got to buy some POTIONS.\p"
.string "You never know when your POKéMON\n"
.string "will need quick healing.$"
data/maps/ViridianCity_PokemonCenter_1F/map.json
+4 -4
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_PokemonCenter_1F_EventScript_16A2CF",
"script": "ViridianCity_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_PokemonCenter_1F_EventScript_16A2E1",
"script": "ViridianCity_PokemonCenter_1F_EventScript_Gentleman",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_PokemonCenter_1F_EventScript_16A2D8",
"script": "ViridianCity_PokemonCenter_1F_EventScript_Boy",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_PokemonCenter_1F_EventScript_16A2EA",
"script": "ViridianCity_PokemonCenter_1F_EventScript_Youngster",
"flag": "0"
}
],
data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
+7 -7
View File
@@ -7,21 +7,21 @@ ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB
setrespawn SPAWN_VIRIDIAN_CITY
end
ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF
ViridianCity_PokemonCenter_1F_EventScript_Nurse:: @ 816A2CF
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
ViridianCity_PokemonCenter_1F_EventScript_16A2D8:: @ 816A2D8
msgbox gUnknown_81903E5, MSGBOX_NPC
ViridianCity_PokemonCenter_1F_EventScript_Boy:: @ 816A2D8
msgbox ViridianCity_PokemonCenter_1F_Text_PokeCenterInEveryTown, MSGBOX_NPC
end
ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1
msgbox gUnknown_8190384, MSGBOX_NPC
ViridianCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816A2E1
msgbox ViridianCity_PokemonCenter_1F_Text_FeelFreeToUsePC, MSGBOX_NPC
end
ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA
msgbox gUnknown_8190450, MSGBOX_NPC
ViridianCity_PokemonCenter_1F_EventScript_Youngster:: @ 816A2EA
msgbox ViridianCity_PokemonCenter_1F_Text_PokeCentersHealMons, MSGBOX_NPC
end
data/maps/ViridianCity_PokemonCenter_1F/text.inc
+3 -3
View File
@@ -1,16 +1,16 @@
gUnknown_8190384:: @ 8190384
ViridianCity_PokemonCenter_1F_Text_FeelFreeToUsePC:: @ 8190384
.string "Please feel free to use that PC in\n"
.string "the corner.\p"
.string "The receptionist told me so.\n"
.string "It's so kind of her!$"
gUnknown_81903E5:: @ 81903E5
ViridianCity_PokemonCenter_1F_Text_PokeCenterInEveryTown:: @ 81903E5
.string "There's a POKéMON CENTER in every\n"
.string "town ahead.\p"
.string "They charge no money, so don't\n"
.string "be shy about healing POKéMON.$"
gUnknown_8190450:: @ 8190450
ViridianCity_PokemonCenter_1F_Text_PokeCentersHealMons:: @ 8190450
.string "POKéMON CENTERS heal your tired,\n"
.string "hurt, or fainted POKéMON.\p"
.string "They make all POKéMON completely\n"
data/maps/ViridianForest/map.json
+13 -13
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianForest_EventScript_160529",
"script": "ViridianForest_EventScript_Youngster",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianForest_EventScript_160532",
"script": "ViridianForest_EventScript_Boy",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
"script": "ViridianForest_EventScript_160571",
"script": "ViridianForest_EventScript_Rick",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "ViridianForest_EventScript_160588",
"script": "ViridianForest_EventScript_Doug",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "ViridianForest_EventScript_16059F",
"script": "ViridianForest_EventScript_Sammy",
"flag": "0"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "ViridianForest_EventScript_1605B6",
"script": "ViridianForest_EventScript_Anthony",
"flag": "0"
},
{
@@ -140,7 +140,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "ViridianForest_EventScript_1605CD",
"script": "ViridianForest_EventScript_Charlie",
"flag": "0"
},
{
@@ -208,42 +208,42 @@
"x": 39,
"y": 59,
"elevation": 3,
"script": "ViridianForest_EventScript_16053B"
"script": "ViridianForest_EventScript_TrainerTips1"
},
{
"type": "bg_event_type_0",
"x": 43,
"y": 26,
"elevation": 0,
"script": "ViridianForest_EventScript_16054D"
"script": "ViridianForest_EventScript_TrainerTips3"
},
{
"type": "bg_event_type_0",
"x": 9,
"y": 29,
"elevation": 0,
"script": "ViridianForest_EventScript_160556"
"script": "ViridianForest_EventScript_TrainerTips4"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 12,
"elevation": 0,
"script": "ViridianForest_EventScript_160568"
"script": "ViridianForest_EventScript_ExitSign"
},
{
"type": "bg_event_type_0",
"x": 28,
"y": 44,
"elevation": 0,
"script": "ViridianForest_EventScript_160544"
"script": "ViridianForest_EventScript_TrainerTips2"
},
{
"type": "bg_event_type_0",
"x": 31,
"y": 60,
"elevation": 0,
"script": "ViridianForest_EventScript_16055F"
"script": "ViridianForest_EventScript_TrainerTips5"
},
{
"type": "hidden_item",
data/maps/ViridianForest/scripts.inc
+31 -31
View File
@@ -6,59 +6,59 @@ ViridianForest_OnTransition:: @ 8160525
setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_FOREST
end
ViridianForest_EventScript_160529:: @ 8160529
msgbox gUnknown_8172255, MSGBOX_NPC
ViridianForest_EventScript_Youngster:: @ 8160529
msgbox ViridianForest_Text_FriendsItchingToBattle, MSGBOX_NPC
end
ViridianForest_EventScript_160532:: @ 8160532
msgbox gUnknown_8172559, MSGBOX_NPC
ViridianForest_EventScript_Boy:: @ 8160532
msgbox ViridianForest_Text_RanOutOfPokeBalls, MSGBOX_NPC
end
ViridianForest_EventScript_16053B:: @ 816053B
msgbox gUnknown_81725C7, MSGBOX_SIGN
ViridianForest_EventScript_TrainerTips1:: @ 816053B
msgbox ViridianForest_Text_AvoidGrassyAreasWhenWeak, MSGBOX_SIGN
end
ViridianForest_EventScript_160544:: @ 8160544
msgbox gUnknown_8172629, MSGBOX_SIGN
ViridianForest_EventScript_TrainerTips2:: @ 8160544
msgbox ViridianForest_Text_UseAntidoteForPoison, MSGBOX_SIGN
end
ViridianForest_EventScript_16054D:: @ 816054D
msgbox gUnknown_817265C, MSGBOX_SIGN
ViridianForest_EventScript_TrainerTips3:: @ 816054D
msgbox ViridianForest_Text_ContactOakViaPCToRatePokedex, MSGBOX_SIGN
end
ViridianForest_EventScript_160556:: @ 8160556
msgbox gUnknown_81726A3, MSGBOX_SIGN
ViridianForest_EventScript_TrainerTips4:: @ 8160556
msgbox ViridianForest_Text_CantCatchOwnedMons, MSGBOX_SIGN
end
ViridianForest_EventScript_16055F:: @ 816055F
msgbox gUnknown_817271D, MSGBOX_SIGN
ViridianForest_EventScript_TrainerTips5:: @ 816055F
msgbox ViridianForest_Text_WeakenMonsBeforeCapture, MSGBOX_SIGN
end
ViridianForest_EventScript_160568:: @ 8160568
msgbox gUnknown_8172773, MSGBOX_SIGN
ViridianForest_EventScript_ExitSign:: @ 8160568
msgbox ViridianForest_Text_LeavingViridianForest, MSGBOX_SIGN
end
ViridianForest_EventScript_160571:: @ 8160571
trainerbattle_single TRAINER_BUG_CATCHER_RICK, Text_1722C7, Text_1722F9
msgbox gUnknown_8172315, MSGBOX_AUTOCLOSE
ViridianForest_EventScript_Rick:: @ 8160571
trainerbattle_single TRAINER_BUG_CATCHER_RICK, ViridianForest_Text_RickIntro, ViridianForest_Text_RickDefeat
msgbox ViridianForest_Text_RickPostBattle, MSGBOX_AUTOCLOSE
end
ViridianForest_EventScript_160588:: @ 8160588
trainerbattle_single TRAINER_BUG_CATCHER_DOUG, Text_17234A, Text_17237D
msgbox gUnknown_8172398, MSGBOX_AUTOCLOSE
ViridianForest_EventScript_Doug:: @ 8160588
trainerbattle_single TRAINER_BUG_CATCHER_DOUG, ViridianForest_Text_DougIntro, ViridianForest_Text_DougDefeat
msgbox ViridianForest_Text_DougPostBattle, MSGBOX_AUTOCLOSE
end
ViridianForest_EventScript_16059F:: @ 816059F
trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, Text_1723D4, Text_172402
msgbox gUnknown_817241F, MSGBOX_AUTOCLOSE
ViridianForest_EventScript_Sammy:: @ 816059F
trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, ViridianForest_Text_SammyIntro, ViridianForest_Text_SammyDefeat
msgbox ViridianForest_Text_SammyPostBattle, MSGBOX_AUTOCLOSE
end
ViridianForest_EventScript_1605B6:: @ 81605B6
trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, Text_172482, Text_1724BF
msgbox gUnknown_81724DC, MSGBOX_AUTOCLOSE
ViridianForest_EventScript_Anthony:: @ 81605B6
trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, ViridianForest_Text_AnthonyIntro, ViridianForest_Text_AnthonyDefeat
msgbox ViridianForest_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE
end
ViridianForest_EventScript_1605CD:: @ 81605CD
trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, Text_1724F9, Text_17251B
msgbox gUnknown_8172527, MSGBOX_AUTOCLOSE
ViridianForest_EventScript_Charlie:: @ 81605CD
trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, ViridianForest_Text_CharlieIntro, ViridianForest_Text_CharlieDefeat
msgbox ViridianForest_Text_CharliePostBattle, MSGBOX_AUTOCLOSE
end
data/maps/ViridianForest/text.inc
+23 -23
View File
@@ -1,105 +1,105 @@
gUnknown_8172255:: @ 8172255
ViridianForest_Text_FriendsItchingToBattle:: @ 8172255
.string "I came here with some friends to\n"
.string "catch us some BUG POKéMON!\p"
.string "They're all itching to get into\n"
.string "some POKéMON battles!$"
Text_1722C7:: @ 81722C7
ViridianForest_Text_RickIntro:: @ 81722C7
.string "Hey! You have POKéMON!\n"
.string "Come on!\l"
.string "Let's battle 'em!$"
Text_1722F9:: @ 81722F9
ViridianForest_Text_RickDefeat:: @ 81722F9
.string "No!\nCATERPIE can't hack it!$"
gUnknown_8172315:: @ 8172315
ViridianForest_Text_RickPostBattle:: @ 8172315
.string "Ssh! You'll scare the bugs away.\n"
.string "Another time, okay?$"
Text_17234A:: @ 817234A
ViridianForest_Text_DougIntro:: @ 817234A
.string "Yo!\n"
.string "You can't jam out if you're a\l"
.string "POKéMON TRAINER!$"
Text_17237D:: @ 817237D
ViridianForest_Text_DougDefeat:: @ 817237D
.string "Huh?\n"
.string "I ran out of POKéMON!$"
gUnknown_8172398:: @ 8172398
ViridianForest_Text_DougPostBattle:: @ 8172398
.string "That totally stinks! I'm going to\n"
.string "catch some stronger ones!$"
Text_1723D4:: @ 81723D4
ViridianForest_Text_SammyIntro:: @ 81723D4
.string "Hey, wait up!\n"
.string "What's the hurry? Why the rush?$"
Text_172402:: @ 8172402
ViridianForest_Text_SammyDefeat:: @ 8172402
.string "I give!\n"
.string "You're good at this!$"
gUnknown_817241F:: @ 817241F
ViridianForest_Text_SammyPostBattle:: @ 817241F
.string "Sometimes, you can find stuff on\n"
.string "the ground.\p"
.string "I'm looking for the stuff I\n"
.string "dropped. Can you help me?$"
Text_172482:: @ 8172482
ViridianForest_Text_AnthonyIntro:: @ 8172482
.string "I might be little, but I won't like\n"
.string "it if you go easy on me!$"
Text_1724BF:: @ 81724BF
ViridianForest_Text_AnthonyDefeat:: @ 81724BF
.string "Oh, boo.\n"
.string "Nothing went right.$"
gUnknown_81724DC:: @ 81724DC
ViridianForest_Text_AnthonyPostBattle:: @ 81724DC
.string "I lost some of my allowance…$"
Text_1724F9:: @ 81724F9
ViridianForest_Text_CharlieIntro:: @ 81724F9
.string "Did you know that POKéMON evolve?$"
Text_17251B:: @ 817251B
ViridianForest_Text_CharlieDefeat:: @ 817251B
.string "Oh!\n"
.string "I lost!$"
gUnknown_8172527:: @ 8172527
ViridianForest_Text_CharliePostBattle:: @ 8172527
.string "BUG POKéMON evolve quickly.\n"
.string "They're a lot of fun!$"
gUnknown_8172559:: @ 8172559
ViridianForest_Text_RanOutOfPokeBalls:: @ 8172559
.string "I was throwing POKé BALLS to\n"
.string "catch POKéMON, and I ran out.\p"
.string "That's why you can never have too\n"
.string "many POKé BALLS.$"
gUnknown_81725C7:: @ 81725C7
ViridianForest_Text_AvoidGrassyAreasWhenWeak:: @ 81725C7
.string "TRAINER TIPS\p"
.string "If your POKéMON are weak and you\n"
.string "want to avoid battles, stay away\l"
.string "from grassy areas!$"
gUnknown_8172629:: @ 8172629
ViridianForest_Text_UseAntidoteForPoison:: @ 8172629
.string "For poison, use ANTIDOTE!\n"
.string "Get it at POKéMON MARTS!$"
gUnknown_817265C:: @ 817265C
ViridianForest_Text_ContactOakViaPCToRatePokedex:: @ 817265C
.string "TRAINER TIPS\p"
.string "Contact PROF. OAK via a PC to\n"
.string "get your POKéDEX evaluated!$"
gUnknown_81726A3:: @ 81726A3
ViridianForest_Text_CantCatchOwnedMons:: @ 81726A3
.string "TRAINER TIPS\p"
.string "You can't catch a POKéMON that\n"
.string "belongs to someone else.\p"
.string "Throw POKé BALLS only at wild\n"
.string "POKéMON to catch them!$"
gUnknown_817271D:: @ 817271D
ViridianForest_Text_WeakenMonsBeforeCapture:: @ 817271D
.string "TRAINER TIPS\p"
.string "Weaken POKéMON before attempting\n"
.string "capture!\p"
.string "When healthy, they may escape!$"
gUnknown_8172773:: @ 8172773
ViridianForest_Text_LeavingViridianForest:: @ 8172773
.string "LEAVING VIRIDIAN FOREST\n"
.string "PEWTER CITY AHEAD$"
data/scripts/aide.inc
+14
View File
@@ -0,0 +1,14 @@
Aide_EventScript_HaventCaughtEnough:: @ 81A7ABD
msgbox Aide_Text_HaventCaughtEnoughMonsForItem
release
end
Aide_EventScript_NoRoomForItem:: @ 81A7AC7
msgbox Aide_Text_DontHaveAnyRoomForItem
release
end
Aide_EventScript_DeclineCheckMons:: @ 81A7AD1
msgbox Aide_Text_GetEnoughMonsComeBackForItem
release
end
data/scripts/fame_checker.inc
+4 -4
View File
@@ -1,10 +1,10 @@
ViridianCity_House2_EventScript_1ACD65:: @ 81ACD65
ViridianCity_House2_EventScript_PokemonJournal:: @ 81ACD65
lock
faceplayer
famechecker FAMECHECKER_OAK, 3
famechecker FAMECHECKER_DAISY, 3
textcolor 3
msgbox gUnknown_81B1AB9
msgbox PokemonJournal_Text_SpecialFeatureProfOak
release
end
@@ -14,7 +14,7 @@ EventScript_1ACD8D:: @ 81ACD8D
famechecker FAMECHECKER_DAISY, 1
famechecker FAMECHECKER_OAK, 4
textcolor 3
msgbox gUnknown_81B1AB9
msgbox PokemonJournal_Text_SpecialFeatureProfOak
release
end
@@ -23,7 +23,7 @@ EventScript_1ACDB5:: @ 81ACDB5
faceplayer
famechecker FAMECHECKER_DAISY, 4
textcolor 3
msgbox gUnknown_81B1AB9
msgbox PokemonJournal_Text_SpecialFeatureProfOak
release
end
data/text/aide.inc
+15
View File
@@ -0,0 +1,15 @@
Aide_Text_HaventCaughtEnoughMonsForItem:: @ 81A58A7
.string "Let's see…\n"
.string "Uh-oh! You have caught only\l"
.string "{STR_VAR_3} kinds of POKéMON!\p"
.string "You need {STR_VAR_1} kinds\n"
.string "if you want the {STR_VAR_2}.$"
Aide_Text_GetEnoughMonsComeBackForItem:: @ 81A5909
.string "…Oh. I see.\p"
.string "When you get {STR_VAR_1} kinds of POKéMON,\n"
.string "come back for the {STR_VAR_2}.$"
Aide_Text_DontHaveAnyRoomForItem:: @ 81A594D
.string "Oh! I see you don't have any\n"
.string "room for the {STR_VAR_2}.$"
data/text/fame_checker.inc
+1 -1
View File
@@ -1461,7 +1461,7 @@ gUnknown_81B1A31:: @ 81B1A31
.string "be the elder of a famous clan of\l"
.string "dragon masters.$"
gUnknown_81B1AB9:: @ 81B1AB9
PokemonJournal_Text_SpecialFeatureProfOak:: @ 81B1AB9
.string "POKéMON JOURNAL\p"
.string "Special Feature: PROF. OAK,\n"
.string "the POKéMON Researcher!\p"
include/battle_setup.h
+1 -1
View File
@@ -19,7 +19,7 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerSc
bool32 GetTrainerFlagFromScriptPointer(const u8 *data);
void SetUpTrainerMovement(void);
u8 ScrSpecial_GetTrainerBattleMode(void);
u16 sub_80803D8(void);
u16 GetRivalBattleFlags(void);
u16 ScrSpecial_HasTrainerBeenFought(void);
void SetBattledTrainerFlag(void);
bool8 HasTrainerBeenFought(u16 trainerId);
include/constants/battle.h
+3
View File
@@ -81,6 +81,9 @@
#define IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && !((flags) & BATTLE_TYPE_GHOST_UNVEILED))
#define IS_BATTLE_TYPE_GHOST_WITH_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && (flags) & BATTLE_TYPE_GHOST_UNVEILED)
#define RIVAL_BATTLE_HEAL_AFTER 1
#define RIVAL_BATTLE_TUTORIAL 3
// Battle Outcome defines
#define B_OUTCOME_WON 0x1
#define B_OUTCOME_LOST 0x2
include/constants/battle_setup.h
+1 -1
View File
@@ -10,6 +10,6 @@
#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6
#define TRAINER_BATTLE_REMATCH_DOUBLE 7
#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC 8
#define TRAINER_BATTLE_TUTORIAL 9
#define TRAINER_BATTLE_EARLY_RIVAL 9
#endif // GUARD_CONSTANTS_BATTLE_SETUP_H
include/constants/metatile_labels.h
+4
View File
@@ -4,6 +4,10 @@
// General
#define METATILE_General_CalmWater 0x12B
// PokeMart
#define METATILE_Shop_CounterMid_Top 0x2BF
#define METATILE_Shop_CounterMid_Bottom 0x2C0
// Vermilion Gym
#define METATILE_VermilionGym_Floor 0x281
#define METATILE_VermilionGym_Beam_MidTop 0x285
include/constants/object_events.h
+1 -1
View File
@@ -35,7 +35,7 @@
#define OBJECT_EVENT_GFX_WOMAN_3 31
#define OBJECT_EVENT_GFX_OLD_MAN_1 32
#define OBJECT_EVENT_GFX_OLD_MAN_2 33
#define OBJECT_EVENT_GFX_VIRIDIAN_DRUNK 34
#define OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN 34
#define OBJECT_EVENT_GFX_OLD_WOMAN 35
#define OBJECT_EVENT_GFX_TUBER_M_1 36
#define OBJECT_EVENT_GFX_TUBER_F 37
src/battle_main.c
+5 -4
View File
@@ -50,6 +50,7 @@
#include "cable_club.h"
#include "constants/abilities.h"
#include "constants/battle_move_effects.h"
#include "constants/battle_setup.h"
#include "constants/hold_effects.h"
#include "constants/items.h"
#include "constants/moves.h"
@@ -3716,12 +3717,12 @@ static void HandleEndTurn_BattleLost(void)
}
else
{
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == 9)
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL)
{
if (sub_80803D8() & 1)
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
if (GetRivalBattleFlags() & RIVAL_BATTLE_HEAL_AFTER)
gBattleCommunication[MULTISTRING_CHOOSER] = 1; // Dont do white out text
else
gBattleCommunication[MULTISTRING_CHOOSER] = 2;
gBattleCommunication[MULTISTRING_CHOOSER] = 2; // Do white out text
gBattlerAttacker = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
}
else
src/battle_setup.c
+13 -14
View File
@@ -78,7 +78,7 @@ static EWRAM_DATA u8 *sTrainerVictorySpeech = NULL;
static EWRAM_DATA u8 *sTrainerCannotBattleSpeech = NULL;
static EWRAM_DATA u8 *sTrainerBattleEndScript = NULL;
static EWRAM_DATA u8 *sTrainerABattleScriptRetAddr = NULL;
static EWRAM_DATA u16 gUnknown_20386CC = 0;
static EWRAM_DATA u16 sRivalBattleFlags = 0;
static const u8 sBattleTransitionTable_Wild[][2] =
{
@@ -148,11 +148,11 @@ static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] =
{&sTrainerBattleEndScript, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
};
static const struct TrainerBattleParameter sTutorialBattleParams[] =
static const struct TrainerBattleParameter sEarlyRivalBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
{&gUnknown_20386CC, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sRivalBattleFlags, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
@@ -706,7 +706,7 @@ static void InitTrainerBattleVariables(void)
sTrainerCannotBattleSpeech = NULL;
sTrainerBattleEndScript = NULL;
sTrainerABattleScriptRetAddr = NULL;
gUnknown_20386CC = 0;
sRivalBattleFlags = 0;
}
static inline void SetU8(void *ptr, u8 value)
@@ -808,8 +808,8 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
SetMapVarsToTrainer();
gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A);
return EventScript_TryDoRematchBattle;
case TRAINER_BATTLE_TUTORIAL:
TrainerBattleLoadArgs(sTutorialBattleParams, data);
case TRAINER_BATTLE_EARLY_RIVAL:
TrainerBattleLoadArgs(sEarlyRivalBattleParams, data);
return EventScript_DoTrainerBattle;
default:
TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
@@ -846,9 +846,9 @@ u8 ScrSpecial_GetTrainerBattleMode(void)
return sTrainerBattleMode;
}
u16 sub_80803D8(void)
u16 GetRivalBattleFlags(void)
{
return gUnknown_20386CC;
return sRivalBattleFlags;
}
u16 ScrSpecial_HasTrainerBeenFought(void)
@@ -885,8 +885,7 @@ void ClearTrainerFlag(u16 trainerId)
void BattleSetup_StartTrainerBattle(void)
{
gBattleTypeFlags = BATTLE_TYPE_TRAINER;
if (ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_TUTORIAL
&& sub_80803D8() & 3)
if (ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL && GetRivalBattleFlags() & RIVAL_BATTLE_TUTORIAL)
gBattleTypeFlags |= BATTLE_TYPE_FIRST_BATTLE;
gMain.savedCallback = CB2_EndTrainerBattle;
DoTrainerBattle();
@@ -895,12 +894,12 @@ void BattleSetup_StartTrainerBattle(void)
static void CB2_EndTrainerBattle(void)
{
if (sTrainerBattleMode == TRAINER_BATTLE_TUTORIAL)
if (sTrainerBattleMode == TRAINER_BATTLE_EARLY_RIVAL)
{
if (IsPlayerDefeated(gBattleOutcome) == TRUE)
{
gSpecialVar_Result = 1;
if (gUnknown_20386CC & 1)
gSpecialVar_Result = TRUE;
if (sRivalBattleFlags & RIVAL_BATTLE_HEAL_AFTER)
{
HealPlayerParty();
}
@@ -915,7 +914,7 @@ static void CB2_EndTrainerBattle(void)
}
else
{
gSpecialVar_Result = 0;
gSpecialVar_Result = FALSE;
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
SetBattledTrainerFlag();
sub_81139BC();