Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistent capitalization for map names, matching their constants

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-10 13:37:15 -05:00
parent 94c7def488
commit 699495bfcb
67 changed files with 494 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
maps/Route34.asm
View File

@@ -6,8 +6,8 @@ const_value set 2
const ROUTE34_OFFICER
const ROUTE34_POKEFAN_M
const ROUTE34_GRAMPS
const ROUTE34_DAYCARE_MON_1
const ROUTE34_DAYCARE_MON_2
const ROUTE34_DAY_CARE_MON_1
const ROUTE34_DAY_CARE_MON_2
const ROUTE34_COOLTRAINER_F1
const ROUTE34_COOLTRAINER_F2
const ROUTE34_COOLTRAINER_F3
@@ -25,35 +25,35 @@ Route34_MapScriptHeader:
dbw MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback:
checkflag ENGINE_DAYCARE_MAN_HAS_EGG
iftrue .PutDaycareManOutside
clearevent EVENT_DAYCARE_MAN_IN_DAYCARE
setevent EVENT_DAYCARE_MAN_ON_ROUTE_34
checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
iftrue .PutDayCareManOutside
clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
jump .CheckMon1
.PutDaycareManOutside:
setevent EVENT_DAYCARE_MAN_IN_DAYCARE
clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34
.PutDayCareManOutside:
setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
jump .CheckMon1
.CheckMon1:
checkflag ENGINE_DAYCARE_MAN_HAS_MON
checkflag ENGINE_DAY_CARE_MAN_HAS_MON
iffalse .HideMon1
clearevent EVENT_DAYCARE_MON_1
clearevent EVENT_DAY_CARE_MON_1
jump .CheckMon2
.HideMon1:
setevent EVENT_DAYCARE_MON_1
setevent EVENT_DAY_CARE_MON_1
jump .CheckMon2
.CheckMon2:
checkflag ENGINE_DAYCARE_LADY_HAS_MON
checkflag ENGINE_DAY_CARE_LADY_HAS_MON
iffalse .HideMon2
clearevent EVENT_DAYCARE_MON_2
clearevent EVENT_DAY_CARE_MON_2
return
.HideMon2:
setevent EVENT_DAYCARE_MON_2
setevent EVENT_DAY_CARE_MON_2
return
DayCareManScript_Outside:
@@ -63,7 +63,7 @@ DayCareManScript_Outside:
waitbutton
closetext
if_equal $1, .end_fail
clearflag ENGINE_DAYCARE_MAN_HAS_EGG
clearflag ENGINE_DAY_CARE_MAN_HAS_EGG
checkcode VAR_FACING
if_equal RIGHT, .walk_around_player
applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside
@@ -78,13 +78,13 @@ DayCareManScript_Outside:
disappear ROUTE34_GRAMPS
end
DaycareMon1Script:
DayCareMon1Script:
opentext
special Special_DayCareMon1
closetext
end
DaycareMon2Script:
DayCareMon2Script:
opentext
special Special_DayCareMon2
closetext
@@ -773,9 +773,9 @@ Route34_MapEventHeader:
db 5
warp_def $25, $d, 1, ROUTE_34_ILEX_FOREST_GATE
warp_def $25, $e, 2, ROUTE_34_ILEX_FOREST_GATE
warp_def $e, $b, 1, DAYCARE
warp_def $f, $b, 2, DAYCARE
warp_def $f, $d, 3, DAYCARE
warp_def $e, $b, 1, DAY_CARE
warp_def $f, $b, 2, DAY_CARE
warp_def $f, $d, 3, DAY_CARE
.XYTriggers:
db 0
@@ -796,9 +796,9 @@ Route34_MapEventHeader:
person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerGina1, -1
person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerKeithScript, -1
person_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1
person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAYCARE_MAN_ON_ROUTE_34
person_event SPRITE_DAYCARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon1Script, EVENT_DAYCARE_MON_1
person_event SPRITE_DAYCARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon2Script, EVENT_DAYCARE_MON_2
person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34
person_event SPRITE_DAY_CARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1
person_event SPRITE_DAY_CARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2
person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1
person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1
person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1