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

Document some misc small scripts

Browse Source
This commit is contained in:
GriffinR
2020-01-20 15:17:34 -05:00
parent 055e5d2bbf
commit 2908c9fa95
53 changed files with 871 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/DiglettsCave_NorthEntrance/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "DiglettsCave_NorthEntrance_EventScript_160EE8",
"script": "DiglettsCave_NorthEntrance_EventScript_Hiker",
"flag": "0"
}
],
data/maps/DiglettsCave_NorthEntrance/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7
.byte 0
DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8
msgbox gUnknown_817462C, MSGBOX_NPC
DiglettsCave_NorthEntrance_EventScript_Hiker:: @ 8160EE8
msgbox DiglettsCave_NorthEntrance_RockTunnelPitchBlack, MSGBOX_NPC
end
data/maps/DiglettsCave_NorthEntrance/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_817462C:: @ 817462C
DiglettsCave_NorthEntrance_RockTunnelPitchBlack:: @ 817462C
.string "I went inside ROCK TUNNEL, but it's\n"
.string "pitch-black and scary in there.\p"
.string "If I could get a POKéMON to use\n"
data/maps/DiglettsCave_SouthEntrance/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "DiglettsCave_SouthEntrance_EventScript_160EFC",
"script": "DiglettsCave_SouthEntrance_EventScript_OldMan",
"flag": "0"
}
],
data/maps/DiglettsCave_SouthEntrance/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB
.byte 0
DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC
msgbox gUnknown_81746A7, MSGBOX_NPC
DiglettsCave_SouthEntrance_EventScript_OldMan:: @ 8160EFC
msgbox DiglettsCave_SouthEntrance_Text_DiglettDugThisTunnel, MSGBOX_NPC
end
data/maps/DiglettsCave_SouthEntrance/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_81746A7:: @ 81746A7
DiglettsCave_SouthEntrance_Text_DiglettDugThisTunnel:: @ 81746A7
.string "Well, isn't this a surprise!\n"
.string "DIGLETT dug this long tunnel!\p"
.string "It goes right to VIRIDIAN CITY,\n"
data/maps/FourIsland/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_EventScript_167D55",
"script": "FourIsland_EventScript_DaycareMan",
"flag": "0"
},
{
data/maps/FourIsland/scripts.inc
+25 -25
View File
@@ -69,66 +69,66 @@ Movement_167D52:: @ 8167D52
walk_in_place_fastest_right
step_end
FourIsland_EventScript_167D55:: @ 8167D55
FourIsland_EventScript_DaycareMan:: @ 8167D55
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
special GetDaycareMonNicknames
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 1
goto_if_eq EventScript_167D9B
compare VAR_RESULT, 2
goto_if_eq EventScript_167E0C
compare VAR_RESULT, 3
goto_if_eq EventScript_167E19
msgbox gUnknown_81BF555
compare VAR_RESULT, DAYCARE_EGG_WAITING
goto_if_eq FourIsland_EventScript_DaycareEggWaiting
compare VAR_RESULT, DAYCARE_ONE_MON
goto_if_eq FourIsland_EventScript_CheckOnOneMon
compare VAR_RESULT, DAYCARE_TWO_MONS
goto_if_eq FourIsland_EventScript_CheckOnTwoMons
msgbox DayCare_Text_ImDaycareManSpeakToMyWife
release
end
EventScript_167D9B:: @ 8167D9B
msgbox gUnknown_81BF5E3, MSGBOX_YESNO
FourIsland_EventScript_DaycareEggWaiting:: @ 8167D9B
msgbox DayCare_Text_DoYouWantEgg, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_167DD1
msgbox gUnknown_81BF7B6, MSGBOX_YESNO
goto_if_eq FourIsland_EventScript_DaycareAcceptEgg
msgbox DayCare_Text_IWillKeepDoYouWantIt, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_167DD1
msgbox gUnknown_81BF6CF
goto_if_eq FourIsland_EventScript_DaycareAcceptEgg
msgbox DayCare_Text_IllKeepIt
clearflag FLAG_PENDING_DAYCARE_EGG
special RejectEggFromDayCare
release
end
EventScript_167DD1:: @ 8167DD1
FourIsland_EventScript_DaycareAcceptEgg:: @ 8167DD1
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, 6
goto_if_ne EventScript_167DEB
msgbox gUnknown_81BF6F0
compare VAR_RESULT, PARTY_SIZE
goto_if_ne FourIsland_EventScript_DaycareReceivedEgg
msgbox DayCare_Text_YouHaveNoRoomForIt
release
end
EventScript_167DEB:: @ 8167DEB
FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB
textcolor 3
message Text_1BF72A
message DayCare_Text_ReceivedEgg
call EventScript_1A6675
playfanfare MUS_FANFA1
waitfanfare
waitbuttonpress
msgbox gUnknown_81BF755
msgbox DayCare_Text_TakeGoodCareOfIt
special GiveEggFromDaycare
clearflag FLAG_PENDING_DAYCARE_EGG
release
end
EventScript_167E0C:: @ 8167E0C
FourIsland_EventScript_CheckOnOneMon:: @ 8167E0C
special GetDaycareMonNicknames
msgbox gUnknown_81BF69A
msgbox DayCare_Text_YourMonIsDoingFine
release
end
EventScript_167E19:: @ 8167E19
FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19
special GetDaycareMonNicknames
msgbox gUnknown_81BF789
msgbox DayCare_Text_YourMonsAreDoingFine
special SetDaycareCompatibilityString
special Special_ShowStringVar4AsFieldMessage
waitmessage
data/maps/FourIsland_PokemonDayCare/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_PokemonDayCare_EventScript_171940",
"script": "FourIsland_PokemonDayCare_EventScript_DaycareWoman",
"flag": "0"
}
],
data/maps/FourIsland_PokemonDayCare/scripts.inc
+88 -86
View File
@@ -1,164 +1,164 @@
FourIsland_PokemonDayCare_MapScripts:: @ 817193F
.byte 0
FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940
FourIsland_PokemonDayCare_EventScript_DaycareWoman:: @ 8171940
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 1
goto_if_eq EventScript_171A2E
compare VAR_RESULT, 2
goto_if_eq EventScript_171A52
compare VAR_RESULT, 3
goto_if_eq EventScript_171B86
msgbox gUnknown_81BF7E4, MSGBOX_YESNO
compare VAR_RESULT, DAYCARE_EGG_WAITING
goto_if_eq FourIsland_PokemonDayCare_EggWaiting
compare VAR_RESULT, DAYCARE_ONE_MON
goto_if_eq FourIsland_PokemonDayCare_OneMonInDaycare
compare VAR_RESULT, DAYCARE_TWO_MONS
goto_if_eq FourIsland_PokemonDayCare_TwoMonsInDaycare
msgbox DayCare_Text_WouldYouLikeUsToRaiseMon, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_171993
msgbox gUnknown_81BF916
goto_if_eq FourIsland_PokemonDayCare_GiveMonToRaise
msgbox DayCare_Text_FineThenComeAgain
release
end
EventScript_171993:: @ 8171993
FourIsland_PokemonDayCare_GiveMonToRaise:: @ 8171993
specialvar VAR_RESULT, CountPartyNonEggMons
compare VAR_RESULT, 1
goto_if_eq EventScript_171A1A
msgbox gUnknown_81BF839
goto_if_eq FourIsland_PokemonDayCare_OnlyOneMonInParty
msgbox DayCare_Text_WhichMonShouldWeRaise
fadescreen FADE_TO_BLACK
special ChooseSendDaycareMon
waitstate
compare VAR_0x8004, 6
goto_if_ge EventScript_1719F7
compare VAR_0x8004, PARTY_SIZE
goto_if_ge FourIsland_PokemonDayCare_ComeAgain
specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
compare VAR_RESULT, 0
goto_if_eq EventScript_171A24
specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
goto_if_eq FourIsland_PokemonDayCare_OnlyOneAliveMonInParty
specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies
waitse
playmoncry VAR_0x8005, 0
msgbox gUnknown_81BF860
msgbox DayCare_Text_WellRaiseYourMon
waitmoncry
special StoreSelectedPokemonInDaycare
incrementgamestat GAME_STAT_USED_DAYCARE
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 2
goto_if_eq EventScript_171A01
compare VAR_RESULT, DAYCARE_ONE_MON
goto_if_eq FourIsland_PokemonDayCare_CanRaiseOneMore
release
end
EventScript_1719F7:: @ 81719F7
msgbox gUnknown_81BF976
FourIsland_PokemonDayCare_ComeAgain:: @ 81719F7
msgbox DayCare_Text_ComeAgain
release
end
EventScript_171A01:: @ 8171A01
msgbox gUnknown_81BF89F, MSGBOX_YESNO
FourIsland_PokemonDayCare_CanRaiseOneMore:: @ 8171A01
msgbox DayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_171993
goto EventScript_1719F7
goto_if_eq FourIsland_PokemonDayCare_GiveMonToRaise
goto FourIsland_PokemonDayCare_ComeAgain
end
EventScript_171A1A:: @ 8171A1A
msgbox gUnknown_81BFAAD
FourIsland_PokemonDayCare_OnlyOneMonInParty:: @ 8171A1A
msgbox DayCare_Text_YouHaveJustOneMon
release
end
EventScript_171A24:: @ 8171A24
msgbox gUnknown_81BFB09
FourIsland_PokemonDayCare_OnlyOneAliveMonInParty:: @ 8171A24
msgbox DayCare_Text_WhatWillYouBattleWith
release
end
EventScript_171A2E:: @ 8171A2E
msgbox gUnknown_81BF8F6
FourIsland_PokemonDayCare_EggWaiting:: @ 8171A2E
msgbox DayCare_Text_HusbandWasLookingForYou
release
end
EventScript_171A38:: @ 8171A38
msgbox gUnknown_81BF9CC
FourIsland_PokemonDayCare_MonHasGrownXLevels:: @ 8171A38
msgbox DayCare_Text_YourMonHasGrownXLevels
return
EventScript_171A41:: @ 8171A41
FourIsland_PokemonDayCare_DisplayLevelsGained:: @ 8171A41
specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
compare VAR_RESULT, 0
call_if_ne EventScript_171A38
call_if_ne FourIsland_PokemonDayCare_MonHasGrownXLevels
return
EventScript_171A52:: @ 8171A52
msgbox gUnknown_81BF988
FourIsland_PokemonDayCare_OneMonInDaycare:: @ 8171A52
msgbox DayCare_Text_GoodToSeeYou
setvar VAR_0x8004, 0
call EventScript_171A41
msgbox gUnknown_81BF89F, MSGBOX_YESNO
call FourIsland_PokemonDayCare_DisplayLevelsGained
msgbox DayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_171993
msgbox gUnknown_81BFAE8, MSGBOX_YESNO
goto_if_eq FourIsland_PokemonDayCare_GiveMonToRaise
msgbox DayCare_Text_TakeYourMonBack, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_171A90
goto EventScript_1719F7
goto_if_eq FourIsland_PokemonDayCare_TryRetrieveMon
goto FourIsland_PokemonDayCare_ComeAgain
end
EventScript_171A90:: @ 8171A90
FourIsland_PokemonDayCare_TryRetrieveMon:: @ 8171A90
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, 6
goto_if_eq EventScript_171B67
compare VAR_RESULT, PARTY_SIZE
goto_if_eq FourIsland_PokemonDayCare_NoRoomInParty
specialvar VAR_RESULT, GetDaycareState
setvar VAR_0x8004, 0
compare VAR_RESULT, 2
goto_if_eq EventScript_171ACF
compare VAR_RESULT, DAYCARE_ONE_MON
goto_if_eq FourIsland_PokemonDayCare_CostPrompt
special ShowDaycareLevelMenu
waitstate
copyvar VAR_0x8004, VAR_RESULT
compare VAR_RESULT, 2
goto_if_eq EventScript_1719F7
goto EventScript_171ACF
compare VAR_RESULT, DAYCARE_EXITED_LEVEL_MENU
goto_if_eq FourIsland_PokemonDayCare_ComeAgain
goto FourIsland_PokemonDayCare_CostPrompt
end
EventScript_171ACF:: @ 8171ACF
FourIsland_PokemonDayCare_CostPrompt:: @ 8171ACF
special GetDaycareCost
msgbox gUnknown_81BFA3B, MSGBOX_YESNO
msgbox DayCare_Text_ItWillCostX, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_171AEB
goto EventScript_1719F7
goto_if_eq FourIsland_PokemonDayCare_CheckEnoughMoney
goto FourIsland_PokemonDayCare_ComeAgain
end
EventScript_171AEB:: @ 8171AEB
FourIsland_PokemonDayCare_CheckEnoughMoney:: @ 8171AEB
specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
compare VAR_RESULT, 1
goto_if_eq EventScript_171B05
msgbox gUnknown_81BF932
compare VAR_RESULT, TRUE
goto_if_eq FourIsland_PokemonDayCare_RetrieveMon
msgbox DayCare_Text_NotEnoughMoney
release
end
EventScript_171B05:: @ 8171B05
applymovement 1, Movement_171B71
FourIsland_PokemonDayCare_RetrieveMon:: @ 8171B05
applymovement 1, FourIsland_PokemonDayCare_Movement_RetrieveMon
waitmovement 0
specialvar VAR_RESULT, TakePokemonFromDaycare
special SubtractMoneyFromVar0x8005
playse SE_REGI
msgbox gUnknown_81BFA67
msgbox DayCare_Text_HeresYourMon
waitse
playmoncry VAR_RESULT, 0
textcolor 3
msgbox gUnknown_81BFA85
msgbox DayCare_Text_TookBackMon
call EventScript_1A6675
waitmoncry
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 2
goto_if_eq EventScript_171B4E
goto EventScript_1719F7
compare VAR_RESULT, DAYCARE_ONE_MON
goto_if_eq FourIsland_PokemonDayCare_AskRetrieveOtherMon
goto FourIsland_PokemonDayCare_ComeAgain
end
EventScript_171B4E:: @ 8171B4E
msgbox gUnknown_81BF94F, MSGBOX_YESNO
FourIsland_PokemonDayCare_AskRetrieveOtherMon:: @ 8171B4E
msgbox DayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_171A90
goto EventScript_1719F7
goto_if_eq FourIsland_PokemonDayCare_TryRetrieveMon
goto FourIsland_PokemonDayCare_ComeAgain
end
EventScript_171B67:: @ 8171B67
msgbox gUnknown_81BF9EF
FourIsland_PokemonDayCare_NoRoomInParty:: @ 8171B67
msgbox DayCare_Text_YourPartyIsFull
release
end
Movement_171B71:: @ 8171B71
FourIsland_PokemonDayCare_Movement_RetrieveMon:: @ 8171B71
delay_16
delay_16
face_right
@@ -180,30 +180,32 @@ Movement_171B71:: @ 8171B71
walk_slowest_down
step_end
EventScript_171B85:: @ 8171B85
@ Unused. Possibly a commented script, or a typo end added to the above Movement script
FourIsland_PokemonDayCare_EventScript_UnusedEnd:: @ 8171B85
end
EventScript_171B86:: @ 8171B86
msgbox gUnknown_81BF988
FourIsland_PokemonDayCare_TwoMonsInDaycare:: @ 8171B86
msgbox DayCare_Text_GoodToSeeYou
setvar VAR_0x8004, 0
call EventScript_171A41
call FourIsland_PokemonDayCare_DisplayLevelsGained
setvar VAR_0x8004, 1
call EventScript_171A41
msgbox gUnknown_81BFAE8, MSGBOX_YESNO
call FourIsland_PokemonDayCare_DisplayLevelsGained
msgbox DayCare_Text_TakeYourMonBack, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_171A90
msgbox gUnknown_81BF976
goto_if_eq FourIsland_PokemonDayCare_TryRetrieveMon
msgbox DayCare_Text_ComeAgain
release
end
EventScript_171BBF:: @ 8171BBF
@ Unused
FourIsland_PokemonDayCare_EventScript_UnusedRetrieveMon:: @ 8171BBF
special ShowDaycareLevelMenu
waitstate
compare VAR_RESULT, 2
goto_if_eq EventScript_1719F7
goto_if_eq FourIsland_PokemonDayCare_ComeAgain
copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, TakePokemonFromDaycare
msgbox gUnknown_81BFA67
msgbox gUnknown_81BF976
msgbox DayCare_Text_HeresYourMon
msgbox DayCare_Text_ComeAgain
release
end
data/maps/Route22_NorthEntrance/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": "Route22_NorthEntrance_EventScript_1704FC",
"script": "Route22_NorthEntrance_EventScript_BoulderBadgeGuard",
"flag": "0"
}
],
@@ -65,7 +65,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 0,
"script": "Route22_NorthEntrance_EventScript_17050D"
"script": "Route22_NorthEntrance_EventScript_BoulderBadgeGuardTrigger"
}
],
"bg_events": []
data/maps/Route22_NorthEntrance/scripts.inc
+6 -6
View File
@@ -1,18 +1,18 @@
Route22_NorthEntrance_MapScripts:: @ 81704FB
.byte 0
Route22_NorthEntrance_EventScript_1704FC:: @ 81704FC
Route22_NorthEntrance_EventScript_BoulderBadgeGuard:: @ 81704FC
lock
faceplayer
setvar VAR_TEMP_1, 1
getstdstring 0, 15
goto EventScript_1A7803
getstdstring 0, STDSTRING_BOULDER_BADGE
goto Route22_NorthEntrance_EventScript_BadgeGuard
end
Route22_NorthEntrance_EventScript_17050D:: @ 817050D
Route22_NorthEntrance_EventScript_BoulderBadgeGuardTrigger:: @ 817050D
lockall
setvar VAR_TEMP_1, 1
setvar VAR_0x8009, 1
getstdstring 0, 15
goto EventScript_1A796E
getstdstring 0, STDSTRING_BOULDER_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
data/maps/Route23/map.json
+50 -50
View File
@@ -34,7 +34,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route23_EventScript_16850C",
"script": "Route23_EventScript_CascadeBadgeGuard",
"flag": "0"
},
{
@@ -47,7 +47,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route23_EventScript_16851D",
"script": "Route23_EventScript_ThunderBadgeGuard",
"flag": "0"
},
{
@@ -60,7 +60,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route23_EventScript_16852E",
"script": "Route23_EventScript_RainbowBadgeGuard",
"flag": "0"
},
{
@@ -73,7 +73,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route23_EventScript_16853F",
"script": "Route23_EventScript_SoulBadgeGuard",
"flag": "0"
},
{
@@ -86,7 +86,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route23_EventScript_168550",
"script": "Route23_EventScript_MarshBadgeGuard",
"flag": "0"
},
{
@@ -99,7 +99,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route23_EventScript_168561",
"script": "Route23_EventScript_VolcanoBadgeGuard",
"flag": "0"
},
{
@@ -112,7 +112,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route23_EventScript_168572",
"script": "Route23_EventScript_EarthBadgeGuard",
"flag": "0"
}
],
@@ -154,7 +154,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 1,
"script": "Route23_EventScript_168583"
"script": "Route23_EventScript_CascadeBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -163,7 +163,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 2,
"script": "Route23_EventScript_168598"
"script": "Route23_EventScript_ThunderBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -172,7 +172,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 3,
"script": "Route23_EventScript_1685AD"
"script": "Route23_EventScript_RainbowBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -181,7 +181,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 4,
"script": "Route23_EventScript_1685C2"
"script": "Route23_EventScript_SoulBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -190,7 +190,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 5,
"script": "Route23_EventScript_1685D7"
"script": "Route23_EventScript_MarshBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -199,7 +199,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 6,
"script": "Route23_EventScript_1685EC"
"script": "Route23_EventScript_VolcanoBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -208,7 +208,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 7,
"script": "Route23_EventScript_168601"
"script": "Route23_EventScript_EarthBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -217,7 +217,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 7,
"script": "Route23_EventScript_168601"
"script": "Route23_EventScript_EarthBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -226,7 +226,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 7,
"script": "Route23_EventScript_168601"
"script": "Route23_EventScript_EarthBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -235,7 +235,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 7,
"script": "Route23_EventScript_168601"
"script": "Route23_EventScript_EarthBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -244,7 +244,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 7,
"script": "Route23_EventScript_168601"
"script": "Route23_EventScript_EarthBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -253,7 +253,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 7,
"script": "Route23_EventScript_168601"
"script": "Route23_EventScript_EarthBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -262,7 +262,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 7,
"script": "Route23_EventScript_168601"
"script": "Route23_EventScript_EarthBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -271,7 +271,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 7,
"script": "Route23_EventScript_168601"
"script": "Route23_EventScript_EarthBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -280,7 +280,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 6,
"script": "Route23_EventScript_1685EC"
"script": "Route23_EventScript_VolcanoBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -289,7 +289,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 6,
"script": "Route23_EventScript_1685EC"
"script": "Route23_EventScript_VolcanoBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -298,7 +298,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 6,
"script": "Route23_EventScript_1685EC"
"script": "Route23_EventScript_VolcanoBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -307,7 +307,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 5,
"script": "Route23_EventScript_1685D7"
"script": "Route23_EventScript_MarshBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -316,7 +316,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 5,
"script": "Route23_EventScript_1685D7"
"script": "Route23_EventScript_MarshBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -325,7 +325,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 5,
"script": "Route23_EventScript_1685D7"
"script": "Route23_EventScript_MarshBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -334,7 +334,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 5,
"script": "Route23_EventScript_1685D7"
"script": "Route23_EventScript_MarshBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -343,7 +343,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 5,
"script": "Route23_EventScript_1685D7"
"script": "Route23_EventScript_MarshBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -352,7 +352,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 5,
"script": "Route23_EventScript_1685D7"
"script": "Route23_EventScript_MarshBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -361,7 +361,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 2,
"script": "Route23_EventScript_168598"
"script": "Route23_EventScript_ThunderBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -370,7 +370,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 2,
"script": "Route23_EventScript_168598"
"script": "Route23_EventScript_ThunderBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -379,7 +379,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 2,
"script": "Route23_EventScript_168598"
"script": "Route23_EventScript_ThunderBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -388,7 +388,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 3,
"script": "Route23_EventScript_1685AD"
"script": "Route23_EventScript_RainbowBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -397,7 +397,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 3,
"script": "Route23_EventScript_1685AD"
"script": "Route23_EventScript_RainbowBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -406,7 +406,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 3,
"script": "Route23_EventScript_1685AD"
"script": "Route23_EventScript_RainbowBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -415,7 +415,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 4,
"script": "Route23_EventScript_1685C2"
"script": "Route23_EventScript_SoulBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -424,7 +424,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 4,
"script": "Route23_EventScript_1685C2"
"script": "Route23_EventScript_SoulBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -433,7 +433,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 4,
"script": "Route23_EventScript_1685C2"
"script": "Route23_EventScript_SoulBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -442,7 +442,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 4,
"script": "Route23_EventScript_1685C2"
"script": "Route23_EventScript_SoulBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -451,7 +451,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 4,
"script": "Route23_EventScript_1685C2"
"script": "Route23_EventScript_SoulBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -460,7 +460,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 4,
"script": "Route23_EventScript_1685C2"
"script": "Route23_EventScript_SoulBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -469,7 +469,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 4,
"script": "Route23_EventScript_1685C2"
"script": "Route23_EventScript_SoulBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -478,7 +478,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 4,
"script": "Route23_EventScript_1685C2"
"script": "Route23_EventScript_SoulBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -487,7 +487,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 4,
"script": "Route23_EventScript_1685C2"
"script": "Route23_EventScript_SoulBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -496,7 +496,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 1,
"script": "Route23_EventScript_168583"
"script": "Route23_EventScript_CascadeBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -505,7 +505,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 1,
"script": "Route23_EventScript_168583"
"script": "Route23_EventScript_CascadeBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -514,7 +514,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 1,
"script": "Route23_EventScript_168583"
"script": "Route23_EventScript_CascadeBadgeGuardTrigger"
},
{
"type": "trigger",
@@ -523,7 +523,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE23",
"var_value": 1,
"script": "Route23_EventScript_168583"
"script": "Route23_EventScript_CascadeBadgeGuardTrigger"
}
],
"bg_events": [
@@ -612,7 +612,7 @@
"x": 3,
"y": 31,
"elevation": 0,
"script": "Route23_EventScript_168616"
"script": "Route23_EventScript_VictoryRoadGateSign"
}
]
}
data/maps/Route23/scripts.inc
+44 -44
View File
@@ -11,118 +11,118 @@ Route23_OnTransition:: @ 81684F1
setvar VAR_MAP_SCENE_VICTORY_ROAD_3F, 0
end
Route23_EventScript_16850C:: @ 816850C
Route23_EventScript_CascadeBadgeGuard:: @ 816850C
lock
faceplayer
setvar VAR_TEMP_1, 2
getstdstring 0, 16
goto EventScript_1A786C
getstdstring 0, STDSTRING_CASCADE_BADGE
goto Route23_EventScript_BadgeGuard
end
Route23_EventScript_16851D:: @ 816851D
Route23_EventScript_ThunderBadgeGuard:: @ 816851D
lock
faceplayer
setvar VAR_TEMP_1, 3
getstdstring 0, 17
goto EventScript_1A786C
getstdstring 0, STDSTRING_THUNDER_BADGE
goto Route23_EventScript_BadgeGuard
end
Route23_EventScript_16852E:: @ 816852E
Route23_EventScript_RainbowBadgeGuard:: @ 816852E
lock
faceplayer
setvar VAR_TEMP_1, 4
getstdstring 0, 18
goto EventScript_1A786C
getstdstring 0, STDSTRING_RAINBOW_BADGE
goto Route23_EventScript_BadgeGuard
end
Route23_EventScript_16853F:: @ 816853F
Route23_EventScript_SoulBadgeGuard:: @ 816853F
lock
faceplayer
setvar VAR_TEMP_1, 5
getstdstring 0, 19
goto EventScript_1A786C
getstdstring 0, STDSTRING_SOUL_BADGE
goto Route23_EventScript_BadgeGuard
end
Route23_EventScript_168550:: @ 8168550
Route23_EventScript_MarshBadgeGuard:: @ 8168550
lock
faceplayer
setvar VAR_TEMP_1, 6
getstdstring 0, 20
goto EventScript_1A786C
getstdstring 0, STDSTRING_MARSH_BADGE
goto Route23_EventScript_BadgeGuard
end
Route23_EventScript_168561:: @ 8168561
Route23_EventScript_VolcanoBadgeGuard:: @ 8168561
lock
faceplayer
setvar VAR_TEMP_1, 7
getstdstring 0, 21
goto EventScript_1A786C
getstdstring 0, STDSTRING_VOLCANO_BADGE
goto Route23_EventScript_BadgeGuard
end
Route23_EventScript_168572:: @ 8168572
Route23_EventScript_EarthBadgeGuard:: @ 8168572
lock
faceplayer
setvar VAR_TEMP_1, 8
getstdstring 0, 22
goto EventScript_1A786C
getstdstring 0, STDSTRING_EARTH_BADGE
goto Route23_EventScript_BadgeGuard
end
Route23_EventScript_168583:: @ 8168583
Route23_EventScript_CascadeBadgeGuardTrigger:: @ 8168583
lockall
setvar VAR_TEMP_1, 2
setvar VAR_0x8009, 1
getstdstring 0, 16
goto EventScript_1A796E
getstdstring 0, STDSTRING_CASCADE_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
Route23_EventScript_168598:: @ 8168598
Route23_EventScript_ThunderBadgeGuardTrigger:: @ 8168598
lockall
setvar VAR_TEMP_1, 3
setvar VAR_0x8009, 2
getstdstring 0, 17
goto EventScript_1A796E
getstdstring 0, STDSTRING_THUNDER_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
Route23_EventScript_1685AD:: @ 81685AD
Route23_EventScript_RainbowBadgeGuardTrigger:: @ 81685AD
lockall
setvar VAR_TEMP_1, 4
setvar VAR_0x8009, 3
getstdstring 0, 18
goto EventScript_1A796E
getstdstring 0, STDSTRING_RAINBOW_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
Route23_EventScript_1685C2:: @ 81685C2
Route23_EventScript_SoulBadgeGuardTrigger:: @ 81685C2
lockall
setvar VAR_TEMP_1, 5
setvar VAR_0x8009, 4
getstdstring 0, 19
goto EventScript_1A796E
getstdstring 0, STDSTRING_SOUL_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
Route23_EventScript_1685D7:: @ 81685D7
Route23_EventScript_MarshBadgeGuardTrigger:: @ 81685D7
lockall
setvar VAR_TEMP_1, 6
setvar VAR_0x8009, 5
getstdstring 0, 20
goto EventScript_1A796E
getstdstring 0, STDSTRING_MARSH_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
Route23_EventScript_1685EC:: @ 81685EC
Route23_EventScript_VolcanoBadgeGuardTrigger:: @ 81685EC
lockall
setvar VAR_TEMP_1, 7
setvar VAR_0x8009, 6
getstdstring 0, 21
goto EventScript_1A796E
getstdstring 0, STDSTRING_VOLCANO_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
Route23_EventScript_168601:: @ 8168601
Route23_EventScript_EarthBadgeGuardTrigger:: @ 8168601
lockall
setvar VAR_TEMP_1, 8
setvar VAR_0x8009, 7
getstdstring 0, 22
goto EventScript_1A796E
getstdstring 0, STDSTRING_EARTH_BADGE
goto Route23_EventScript_BadgeGuardTrigger
end
Route23_EventScript_168616:: @ 8168616
msgbox gUnknown_8188C19, MSGBOX_SIGN
Route23_EventScript_VictoryRoadGateSign:: @ 8168616
msgbox Route23_Text_VictoryRoadGateSign, MSGBOX_SIGN
end
data/maps/Route23/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_8188C19:: @ 8188C19
Route23_Text_VictoryRoadGateSign:: @ 8188C19
.string "VICTORY ROAD GATE -\n"
.string "POKéMON LEAGUE$"
data/maps/Route5_PokemonDayCare/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route5_PokemonDayCare_EventScript_1BF398",
"script": "Route5_PokemonDayCare_EventScript_DaycareMan",
"flag": "0"
}
],
data/maps/Route5_PokemonDayCare/scripts.inc
+2
View File
@@ -1,2 +1,4 @@
@ Handled by data/scripts/day_care.inc
Route5_PokemonDayCare_MapScripts:: @ 816F8FF
.byte 0
data/maps/Route5_PokemonDayCare/text.inc
+60
View File
@@ -0,0 +1,60 @@
Route5_PokemonDayCare_Text_WantMeToRaiseMon:: @ 819DD66
.string "I run the DAY-CARE service.\p"
.string "Would you like me to raise one of\n"
.string "your POKéMON?$"
Route5_PokemonDayCare_Text_ComeAgain:: @ 819DDB2
.string "Come again.$"
Route5_PokemonDayCare_Text_WhichMonShouldIRaise:: @ 819DDBE
.string "Which POKéMON should I raise?$"
Route5_PokemonDayCare_Text_ComeAnytimeYouLike:: @ 819DDDC
.string "Fine.\n"
.string "Come anytime you like.$"
Route5_PokemonDayCare_Text_LookAfterMonForAWhile:: @ 819DDF9
.string "Fine, I'll look after your\n"
.string "{STR_VAR_1} for a while.$"
Route5_PokemonDayCare_Text_ComeSeeMeInAWhile:: @ 819DE24
.string "Come see me in a while.$"
Route5_PokemonDayCare_Text_MonNeedsToSpendMoreTime:: @ 819DE3C
.string "You're back already?\p"
.string "Your {STR_VAR_1} needs to spend\n"
.string "some more time with me.$"
Route5_PokemonDayCare_Text_OweMeXForMonsReturn:: @ 819DE80
.string "You owe me ¥{STR_VAR_2} for the return\n"
.string "of this POKéMON.$"
Route5_PokemonDayCare_Text_ThankYouHeresMon:: @ 819DEAF
.string "Thank you!\n"
.string "Here's your POKéMON.$"
Route5_PokemonDayCare_Text_PlayerGotMonBack:: @ 819DECF
.string "{PLAYER} got {STR_VAR_1} back\n"
.string "from the DAY-CARE MAN.$"
Route5_PokemonDayCare_Text_OnlyHaveOneMonWithYou:: @ 819DEF5
.string "Oh? You only have one POKéMON\n"
.string "with you.$"
Route5_PokemonDayCare_Text_WhatWillYouBattleWith:: @ 819DF1D
.string "If you leave me that POKéMON,\n"
.string "what will you battle with?$"
Route5_PokemonDayCare_Text_MonHasGrownByXLevels:: @ 819DF56
.string "Your {STR_VAR_1} has grown a lot.\n"
.string "Yes, quite a lot, I'd say.\p"
.string "Let me see…\n"
.string "By level, it's grown by {STR_VAR_2}.\p"
.string "Aren't I great?$"
Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2
.string "You can't take this POKéMON back\n"
.string "if you've got no room for it.$"
Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001
.string "You don't have enough money.$"
data/maps/Route5_SouthEntrance/text.inc
-61
View File
@@ -1,64 +1,3 @@
Text_19DD66:: @ 819DD66
.string "I run the DAY-CARE service.\p"
.string "Would you like me to raise one of\n"
.string "your POKéMON?$"
Text_19DDB2:: @ 819DDB2
.string "Come again.$"
Text_19DDBE:: @ 819DDBE
.string "Which POKéMON should I raise?$"
Text_19DDDC:: @ 819DDDC
.string "Fine.\n"
.string "Come anytime you like.$"
Text_19DDF9:: @ 819DDF9
.string "Fine, I'll look after your\n"
.string "{STR_VAR_1} for a while.$"
Text_19DE24:: @ 819DE24
.string "Come see me in a while.$"
Text_19DE3C:: @ 819DE3C
.string "You're back already?\p"
.string "Your {STR_VAR_1} needs to spend\n"
.string "some more time with me.$"
Text_19DE80:: @ 819DE80
.string "You owe me ¥{STR_VAR_2} for the return\n"
.string "of this POKéMON.$"
Text_19DEAF:: @ 819DEAF
.string "Thank you!\n"
.string "Here's your POKéMON.$"
Text_19DECF:: @ 819DECF
.string "{PLAYER} got {STR_VAR_1} back\n"
.string "from the DAY-CARE MAN.$"
Text_19DEF5:: @ 819DEF5
.string "Oh? You only have one POKéMON\n"
.string "with you.$"
Text_19DF1D:: @ 819DF1D
.string "If you leave me that POKéMON,\n"
.string "what will you battle with?$"
Text_19DF56:: @ 819DF56
.string "Your {STR_VAR_1} has grown a lot.\n"
.string "Yes, quite a lot, I'd say.\p"
.string "Let me see…\n"
.string "By level, it's grown by {STR_VAR_2}.\p"
.string "Aren't I great?$"
Text_19DFC2:: @ 819DFC2
.string "You can't take this POKéMON back\n"
.string "if you've got no room for it.$"
Text_19E001:: @ 819E001
.string "You don't have enough money.$"
Text_19E01E:: @ 819E01E
.string "きみの\n"
.string "みてみるかね？$"
data/maps/UndergroundPath_EastEntrance/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UndergroundPath_EastEntrance_EventScript_160EDE",
"script": "UndergroundPath_EastEntrance_EventScript_Woman",
"flag": "0"
}
],
data/maps/UndergroundPath_EastEntrance/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
UndergroundPath_EastEntrance_MapScripts:: @ 8160EDD
.byte 0
UndergroundPath_EastEntrance_EventScript_160EDE:: @ 8160EDE
msgbox gUnknown_81745D9, MSGBOX_NPC
UndergroundPath_EastEntrance_EventScript_Woman:: @ 8160EDE
msgbox UndergroundPath_EastEntrance_Text_DoYouGoToCeladonDeptStore, MSGBOX_NPC
end
data/maps/UndergroundPath_EastEntrance/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_81745D9:: @ 81745D9
UndergroundPath_EastEntrance_Text_DoYouGoToCeladonDeptStore:: @ 81745D9
.string "The DEPARTMENT STORE in CELADON\n"
.string "has a great selection.\p"
.string "Do you go there very often?$"
data/maps/UndergroundPath_NorthEntrance/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UndergroundPath_NorthEntrance_EventScript_160E39",
"script": "UndergroundPath_NorthEntrance_EventScript_Saige",
"flag": "0"
}
],
data/maps/UndergroundPath_NorthEntrance/scripts.inc
+8 -8
View File
@@ -1,39 +1,39 @@
UndergroundPath_NorthEntrance_MapScripts:: @ 8160E38
.byte 0
UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39
UndergroundPath_NorthEntrance_EventScript_Saige:: @ 8160E39
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_NIDORAN
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MS_NIDO_TRADE, EventScript_160EAB
goto_if_set FLAG_DID_MS_NIDO_TRADE, UndergroundPath_NorthEntrance_EventScript_AlreadyTraded
msgbox gUnknown_81A5AD6, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_160E93
goto_if_eq UndergroundPath_NorthEntrance_EventScript_DeclineTrade
call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_160E93
goto_if_ge UndergroundPath_NorthEntrance_EventScript_DeclineTrade
call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_160E9D
goto_if_ne UndergroundPath_NorthEntrance_EventScript_NotRequestedMon
call EventScript_DoInGameTrade
msgbox gUnknown_81A5B4A
setflag FLAG_DID_MS_NIDO_TRADE
release
end
EventScript_160E93:: @ 8160E93
UndergroundPath_NorthEntrance_EventScript_DeclineTrade:: @ 8160E93
msgbox gUnknown_81A5B08
release
end
EventScript_160E9D:: @ 8160E9D
UndergroundPath_NorthEntrance_EventScript_NotRequestedMon:: @ 8160E9D
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A5B18
release
end
EventScript_160EAB:: @ 8160EAB
UndergroundPath_NorthEntrance_EventScript_AlreadyTraded:: @ 8160EAB
msgbox gUnknown_81A5B60
release
end
data/maps/UndergroundPath_SouthEntrance/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UndergroundPath_SouthEntrance_EventScript_160EC0",
"script": "UndergroundPath_SouthEntrance_EventScript_Woman",
"flag": "0"
}
],
data/maps/UndergroundPath_SouthEntrance/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
UndergroundPath_SouthEntrance_MapScripts:: @ 8160EBF
.byte 0
UndergroundPath_SouthEntrance_EventScript_160EC0:: @ 8160EC0
msgbox gUnknown_8174559, MSGBOX_NPC
UndergroundPath_SouthEntrance_EventScript_Woman:: @ 8160EC0
msgbox UndergroundPath_SouthEntrance_Text_PeopleLoseThingsInTheDarkness, MSGBOX_NPC
end
data/maps/UndergroundPath_SouthEntrance/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_8174559:: @ 8174559
UndergroundPath_SouthEntrance_Text_PeopleLoseThingsInTheDarkness:: @ 8174559
.string "People often lose things in the\n"
.string "darkness of the UNDERGROUND PATH.$"
data/maps/UndergroundPath_WestEntrance/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UndergroundPath_WestEntrance_EventScript_160ECA",
"script": "UndergroundPath_WestEntrance_EventScript_BaldingMan",
"flag": "0"
}
],
data/maps/UndergroundPath_WestEntrance/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
UndergroundPath_WestEntrance_MapScripts:: @ 8160EC9
.byte 0
UndergroundPath_WestEntrance_EventScript_160ECA:: @ 8160ECA
msgbox gUnknown_817459B, MSGBOX_NPC
UndergroundPath_WestEntrance_EventScript_BaldingMan:: @ 8160ECA
msgbox UndergroundPath_WestEntrance_Text_SleepyMonNearCeladon, MSGBOX_NPC
end
data/maps/UndergroundPath_WestEntrance/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_817459B:: @ 817459B
UndergroundPath_WestEntrance_Text_SleepyMonNearCeladon:: @ 817459B
.string "I heard a sleepy POKéMON appeared\n"
.string "out near CELADON CITY, too.$"
data/maps/UnionRoom/map.json
+17 -17
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnionRoom_EventScript_16050C",
"script": "UnionRoom_EventScript_Attendant",
"flag": "0"
},
{
@@ -36,8 +36,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnionRoom_EventScript_1604DA",
"flag": "FLAG_HIDE_UNION_ROOM_4"
"script": "UnionRoom_EventScript_Player4",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_7",
@@ -49,8 +49,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnionRoom_EventScript_160502",
"flag": "FLAG_HIDE_UNION_ROOM_8"
"script": "UnionRoom_EventScript_Player8",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_6",
@@ -62,8 +62,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnionRoom_EventScript_1604F8",
"flag": "FLAG_HIDE_UNION_ROOM_7"
"script": "UnionRoom_EventScript_Player7",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_5",
@@ -75,8 +75,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnionRoom_EventScript_1604EE",
"flag": "FLAG_HIDE_UNION_ROOM_6"
"script": "UnionRoom_EventScript_Player6",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_4",
@@ -88,8 +88,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnionRoom_EventScript_1604E4",
"flag": "FLAG_HIDE_UNION_ROOM_5"
"script": "UnionRoom_EventScript_Player5",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_2",
@@ -101,8 +101,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnionRoom_EventScript_1604D0",
"flag": "FLAG_HIDE_UNION_ROOM_3"
"script": "UnionRoom_EventScript_Player3",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_1",
@@ -114,8 +114,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnionRoom_EventScript_1604C6",
"flag": "FLAG_HIDE_UNION_ROOM_2"
"script": "UnionRoom_EventScript_Player2",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_0",
@@ -127,8 +127,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnionRoom_EventScript_1604BC",
"flag": "FLAG_HIDE_UNION_ROOM_1"
"script": "UnionRoom_EventScript_Player1",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1"
}
],
"warp_events": [
data/maps/UnionRoom/scripts.inc
+18 -18
View File
@@ -4,14 +4,14 @@ UnionRoom_MapScripts:: @ 816047C
.byte 0
UnionRoom_OnResume:: @ 8160487
setflag FLAG_HIDE_UNION_ROOM_1
setflag FLAG_HIDE_UNION_ROOM_2
setflag FLAG_HIDE_UNION_ROOM_3
setflag FLAG_HIDE_UNION_ROOM_4
setflag FLAG_HIDE_UNION_ROOM_5
setflag FLAG_HIDE_UNION_ROOM_6
setflag FLAG_HIDE_UNION_ROOM_7
setflag FLAG_HIDE_UNION_ROOM_8
setflag FLAG_HIDE_UNION_ROOM_PLAYER_1
setflag FLAG_HIDE_UNION_ROOM_PLAYER_2
setflag FLAG_HIDE_UNION_ROOM_PLAYER_3
setflag FLAG_HIDE_UNION_ROOM_PLAYER_4
setflag FLAG_HIDE_UNION_ROOM_PLAYER_5
setflag FLAG_HIDE_UNION_ROOM_PLAYER_6
setflag FLAG_HIDE_UNION_ROOM_PLAYER_7
setflag FLAG_HIDE_UNION_ROOM_PLAYER_8
removeobject 9
removeobject 8
removeobject 7
@@ -26,7 +26,7 @@ UnionRoom_OnResume:: @ 8160487
UnionRoom_OnTransition:: @ 81604BB
end
UnionRoom_EventScript_1604BC:: @ 81604BC
UnionRoom_EventScript_Player1:: @ 81604BC
lock
faceplayer
setvar VAR_RESULT, 1
@@ -34,7 +34,7 @@ UnionRoom_EventScript_1604BC:: @ 81604BC
release
end
UnionRoom_EventScript_1604C6:: @ 81604C6
UnionRoom_EventScript_Player2:: @ 81604C6
lock
faceplayer
setvar VAR_RESULT, 2
@@ -42,7 +42,7 @@ UnionRoom_EventScript_1604C6:: @ 81604C6
release
end
UnionRoom_EventScript_1604D0:: @ 81604D0
UnionRoom_EventScript_Player3:: @ 81604D0
lock
faceplayer
setvar VAR_RESULT, 3
@@ -50,7 +50,7 @@ UnionRoom_EventScript_1604D0:: @ 81604D0
release
end
UnionRoom_EventScript_1604DA:: @ 81604DA
UnionRoom_EventScript_Player4:: @ 81604DA
lock
faceplayer
setvar VAR_RESULT, 4
@@ -58,7 +58,7 @@ UnionRoom_EventScript_1604DA:: @ 81604DA
release
end
UnionRoom_EventScript_1604E4:: @ 81604E4
UnionRoom_EventScript_Player5:: @ 81604E4
lock
faceplayer
setvar VAR_RESULT, 5
@@ -66,7 +66,7 @@ UnionRoom_EventScript_1604E4:: @ 81604E4
release
end
UnionRoom_EventScript_1604EE:: @ 81604EE
UnionRoom_EventScript_Player6:: @ 81604EE
lock
faceplayer
setvar VAR_RESULT, 6
@@ -74,7 +74,7 @@ UnionRoom_EventScript_1604EE:: @ 81604EE
release
end
UnionRoom_EventScript_1604F8:: @ 81604F8
UnionRoom_EventScript_Player7:: @ 81604F8
lock
faceplayer
setvar VAR_RESULT, 7
@@ -82,7 +82,7 @@ UnionRoom_EventScript_1604F8:: @ 81604F8
release
end
UnionRoom_EventScript_160502:: @ 8160502
UnionRoom_EventScript_Player8:: @ 8160502
lock
faceplayer
setvar VAR_RESULT, 8
@@ -90,7 +90,7 @@ UnionRoom_EventScript_160502:: @ 8160502
release
end
UnionRoom_EventScript_16050C:: @ 816050C
UnionRoom_EventScript_Attendant:: @ 816050C
lock
faceplayer
setvar VAR_RESULT, 9
@@ -98,7 +98,7 @@ UnionRoom_EventScript_16050C:: @ 816050C
release
end
UnionRoom_EventScript_160516:: @ 8160516
UnionRoom_EventScript_Unused:: @ 8160516
lockall
setvar VAR_RESULT, 10
waitstate