diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-14 18:56:18 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-16 12:28:49 -0500 |
| commit | fc3783b7395b25d290ec650d79fbdc80518046cd (patch) | |
| tree | 13f1654408bf4af12b60f04bd6847fcc44a5fcaa /data/maps | |
| parent | ef8370566f14c22b9927db09b8ff69a98049c796 (diff) | |
WIP Document apprentice
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/BattleFrontier_BattleTowerLobby/map.json | 2 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattleTowerLobby/scripts.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index 339b20b56..13bda5f22 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EventScript_Apprentice", + "script": "BattleFrontier_BattleTowerLobby_EventScript_Apprentice", "flag": "FLAG_HIDE_APPRENTICE" }, { diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 3d278308c..d64b82e92 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690 BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 call BattleFrontier_BattleTowerLobby_EventScript_28CC84 - setvar VAR_0x8004, 10 + setvar VAR_0x8004, APPRENTICE_FUNC_10 special CallApprenticeFunction compare VAR_0x8004, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 @@ -19,7 +19,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5 clearflag FLAG_HIDE_APPRENTICE - setvar VAR_0x8004, 23 + setvar VAR_0x8004, APPRENTICE_FUNC_23 special CallApprenticeFunction BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0 |