diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-02 11:28:48 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-07 01:46:05 +0800 |
| commit | 40a808351a5b76b0a536c5fac6c9479284468af8 (patch) | |
| tree | 859372f605e07b09299a58fe327634408d826715 /data | |
| parent | 7980c4aa071685983f84861cc7dc69d6daf30a90 (diff) | |
finished safari_zone
Diffstat (limited to 'data')
| -rw-r--r-- | data/map_event_scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc | 8 | ||||
| -rw-r--r-- | data/specials.inc | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index f3205689d..3cf5c1ced 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -4178,16 +4178,16 @@ gUnknown_81BFB5F:: @ 81BFB5F gUnknown_81BFB65:: @ 81BFB65 .incbin "baserom.gba", 0x1BFB65, 0x22 -gUnknown_81BFB87:: @ 81BFB87 +EventScript_SafariWarpOut:: @ 81BFB87 .incbin "baserom.gba", 0x1BFB87, 0x23 -gUnknown_81BFBAA:: @ 81BFBAA +EventScript_SafariRetire:: @ 81BFBAA .incbin "baserom.gba", 0x1BFBAA, 0x1B -gUnknown_81BFBC5:: @ 81BFBC5 +EventScript_SafariTimesUp:: @ 81BFBC5 .incbin "baserom.gba", 0x1BFBC5, 0x12 -gUnknown_81BFBD7:: @ 81BFBD7 +EventScript_SafariOutOfBalls:: @ 81BFBD7 .incbin "baserom.gba", 0x1BFBD7, 0x2D5 gUnknown_81BFEAC:: @ 81BFEAC diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index a2ee86113..d9bcea13d 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -17,7 +17,7 @@ EventScript_16D2C8:: @ 816D2C8 closemessage applymovement 255, Movement_16D367 waitmovement 0 - special sub_80A0EEC + special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -29,7 +29,7 @@ EventScript_16D2F2:: @ 816D2F2 closemessage applymovement 255, Movement_16D362 waitmovement 0 - special sub_80A0EEC + special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -44,7 +44,7 @@ EventScript_16D312:: @ 816D312 closemessage applymovement 255, Movement_16D362 waitmovement 0 - special sub_80A0EEC + special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -132,7 +132,7 @@ EventScript_16D3CA:: @ 816D3CA call_if 1, EventScript_16D441 compare_var_to_value VAR_0x4002, 2 call_if 1, EventScript_16D457 - special sub_80A0EC4 + special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 waitstate diff --git a/data/specials.inc b/data/specials.inc index e6cec1766..24d793093 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -214,8 +214,8 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_80A0EC4 - def_special sub_80A0EEC + def_special EnterSafariMode + def_special ExitSafariMode def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 |