diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/phone_scripts.asm | 4 | ||||
| -rw-r--r-- | engine/spawn_points.asm | 2 | ||||
| -rw-r--r-- | engine/std_scripts.asm | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 9aba26450..a7a41a8ce 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1001,7 +1001,7 @@ UnknownScript_0xbd6a6: iftrue UnknownScript_0xbd6bd setflag ENGINE_DUNSPARCE_SWARM pokenamemem DUNSPARCE, $1 - loadwilddata $0, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE + loadwilddata $0, DARK_CAVE_VIOLET_ENTRANCE displaylocation DARK_CAVE, $2 farjump UnknownScript_0xa05de @@ -1224,7 +1224,7 @@ UnknownScript_0xbd887: iftrue UnknownScript_0xbd8a2 setflag ENGINE_YANMA_SWARM pokenamemem YANMA, $1 - loadwilddata $1, GROUP_ROUTE_35, MAP_ROUTE_35 + loadwilddata $1, ROUTE_35 displaylocation ROUTE_35, $2 farjump UnknownScript_0xa05ce diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm index d5a648594..e577dc528 100644 --- a/engine/spawn_points.asm +++ b/engine/spawn_points.asm @@ -89,7 +89,7 @@ IsSpawnPoint: ; 15344 .next push bc - ld bc, 4 + ld bc, 4 ; length of a spawn table entry add hl, bc pop bc inc c diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index aa0b879a7..b1d6d0f08 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -298,7 +298,7 @@ RadioTowerRocketsScript: clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST specialphonecall ELMCALL_WEIRDBROADCAST - domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1 + domaptrigger MAHOGANY_TOWN, $1 end BugContestResultsWarpScript: @@ -307,7 +307,7 @@ BugContestResultsWarpScript: setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE - warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4 + warp ROUTE_36_NATIONAL_PARK_GATE, $0, $4 applymovement $0, Movement_ContestResults_WalkAfterWarp BugContestResultsScript: @@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons BugContestResults_CleanUp loadmovesprites dotrigger $0 - domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0 + domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0 setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_2A setevent EVENT_BUG_CATCHING_CONTESTANT_3A |