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

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PokemonTower_7F/scripts.inc
+29 -29
View File
@@ -2,10 +2,10 @@
.set LOCALID_GRUNT2, 3
.set LOCALID_GRUNT3, 4
PokemonTower_7F_MapScripts:: @ 8163559
PokemonTower_7F_MapScripts::
.byte 0
PokemonTower_7F_EventScript_MrFuji:: @ 816355A
PokemonTower_7F_EventScript_MrFuji::
lock
faceplayer
famechecker FAMECHECKER_MRFUJI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
@@ -19,12 +19,12 @@ PokemonTower_7F_EventScript_MrFuji:: @ 816355A
release
end
PokemonTower_7F_EventScript_Grunt1:: @ 8163586
PokemonTower_7F_EventScript_Grunt1::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, PokemonTower_7F_Text_Grunt1Intro, PokemonTower_7F_Text_Grunt1Defeat, PokemonTower_7F_EventScript_DefeatedGrunt1
msgbox PokemonTower_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_7F_EventScript_DefeatedGrunt1:: @ 81635A1
PokemonTower_7F_EventScript_DefeatedGrunt1::
msgbox PokemonTower_7F_Text_Grunt1PostBattle
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
@@ -39,19 +39,19 @@ PokemonTower_7F_EventScript_DefeatedGrunt1:: @ 81635A1
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
PokemonTower_7F_EventScript_Grunt1ExitMid:: @ 81635E0
PokemonTower_7F_EventScript_Grunt1ExitMid::
applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitMid
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
PokemonTower_7F_EventScript_Grunt1ExitRight:: @ 81635F0
PokemonTower_7F_EventScript_Grunt1ExitRight::
applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitRight
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600
PokemonTower_7F_EventScript_Grunt1ExitLeft::
applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitLeft
waitmovement 0
playse SE_EXIT
@@ -59,12 +59,12 @@ PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
PokemonTower_7F_EventScript_RemoveGrunt1:: @ 8163616
PokemonTower_7F_EventScript_RemoveGrunt1::
removeobject LOCALID_GRUNT1
release
end
PokemonTower_7F_Movement_Grunt1ExitMid:: @ 816361B
PokemonTower_7F_Movement_Grunt1ExitMid::
walk_down
walk_right
walk_down
@@ -75,7 +75,7 @@ PokemonTower_7F_Movement_Grunt1ExitMid:: @ 816361B
walk_down
step_end
PokemonTower_7F_Movement_Grunt1ExitRight:: @ 8163624
PokemonTower_7F_Movement_Grunt1ExitRight::
walk_down
walk_down
walk_down
@@ -85,7 +85,7 @@ PokemonTower_7F_Movement_Grunt1ExitRight:: @ 8163624
walk_down
step_end
PokemonTower_7F_Movement_Grunt1Exit:: @ 816362C
PokemonTower_7F_Movement_Grunt1Exit::
walk_down
walk_down
walk_down
@@ -94,7 +94,7 @@ PokemonTower_7F_Movement_Grunt1Exit:: @ 816362C
walk_down
step_end
PokemonTower_7F_Movement_Grunt1ExitLeft:: @ 8163633
PokemonTower_7F_Movement_Grunt1ExitLeft::
walk_right
walk_down
walk_down
@@ -106,12 +106,12 @@ PokemonTower_7F_Movement_Grunt1ExitLeft:: @ 8163633
walk_in_place_fastest_left
step_end
PokemonTower_7F_EventScript_Grunt2:: @ 816363D
PokemonTower_7F_EventScript_Grunt2::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, PokemonTower_7F_Text_Grunt2Intro, PokemonTower_7F_Text_Grunt2Defeat, PokemonTower_7F_EventScript_DefeatedGrunt2
msgbox PokemonTower_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_7F_EventScript_DefeatedGrunt2:: @ 8163658
PokemonTower_7F_EventScript_DefeatedGrunt2::
famechecker FAMECHECKER_MRFUJI, 1
msgbox PokemonTower_7F_Text_Grunt2PostBattle
closemessage
@@ -125,24 +125,24 @@ PokemonTower_7F_EventScript_DefeatedGrunt2:: @ 8163658
goto PokemonTower_7F_EventScript_RemoveGrunt2
end
PokemonTower_7F_EventScript_Grunt2ExitLeft:: @ 8163699
PokemonTower_7F_EventScript_Grunt2ExitLeft::
applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitLeft
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt2
end
PokemonTower_7F_EventScript_Grunt2ExitRight:: @ 81636A9
PokemonTower_7F_EventScript_Grunt2ExitRight::
applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitRight
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt2
end
PokemonTower_7F_EventScript_RemoveGrunt2:: @ 81636B9
PokemonTower_7F_EventScript_RemoveGrunt2::
removeobject LOCALID_GRUNT2
release
end
PokemonTower_7F_Movement_Grunt2ExitLeft:: @ 81636BE
PokemonTower_7F_Movement_Grunt2ExitLeft::
walk_down
walk_down
walk_down
@@ -152,7 +152,7 @@ PokemonTower_7F_Movement_Grunt2ExitLeft:: @ 81636BE
walk_down
step_end
PokemonTower_7F_Movement_Grunt2Exit:: @ 81636C6
PokemonTower_7F_Movement_Grunt2Exit::
walk_down
walk_down
walk_down
@@ -161,7 +161,7 @@ PokemonTower_7F_Movement_Grunt2Exit:: @ 81636C6
walk_down
step_end
PokemonTower_7F_Movement_Grunt2ExitRight:: @ 81636CD
PokemonTower_7F_Movement_Grunt2ExitRight::
walk_left
walk_down
walk_down
@@ -172,12 +172,12 @@ PokemonTower_7F_Movement_Grunt2ExitRight:: @ 81636CD
walk_down
step_end
PokemonTower_7F_EventScript_Grunt3:: @ 81636D6
PokemonTower_7F_EventScript_Grunt3::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, PokemonTower_7F_Text_Grunt3Intro, PokemonTower_7F_Text_Grunt3Defeat, PokemonTower_7F_EventScript_DefeatedGrunt3
msgbox PokemonTower_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_7F_EventScript_DefeatedGrunt3:: @ 81636F1
PokemonTower_7F_EventScript_DefeatedGrunt3::
msgbox PokemonTower_7F_Text_Grunt3PostBattle
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
@@ -190,28 +190,28 @@ PokemonTower_7F_EventScript_DefeatedGrunt3:: @ 81636F1
goto PokemonTower_7F_EventScript_RemoveGrunt3
end
PokemonTower_7F_EventScript_Grunt3ExitRight:: @ 8163725
PokemonTower_7F_EventScript_Grunt3ExitRight::
applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitRight
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt3
end
PokemonTower_7F_EventScript_Grunt3ExitLeft:: @ 8163735
PokemonTower_7F_EventScript_Grunt3ExitLeft::
applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitLeft
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt3
end
PokemonTower_7F_EventScript_RemoveGrunt3:: @ 8163745
PokemonTower_7F_EventScript_RemoveGrunt3::
removeobject LOCALID_GRUNT3
release
end
PokemonTower_7F_EventScript_Unused:: @ 816374A
PokemonTower_7F_EventScript_Unused::
release
end
PokemonTower_7F_Movement_Grunt3ExitRight:: @ 816374C
PokemonTower_7F_Movement_Grunt3ExitRight::
walk_down
walk_down
walk_down
@@ -221,7 +221,7 @@ PokemonTower_7F_Movement_Grunt3ExitRight:: @ 816374C
walk_down
step_end
PokemonTower_7F_Movement_Grunt3Exit:: @ 8163754
PokemonTower_7F_Movement_Grunt3Exit::
walk_down
walk_down
walk_down
@@ -230,7 +230,7 @@ PokemonTower_7F_Movement_Grunt3Exit:: @ 8163754
walk_down
step_end
PokemonTower_7F_Movement_Grunt3ExitLeft:: @ 816375B
PokemonTower_7F_Movement_Grunt3ExitLeft::
walk_right
walk_down
walk_down
data/maps/PokemonTower_7F/text.inc
+10 -10
View File
@@ -1,14 +1,14 @@
PokemonTower_7F_Text_Grunt1Intro:: @ 817A380
PokemonTower_7F_Text_Grunt1Intro::
.string "What do you want?\n"
.string "Why are you here?$"
PokemonTower_7F_Text_Grunt1Defeat:: @ 817A3A4
PokemonTower_7F_Text_Grunt1Defeat::
.string "I give up!$"
PokemonTower_7F_Text_Grunt1PostBattle:: @ 817A3AF
PokemonTower_7F_Text_Grunt1PostBattle::
.string "I'm not going to forget this!$"
PokemonTower_7F_Text_Grunt2Intro:: @ 817A3CD
PokemonTower_7F_Text_Grunt2Intro::
.string "This old guy marched right up to\n"
.string "our HIDEOUT.\p"
.string "Then, he starts ranting about how\n"
@@ -16,25 +16,25 @@ PokemonTower_7F_Text_Grunt2Intro:: @ 817A3CD
.string "So, we're just talking it over as\n"
.string "adults.$"
PokemonTower_7F_Text_Grunt2Defeat:: @ 817A466
PokemonTower_7F_Text_Grunt2Defeat::
.string "Please!\n"
.string "No more!$"
PokemonTower_7F_Text_Grunt2PostBattle:: @ 817A477
PokemonTower_7F_Text_Grunt2PostBattle::
.string "POKéMON are only good for making\n"
.string "money. Why not use them?\p"
.string "You stay out of our business!$"
PokemonTower_7F_Text_Grunt3Intro:: @ 817A4CF
PokemonTower_7F_Text_Grunt3Intro::
.string "You're not saving anyone, kid!$"
PokemonTower_7F_Text_Grunt3Defeat:: @ 817A4EE
PokemonTower_7F_Text_Grunt3Defeat::
.string "Don't fight us ROCKETS!$"
PokemonTower_7F_Text_Grunt3PostBattle:: @ 817A506
PokemonTower_7F_Text_Grunt3PostBattle::
.string "You're not getting away with this!$"
PokemonTower_7F_Text_MrFujiThankYouFollowMe:: @ 817A529
PokemonTower_7F_Text_MrFujiThankYouFollowMe::
.string "MR. FUJI: Heh?\n"
.string "You came to save me?\p"
.string "Thank you. But, I came here of my\n"