dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

update applymovement to remove magic numbers

Browse Source
This commit is contained in:
Melody
2018-12-19 14:08:01 -05:00
parent b2ac3b6d6f
commit 5e6ceeb631
114 changed files with 531 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
data/scripts/cable_club.inc
View File

@@ -237,7 +237,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5
goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D
waitmovement 0
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F
waitmovement 0
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349
waitmovement 0
@@ -258,7 +258,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF
setvar VAR_0x4087, 0
compare VAR_0x8007, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E
waitmovement 0
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D
waitmovement 0
@@ -278,7 +278,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C
OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44
special CloseLink
setvar VAR_0x4087, 0
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F
waitmovement 0
compare VAR_0x8007, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B
@@ -302,7 +302,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84
setvar VAR_0x4087, 0
compare VAR_0x8007, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E
waitmovement 0
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D
waitmovement 0
@@ -316,24 +316,24 @@ OldaleTown_PokemonCenter_2F_EventScript_276DAE:: @ 8276DAE
delay 60
message OldaleTown_PokemonCenter_2F_Text_27854C
waitmessage
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F
waitmovement 0
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349
waitmovement 0
return
OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F
waitmovement 0
return
OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
lockall
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_2725A6
waitmovement 0
msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT
closemessage
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_276E10
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_276E10
waitmovement 0
delay 30
msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT
@@ -462,11 +462,11 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D
waitmovement 0
closemessage
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
closedoor 9, 1
@@ -481,7 +481,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
end
OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B
applymovement 255, Movement_277352
applymovement EVENT_OBJ_ID_PLAYER, Movement_277352
waitmovement 0
return
@@ -566,11 +566,11 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D
waitmovement 0
closemessage
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
closedoor 9, 1
@@ -641,11 +641,11 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D
waitmovement 0
closemessage
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
closedoor 9, 1
@@ -1040,11 +1040,11 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
delay 60
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D
waitmovement 0
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356
waitmovement 0
opendoor 5, 1
waitdooranim
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
closedoor 5, 1
@@ -1379,11 +1379,11 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D
waitmovement 0
closemessage
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
closedoor 9, 1
@@ -1593,7 +1593,7 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E
applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_27734D
waitmovement 0
closemessage
applymovement 255, MossdeepCity_GameCorner_1F_Movement_277360
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_277360
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
release

46
data/scripts/players_house.inc
View File

@@ -15,19 +15,19 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT
closemessage
setvar VAR_0x4092, 4
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292763
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763
applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6
waitmovement 0
releaseall
end
LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
waitmovement 0
return
@@ -40,7 +40,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AF0
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0
waitmovement 0
releaseall
end
@@ -83,7 +83,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
@@ -96,7 +96,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A4
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
@@ -158,17 +158,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2725A8
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_29294B
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE0
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0
waitmovement 0
playbgm MUS_INTER_V, 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE6
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_29296C
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -183,17 +183,17 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2725A4
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_29294B
applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AE8
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8
waitmovement 0
playbgm MUS_INTER_V, 0
msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA
waitmovement 0
applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AEE
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_29296C
applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8
waitmovement 0
msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -217,7 +217,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C
LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A6
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT
fadedefaultbgm
@@ -565,38 +565,38 @@ LittlerootTown_BrendansHouse_1F_EventScript_292CC1:: @ 8292CC1
return
LittlerootTown_BrendansHouse_1F_EventScript_292CD6:: @ 8292CD6
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DCC
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC
applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DBC
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292CEF:: @ 8292CEF
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DCC
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC
applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DC1
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D08:: @ 8292D08
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DC6
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DC6
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DD1
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD1
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DD7
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7
waitmovement 0
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A4
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DDE
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE
waitmovement 0
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A8
waitmovement 0
@@ -605,14 +605,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33
LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8
waitmovement 0
return
@@ -629,14 +629,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D
LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
waitmovement 0
return

2
data/scripts/secret_base.inc
View File

@@ -442,7 +442,7 @@ EventScript_275B5B:: @ 8275B5B
end
SecretBase_RedCave1_EventScript_275B81:: @ 8275B81
applymovement 255, SecretBase_RedCave1_Movement_275BB4
applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4
waitmovement 0
setvar VAR_0x4097, 1
msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO