[in progress] Harmonize more constant and data files with pokegold

This commit is contained in:
Rangi
2020-06-16 14:11:49 -04:00
parent 2354c41a96
commit 7b2515d1e4
51 changed files with 263 additions and 263 deletions

View File

@@ -29,7 +29,7 @@ TrainerBugCatcherWade1:
loadvar VAR_CALLERID, PHONE_BUG_CATCHER_WADE
endifjustbattled
opentext
checkflag ENGINE_WADE
checkflag ENGINE_WADE_READY_FOR_REMATCH
iftrue .WadeRematch
checkflag ENGINE_WADE_HAS_ITEM
iftrue .WadeItem
@@ -79,7 +79,7 @@ TrainerBugCatcherWade1:
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 1
clearflag ENGINE_WADE
clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight1:
@@ -87,7 +87,7 @@ TrainerBugCatcherWade1:
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 2
clearflag ENGINE_WADE
clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight2:
@@ -95,7 +95,7 @@ TrainerBugCatcherWade1:
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 3
clearflag ENGINE_WADE
clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight3:
@@ -103,14 +103,14 @@ TrainerBugCatcherWade1:
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 4
clearflag ENGINE_WADE
clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight4:
loadtrainer BUG_CATCHER, WADE5
startbattle
reloadmapafterbattle
clearflag ENGINE_WADE
clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.WadeItem: