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

Drop some optional script command arguments

Browse Source
This commit is contained in:
GriffinR
2022-08-09 15:19:49 -04:00
parent acb480f1c1
commit 8e7dd94eca
82 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/cable_club.inc
+4 -4
View File
@@ -330,7 +330,7 @@ CableClub_EventScript_EnterColosseum::
compare VAR_0x8004, USING_MULTI_BATTLE
goto_if_eq CableClub_EventScript_WarpTo4PColosseum
special SetCableClubWarp
warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8
warp MAP_BATTLE_COLOSSEUM_2P, 6, 8
special DoCableClubWarp
waitstate
end
@@ -343,7 +343,7 @@ CableClub_EventScript_PlayerApproachLinkRoomRight::
CableClub_EventScript_WarpTo4PColosseum::
special SetCableClubWarp
warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8
warp MAP_BATTLE_COLOSSEUM_4P, 5, 8
special DoCableClubWarp
waitstate
end
@@ -437,7 +437,7 @@ CableClub_EventScript_EnterTradeCenter::
waitdooranim
release
special SetCableClubWarp
setwarp MAP_TRADE_CENTER, 255, 5, 8
setwarp MAP_TRADE_CENTER, 5, 8
special DoCableClubWarp
waitstate
end
@@ -836,7 +836,7 @@ CableClub_EventScript_EnterUnionRoom::
waitdooranim
special Script_ResetUnionRoomTrade
special SetCableClubWarp
warpspinenter MAP_UNION_ROOM, 255, 7, 11
warpspinenter MAP_UNION_ROOM, 7, 11
waitstate
special UnionRoomSpecial
waitstate
data/scripts/day_care.inc
+2 -2
View File
@@ -2,7 +2,7 @@ Route5_PokemonDayCare_EventScript_DaycareMan::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
showmoneybox 0, 0, 0
showmoneybox 0, 0
specialvar VAR_RESULT, IsThereMonInRoute5Daycare
compare VAR_RESULT, TRUE
goto_if_eq Route5_PokemonDayCare_EventScript_CheckOnMon
@@ -22,7 +22,7 @@ Route5_PokemonDayCare_EventScript_TryGiveMon::
hidemoneybox
special ChooseSendDaycareMon
waitstate
showmoneybox 0, 0, 0
showmoneybox 0, 0
compare VAR_0x8004, PARTY_SIZE
goto_if_ge Route5_PokemonDayCare_EventScript_ComeAgain
specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
data/scripts/hole.inc
+1 -1
View File
@@ -15,7 +15,7 @@ EventScript_FallDownHole::
waitmovement 0
playse SE_FALL
delay 60
warphole 0xFFFF
warphole MAP_UNDEFINED
waitstate
end
data/scripts/move_tutors.inc
+1 -1
View File
@@ -390,7 +390,7 @@ EventScript_MimicTutor::
faceplayer
compare VAR_RESULT, 0
goto_if_eq EventScript_MimicDeclined
removeitem ITEM_POKE_DOLL, 1
removeitem ITEM_POKE_DOLL
setflag FLAG_TUTOR_MIMIC
goto EventScript_MimicTaught
end
data/scripts/safari_zone.inc
+2 -2
View File
@@ -1,13 +1,13 @@
SafariZone_EventScript_OutOfBallsMidBattle::
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3
special ExitSafariMode
setwarp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 255, 4, 1
setwarp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 4, 1
end
SafariZone_EventScript_Exit::
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1
special ExitSafariMode
warp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 255, 4, 1
warp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 4, 1
waitstate
end
data/scripts/trainer_card.inc
+3 -3
View File
@@ -2,15 +2,15 @@
CeladonCity_GameCorner_EventScript_PhotoPrinter::
lockall
showmoneybox 0, 0, 0
showmoneybox 0, 0
msgbox CeladonCity_GameCorner_Text_TryPokemonPrinter, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq CeladonCity_GameCorner_EventScript_DeclinePhoto
checkmoney 50, 0
checkmoney 50
compare VAR_RESULT, FALSE
goto_if_eq CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto
playse SE_SHOP
removemoney 50, 0
removemoney 50
updatemoneybox
waitse
message CeladonCity_GameCorner_Text_ChoosePrintType
data/scripts/trainer_tower.inc
+2 -2
View File
@@ -97,7 +97,7 @@ TrainerTower_EventScript_EndEnterFloor:
@ Never reached
TrainerTower_EventScript_WarpToLobby::
warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7
warp MAP_TRAINER_TOWER_LOBBY, 9, 7
waitstate
@@ -221,7 +221,7 @@ TrainerTower_EventScript_SetFloorCleared:
TrainerTower_EventScript_WarpToLobbyLost::
special HealPlayerParty
ttower_setlost
warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7
warp MAP_TRAINER_TOWER_LOBBY, 9, 7
waitstate
data/scripts/white_out.inc
+1 -1
View File
@@ -44,7 +44,7 @@ EventScript_FieldPoison::
end
EventScript_FieldWhiteOut::
checkmoney 1, 0
checkmoney 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_FieldWhiteOutNoMoney
compare VAR_RESULT, TRUE