diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-14 13:20:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 13:20:38 -0500 |
| commit | 02049d52ee5c9416f840d2bbb24f90e479e11f92 (patch) | |
| tree | fc85532a8635637e0a20dffa11310153a242757f /data/maps | |
| parent | 43316ffae83d49be09969e291779cc9e448b83a1 (diff) | |
| parent | cd4f65ecef4d3dc091d10749d8b43ce3a87ccfa6 (diff) | |
Merge pull request #351 from DizzyEggg/apprentice
Decompile apprentice
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/BattleFrontier_BattleTowerLobby/events.inc | 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/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc index 73bdeeb2b..740f01c0e 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc @@ -4,7 +4,7 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918 - object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701 + object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, 701 object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index e0f2c3c5e..73c56351f 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -12,7 +12,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690 BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 call BattleFrontier_BattleTowerLobby_EventScript_28CC84 setvar VAR_0x8004, 10 - special sub_81A085C + special CallApprenticeFunction compare VAR_0x8004, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 checkflag FLAG_0x934 @@ -21,7 +21,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5 clearflag FLAG_0x2BD setvar VAR_0x8004, 23 - special sub_81A085C + special CallApprenticeFunction BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0 end |