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

Sync event macros

Browse Source
This commit is contained in:
GriffinR
2020-01-10 00:44:57 -05:00
parent 94fbc3ac48
commit 4a6f15ba24
220 changed files with 3209 additions and 3580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SaffronCity_Dojo/scripts.inc
+16 -19
View File
@@ -20,8 +20,7 @@ SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE
SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00
lock
faceplayer
checkflag FLAG_GOT_HITMON_FROM_DOJO
goto_if TRUE, EventScript_16EC3C
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C
drawmonpic SPECIES_HITMONLEE, 10, 3
setvar VAR_TEMP_1, SPECIES_HITMONLEE
applymovement 5, Movement_WalkInPlaceFastestUp
@@ -30,7 +29,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00
msgbox gUnknown_819B44E, MSGBOX_YESNO
call EventScript_1A6675
compare VAR_RESULT, 1
goto_if eq, EventScript_16EC82
goto_if_eq EventScript_16EC82
erasemonpic
release
end
@@ -43,8 +42,7 @@ EventScript_16EC3C:: @ 816EC3C
SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46
lock
faceplayer
checkflag FLAG_GOT_HITMON_FROM_DOJO
goto_if TRUE, EventScript_16EC3C
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C
drawmonpic SPECIES_HITMONCHAN, 10, 3
setvar VAR_TEMP_1, SPECIES_HITMONCHAN
applymovement 5, Movement_WalkInPlaceFastestUp
@@ -53,20 +51,20 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46
msgbox gUnknown_819B49E, MSGBOX_YESNO
call EventScript_1A6675
compare VAR_RESULT, 1
goto_if eq, EventScript_16EC82
goto_if_eq EventScript_16EC82
erasemonpic
release
end
EventScript_16EC82:: @ 816EC82
erasemonpic
givemon VAR_TEMP_1, 25, ITEM_NONE, 0, 0, 0
givemon VAR_TEMP_1, 25, ITEM_NONE
compare VAR_RESULT, 0
goto_if eq, EventScript_16ECB5
goto_if_eq EventScript_16ECB5
compare VAR_RESULT, 1
goto_if eq, EventScript_16ECEC
goto_if_eq EventScript_16ECEC
compare VAR_RESULT, 2
goto_if eq, EventScript_1A927C
goto_if_eq EventScript_1A927C
release
end
@@ -80,7 +78,7 @@ EventScript_16ECB5:: @ 816ECB5
setflag FLAG_GOT_HITMON_FROM_DOJO
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16ED29
goto_if_eq EventScript_16ED29
call EventScript_1A8C27
call EventScript_1A74EB
goto EventScript_16ED29
@@ -96,7 +94,7 @@ EventScript_16ECEC:: @ 816ECEC
setflag FLAG_GOT_HITMON_FROM_DOJO
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16ED1E
goto_if_eq EventScript_16ED1E
call EventScript_1A8C33
goto EventScript_16ED1E
end
@@ -123,29 +121,28 @@ SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D
end
SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HITOSHI, 0, Text_19B3DF, Text_19B40F
trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F
msgbox gUnknown_819B41F, 6
end
SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HIDEKI, 0, Text_19B2E0, Text_19B2FD
trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD
msgbox gUnknown_819B30F, 6
end
SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_AARON, 0, Text_19B341, Text_19B396
trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396
msgbox gUnknown_819B3AC, 6
end
SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_MIKE, 0, Text_19B275, Text_19B292
trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292
msgbox gUnknown_819B29D, 6
end
SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0
checkflag FLAG_GOT_HITMON_FROM_DOJO
goto_if TRUE, EventScript_16EDC6
trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6
msgbox gUnknown_819B1A7, 6
end