From 5e9e52e3a95f4d7301565ad86084907f2d8a94e6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 9 Sep 2017 22:04:01 -0500 Subject: more renaming/refactoring --- data/scripts/maps/Route101.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 8462603a6..1acd4b598 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -224,7 +224,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F movesprite 255, 6, 13 move 255, Route101_Movement_1A083F waitmove 0 - special ChooseStarter + special ScrSpecial_ChooseStarter waitstate move 2, Route101_Movement_14EAD7 waitmove 0 -- cgit v1.2.3 From 270bd98d41a19c516a4be95f522deb26cc4300a9 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 13 Sep 2017 00:03:22 -0500 Subject: more labeling --- data/scripts/maps/Route101.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 1acd4b598..d945aadfc 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -229,7 +229,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F move 2, Route101_Movement_14EAD7 waitmove 0 msgbox Route101_Text_16D191, 4 - special HealPlayerParty + special ScrSpecial_HealPlayerParty setflag 720 clearflag 721 setflag 700 -- cgit v1.2.3 From 207f8e6a76f6b13855780bb2608be9d8c1f14b15 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:36:39 -0500 Subject: more script command renaming --- data/scripts/maps/Route101.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index d945aadfc..bfbc9f2bd 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playmusic 410, 1 + playbgm 410, 1 msgbox Route101_Text_16D10E, 4 closebutton movesprite 2, 0, 15 -- cgit v1.2.3 From 598756eaa47b523bd557a619e05cb23399ac02e5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:57:54 -0500 Subject: more script command renaming --- data/scripts/maps/Route101.inc | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index bfbc9f2bd..35fbaf744 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -23,18 +23,18 @@ Route101_EventScript_14E948:: @ 814E948 closebutton movesprite 2, 0, 15 movesprite 4, 0, 16 - move 255, Route101_Movement_14EA2C - move 2, Route101_Movement_14EA50 - move 4, Route101_Movement_14EA1F - waitmove 0 - move 4, Route101_Movement_14EA00 - move 2, Route101_Movement_14EA31 - waitmove 0 - move 2, Route101_Movement_1A0843 - waitmove 0 - move 4, Route101_Movement_14EA27 - move 2, Route101_Movement_14EA58 - waitmove 0 + applymovement 255, Route101_Movement_14EA2C + applymovement 2, Route101_Movement_14EA50 + applymovement 4, Route101_Movement_14EA1F + waitmovement 0 + applymovement 4, Route101_Movement_14EA00 + applymovement 2, Route101_Movement_14EA31 + waitmovement 0 + applymovement 2, Route101_Movement_1A0843 + waitmovement 0 + applymovement 4, Route101_Movement_14EA27 + applymovement 2, Route101_Movement_14EA58 + waitmovement 0 msgbox Route101_Text_16D119, 4 closebutton setvar 0x4060, 2 @@ -45,8 +45,8 @@ Route101_EventScript_14E9B8:: @ 814E9B8 lockall msgbox Route101_Text_16D15E, 4 closebutton - move 255, Route101_Movement_14E9FA - waitmove 0 + applymovement 255, Route101_Movement_14E9FA + waitmovement 0 releaseall end @@ -54,8 +54,8 @@ Route101_EventScript_14E9CE:: @ 814E9CE lockall msgbox Route101_Text_16D15E, 4 closebutton - move 255, Route101_Movement_14E9FC - waitmove 0 + applymovement 255, Route101_Movement_14E9FC + waitmovement 0 releaseall end @@ -63,8 +63,8 @@ Route101_EventScript_14E9E4:: @ 814E9E4 lockall msgbox Route101_Text_16D15E, 4 closebutton - move 255, Route101_Movement_14E9FE - waitmove 0 + applymovement 255, Route101_Movement_14E9FE + waitmovement 0 releaseall end @@ -222,12 +222,12 @@ Route101_EventScript_14EA7F:: @ 814EA7F fadescreen 1 disappear 4 movesprite 255, 6, 13 - move 255, Route101_Movement_1A083F - waitmove 0 + applymovement 255, Route101_Movement_1A083F + waitmovement 0 special ScrSpecial_ChooseStarter waitstate - move 2, Route101_Movement_14EAD7 - waitmove 0 + applymovement 2, Route101_Movement_14EAD7 + waitmovement 0 msgbox Route101_Text_16D191, 4 special ScrSpecial_HealPlayerParty setflag 720 -- cgit v1.2.3 From b4ba35a54c0f6204e34d2814351162c79ea4c0ba Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 26 Sep 2017 14:33:52 -0500 Subject: more command renaming --- data/scripts/maps/Route101.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 35fbaf744..35c2d4117 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -21,8 +21,8 @@ Route101_EventScript_14E948:: @ 814E948 playbgm 410, 1 msgbox Route101_Text_16D10E, 4 closebutton - movesprite 2, 0, 15 - movesprite 4, 0, 16 + setobjectxy 2, 0, 15 + setobjectxy 4, 0, 16 applymovement 255, Route101_Movement_14EA2C applymovement 2, Route101_Movement_14EA50 applymovement 4, Route101_Movement_14EA1F @@ -220,8 +220,8 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag 2048 setflag 82 fadescreen 1 - disappear 4 - movesprite 255, 6, 13 + removeobject 4 + setobjectxy 255, 6, 13 applymovement 255, Route101_Movement_1A083F waitmovement 0 special ScrSpecial_ChooseStarter -- cgit v1.2.3 From e926119b726839bc687c503db3680899906aad0d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 17:04:25 -0500 Subject: update --- data/scripts/maps/Route101.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 35c2d4117..2fe80e098 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -20,7 +20,7 @@ Route101_EventScript_14E948:: @ 814E948 lockall playbgm 410, 1 msgbox Route101_Text_16D10E, 4 - closebutton + closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 applymovement 255, Route101_Movement_14EA2C @@ -36,7 +36,7 @@ Route101_EventScript_14E948:: @ 814E948 applymovement 2, Route101_Movement_14EA58 waitmovement 0 msgbox Route101_Text_16D119, 4 - closebutton + closemessage setvar 0x4060, 2 releaseall end @@ -44,7 +44,7 @@ Route101_EventScript_14E948:: @ 814E948 Route101_EventScript_14E9B8:: @ 814E9B8 lockall msgbox Route101_Text_16D15E, 4 - closebutton + closemessage applymovement 255, Route101_Movement_14E9FA waitmovement 0 releaseall @@ -53,7 +53,7 @@ Route101_EventScript_14E9B8:: @ 814E9B8 Route101_EventScript_14E9CE:: @ 814E9CE lockall msgbox Route101_Text_16D15E, 4 - closebutton + closemessage applymovement 255, Route101_Movement_14E9FC waitmovement 0 releaseall @@ -62,7 +62,7 @@ Route101_EventScript_14E9CE:: @ 814E9CE Route101_EventScript_14E9E4:: @ 814E9E4 lockall msgbox Route101_Text_16D15E, 4 - closebutton + closemessage applymovement 255, Route101_Movement_14E9FE waitmovement 0 releaseall -- cgit v1.2.3 From 2fea5bf7d82e85f4b33857e6eb5b4ddc6e7542d2 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 27 Nov 2017 22:12:09 -0600 Subject: convert data files to use constants/map.h --- data/scripts/maps/Route101.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 2fe80e098..747b56197 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -236,7 +236,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F setvar 0x4084, 2 setvar 0x4060, 3 clearflag 0x4000 - warp LittlerootTown_ProfessorBirchsLab, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release end -- cgit v1.2.3 From d1b967444e7f0e21b8b5d1a09c8e164bd828da08 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 12:39:11 -0800 Subject: Label flags up to flag 99. --- data/scripts/maps/Route101.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 747b56197..86c22fa40 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -218,7 +218,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer setflag 2048 - setflag 82 + setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 setobjectxy 255, 6, 13 -- cgit v1.2.3 From 79e3d29c29335d7e1fb8478b16d100b1844f2da4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 14:38:49 -0800 Subject: Use constants for all SYS flags --- data/scripts/maps/Route101.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 86c22fa40..122e723a1 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -217,7 +217,7 @@ Route101_EventScript_14EA76:: @ 814EA76 Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer - setflag 2048 + setflag SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 -- cgit v1.2.3 From 8dd25bcad09064f0b3314a71a62ad22f91b42bb3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 4 Dec 2017 20:48:25 -0800 Subject: Start using constants for hide-show flags --- data/scripts/maps/Route101.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 122e723a1..c9a364c80 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -230,9 +230,9 @@ Route101_EventScript_14EA7F:: @ 814EA7F waitmovement 0 msgbox Route101_Text_16D191, 4 special ScrSpecial_HealPlayerParty - setflag 720 - clearflag 721 - setflag 700 + setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA + clearflag FLAG_HIDE_BIRCH_IN_LAB + setflag FLAG_HIDE_BIRCH_STARTERS_BAG setvar 0x4084, 2 setvar 0x4060, 3 clearflag 0x4000 -- cgit v1.2.3 From 88716f4c0e053a984eeb4bef92fefa42027dd22a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 17 Dec 2017 20:07:53 -0800 Subject: Use FLAG_ prefix for all flags --- data/scripts/maps/Route101.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index c9a364c80..1810a6495 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -217,7 +217,7 @@ Route101_EventScript_14EA76:: @ 814EA76 Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer - setflag SYS_POKEMON_GET + setflag FLAG_SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 -- cgit v1.2.3 From 4b5ad9de049a63b101b2bf5f2f2cb92beb26e5fb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Dec 2017 12:36:12 -0600 Subject: Name and use temp var constants --- data/scripts/maps/Route101.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 1810a6495..f03d7cc62 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -12,7 +12,7 @@ Route101_MapScript2_14E935:: @ 814E935 .2byte 0 Route101_EventScript_14E93F:: @ 814E93F - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 setvar 0x4060, 1 end @@ -235,7 +235,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_HIDE_BIRCH_STARTERS_BAG setvar 0x4084, 2 setvar 0x4060, 3 - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release -- cgit v1.2.3 From 51247c3eb9dc1f8ecf4298ada62ed7c2f768b50e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Dec 2017 10:41:27 -0600 Subject: Name and use general purpose vars --- data/scripts/maps/Route101.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index f03d7cc62..6749f2136 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -8,12 +8,12 @@ Route101_MapScript1_14E92F:: @ 814E92F end Route101_MapScript2_14E935:: @ 814E935 - map_script_2 0x4060, 0, Route101_EventScript_14E93F + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F .2byte 0 Route101_EventScript_14E93F:: @ 814E93F setflag FLAG_SPECIAL_FLAG_0 - setvar 0x4060, 1 + setvar VAR_ROUTE101_STATE, 1 end Route101_EventScript_14E948:: @ 814E948 @@ -37,7 +37,7 @@ Route101_EventScript_14E948:: @ 814E948 waitmovement 0 msgbox Route101_Text_16D119, 4 closemessage - setvar 0x4060, 2 + setvar VAR_ROUTE101_STATE, 2 releaseall end @@ -233,8 +233,8 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA clearflag FLAG_HIDE_BIRCH_IN_LAB setflag FLAG_HIDE_BIRCH_STARTERS_BAG - setvar 0x4084, 2 - setvar 0x4060, 3 + setvar VAR_BIRCH_LAB_STATE, 2 + setvar VAR_ROUTE101_STATE, 3 clearflag FLAG_SPECIAL_FLAG_0 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate -- cgit v1.2.3 From 5c427e8afed44ed3720cf97d6748fa9e806c9b83 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 14:37:52 -0800 Subject: Use song constants in scripts --- data/scripts/maps/Route101.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route101.inc') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 6749f2136..6840c45f4 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playbgm 410, 1 + playbgm BGM_EVENT0, TRUE msgbox Route101_Text_16D10E, 4 closemessage setobjectxy 2, 0, 15 -- cgit v1.2.3