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

Move local IDs to map.json

Browse Source
This commit is contained in:
GriffinR
2024-10-14 23:10:37 -04:00
parent 4dc5c47799
commit 50babdb07f
192 changed files with 863 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/move_tutors.inc
-2
View File
@@ -399,8 +399,6 @@ EventScript_BodySlamTaught::
release
end
.set LOCALID_CAPE_BRINK_TUTOR, 1
TwoIsland_CapeBrink_House_EventScript_StarterTutor::
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
data/scripts/seagallop.inc
+8 -8
View File
@@ -117,7 +117,7 @@ EventScript_CancelSail::
VermilionCity_EventScript_WalkUpPier::
closemessage
applymovement LOCALID_FERRY_SAILOR, Common_Movement_FaceOriginalDirection
applymovement LOCALID_VERMILION_FERRY_SAILOR, Common_Movement_FaceOriginalDirection
applymovement LOCALID_PLAYER, VermilionCity_Movement_WalkUp
waitmovement 0
releaseall
@@ -134,12 +134,12 @@ EventScript_SeviiDestinationsPage1::
specialvar VAR_0x8006, GetSelectedSeagallopDestination
switch VAR_0x8006
case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity
case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland
case SEAGALLOP_TWO_ISLAND, EventScript_SailToTwoIsland
case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland
case SEAGALLOP_TWO_ISLAND, EventScript_SailToTwoIsland
case SEAGALLOP_THREE_ISLAND, EventScript_SailToThreeIsland
case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland
case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage2
case SCR_MENU_CANCEL, EventScript_CancelSail
case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland
case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage2
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_SeviiDestinationsPage2::
@@ -152,8 +152,8 @@ EventScript_SeviiDestinationsPage2::
case SEAGALLOP_FIVE_ISLAND, EventScript_SailToFiveIsland
case SEAGALLOP_SIX_ISLAND, EventScript_SailToSixIsland
case SEAGALLOP_SEVEN_ISLAND, EventScript_SailToSevenIsland
case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage1
case SCR_MENU_CANCEL, EventScript_CancelSail
case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage1
case SCR_MENU_CANCEL, EventScript_CancelSail
end
EventScript_SailToVermilionCity::
data/scripts/trainer_card.inc
-2
View File
@@ -1,5 +1,3 @@
.set LOCALID_STICKER_MAN, 1
CeladonCity_GameCorner_EventScript_PhotoPrinter::
lockall
showmoneybox 0, 0
data/scripts/trainer_tower.inc
+35 -41
View File
@@ -1,9 +1,3 @@
@ Local IDs apply to all floors (not lobby or roof)
.equ LOCALID_TRAINER_DOUBLES1, 2
.equ LOCALID_TRAINER_SINGLES, 3
.equ LOCALID_TRAINER_KNOCKOUT, 4
.equ LOCALID_TRAINER_DOUBLES2, 5
.equ HIDE_TRAINER_DOUBLES1, FLAG_TEMP_2
.equ HIDE_TRAINER_SINGLES, FLAG_TEMP_3
.equ HIDE_TRAINER_KNOCKOUT, FLAG_TEMP_4
@@ -40,8 +34,8 @@ TrainerTower_EventScript_SetObjectsSingles::
setflag HIDE_TRAINER_KNOCKOUT
setflag HIDE_TRAINER_DOUBLES2
setvar DISABLE_DOUBLES_TRIGGER, TRUE
setobjectxyperm LOCALID_TRAINER_SINGLES, 15, 13
setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_TOWER_TRAINER_SINGLES, 15, 13
setobjectmovementtype LOCALID_TOWER_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT
goto TrainerTower_EventScript_HideOwner
TrainerTower_EventScript_SetObjectsDoubles::
@@ -50,29 +44,29 @@ TrainerTower_EventScript_SetObjectsDoubles::
setvar DISABLE_SINGLES_TRIGGER, TRUE
ttower_isfloorcleared
goto_if_eq VAR_RESULT, TRUE, TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten
setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12
setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_TRAINER_DOUBLES2, 10, 13
setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES1, 10, 12
setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES2, 10, 13
setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT
goto TrainerTower_EventScript_HideOwner
TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten::
setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12
setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN
setobjectxyperm LOCALID_TRAINER_DOUBLES2, 11, 12
setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_DOWN
setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES1, 10, 12
setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN
setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES2, 11, 12
setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_DOWN
goto TrainerTower_EventScript_HideOwner
@ Knockout challenge re-uses trainer objects
TrainerTower_EventScript_SetObjectsKnockout::
setflag HIDE_TRAINER_DOUBLES2
setvar DISABLE_DOUBLES_TRIGGER, TRUE
setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 10
setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN
setobjectxyperm LOCALID_TRAINER_SINGLES, 14, 13
setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_TRAINER_KNOCKOUT, 10, 16
setobjectmovementtype LOCALID_TRAINER_KNOCKOUT, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES1, 10, 10
setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN
setobjectxyperm LOCALID_TOWER_TRAINER_SINGLES, 14, 13
setobjectmovementtype LOCALID_TOWER_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_TOWER_TRAINER_KNOCKOUT, 10, 16
setobjectmovementtype LOCALID_TOWER_TRAINER_KNOCKOUT, MOVEMENT_TYPE_FACE_UP
TrainerTower_EventScript_HideOwner:
setflag HIDE_OWNER
end
@@ -109,12 +103,12 @@ TrainerTower_EventScript_TriggerBattle::
TrainerTower_EventScript_DoSingleBattle:
ttower_encountermusic
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_ExclamationMark
applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_Delay48
applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_Delay48
waitmovement 0
setvar DISABLE_SINGLES_TRIGGER, TRUE
applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach
applymovement LOCALID_TOWER_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach
waitmovement 0
ttower_getspeech TRAINER_TOWER_TEXT_INTRO, 0
msgbox gStringVar4
@@ -144,31 +138,31 @@ TrainerTower_EventScript_DoKnockoutBattle::
TrainerTower_EventScript_DoKnockoutBattle1:
ttower_encountermusic
applymovement LOCALID_TRAINER_KNOCKOUT, Common_Movement_ExclamationMark
applymovement LOCALID_TOWER_TRAINER_KNOCKOUT, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_KNOCKOUT, Common_Movement_Delay48
applymovement LOCALID_TOWER_TRAINER_KNOCKOUT, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach
applymovement LOCALID_TOWER_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach
waitmovement 0
goto TrainerTower_EventScript_DoKnockoutBattleIntro
TrainerTower_EventScript_DoKnockoutBattle2::
ttower_encountermusic
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_ExclamationMark
applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_Delay48
applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach
applymovement LOCALID_TOWER_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach
waitmovement 0
goto TrainerTower_EventScript_DoKnockoutBattleIntro
TrainerTower_EventScript_DoKnockoutBattle3::
ttower_encountermusic
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_ExclamationMark
applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_Delay48
applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach
applymovement LOCALID_TOWER_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach
waitmovement 0
TrainerTower_EventScript_DoKnockoutBattleIntro:
ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_1
@@ -203,13 +197,13 @@ TrainerTower_EventScript_DoThirdKnockoutBattle::
goto TrainerTower_EventScript_DoKnockoutBattle
TrainerTower_EventScript_MoveDoublesTrainers::
applymovement LOCALID_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay
applymovement LOCALID_TOWER_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown
applymovement LOCALID_TOWER_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown
goto TrainerTower_EventScript_SetFloorCleared
TrainerTower_EventScript_MoveLastKnockoutTrainer::
applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay
applymovement LOCALID_TOWER_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay
TrainerTower_EventScript_SetFloorCleared:
ttower_clearedfloor
end
@@ -339,9 +333,9 @@ TrainerTower_EventScript_DoubleBattleTriggerTop::
ttower_checkdoubles
goto_if_ne VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS, TrainerTower_EventScript_IneligibleForDoubleBattle
ttower_encountermusic
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_ExclamationMark
applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_Delay48
applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_Delay48
goto TrainerTower_EventScript_TriggerDoubleBattle
TrainerTower_EventScript_DoubleBattleTriggerBottom::
@@ -349,9 +343,9 @@ TrainerTower_EventScript_DoubleBattleTriggerBottom::
ttower_checkdoubles
goto_if_ne VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS, TrainerTower_EventScript_IneligibleForDoubleBattle
ttower_encountermusic
applymovement LOCALID_TRAINER_DOUBLES2, Common_Movement_ExclamationMark
applymovement LOCALID_TOWER_TRAINER_DOUBLES2, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES2, Common_Movement_Delay48
applymovement LOCALID_TOWER_TRAINER_DOUBLES2, Common_Movement_Delay48
TrainerTower_EventScript_TriggerDoubleBattle:
waitmovement 0
setvar DISABLE_DOUBLES_TRIGGER, TRUE
data/scripts/white_out.inc
-2
View File
@@ -19,8 +19,6 @@ EventScript_AfterWhiteOutHealMsg::
msgbox Text_MonsHealed
return
@ LOCALID_MOM set by PalletTown_PlayersHouse_1F
EventScript_AfterWhiteOutMomHeal::
lockall
textcolor NPC_TEXT_COLOR_FEMALE