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/Route2_House/scripts.inc
+6 -6
View File
@@ -1,11 +1,11 @@
Route2_House_MapScripts:: @ 816F5F8
Route2_House_MapScripts::
.byte 0
Route2_House_EventScript_Scientist:: @ 816F5F9
Route2_House_EventScript_Scientist::
msgbox Route2_House_Text_FaintedMonsCanUseFieldMoves, MSGBOX_NPC
end
Route2_House_EventScript_Reyley:: @ 816F602
Route2_House_EventScript_Reyley::
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_MR_MIME
@@ -26,18 +26,18 @@ Route2_House_EventScript_Reyley:: @ 816F602
release
end
Route2_House_EventScript_DeclineTrade:: @ 816F65C
Route2_House_EventScript_DeclineTrade::
msgbox Trade_Text_AwwOhWell
release
end
Route2_House_EventScript_NotRequestedMon:: @ 816F666
Route2_House_EventScript_NotRequestedMon::
getspeciesname 0, VAR_0x8009
msgbox Trade_Text_WhatThatsNoMon
release
end
Route2_House_EventScript_AlreadyTraded:: @ 816F674
Route2_House_EventScript_AlreadyTraded::
msgbox Trade_Text_IsntMyOldMonGreat
release
end
data/maps/Route2_House/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
Route2_House_Text_FaintedMonsCanUseFieldMoves:: @ 819D5E7
Route2_House_Text_FaintedMonsCanUseFieldMoves::
.string "A fainted POKéMON just has no\n"
.string "energy left to battle.\p"
.string "It can still use moves like CUT\n"