dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2019-12-06 02:34:54 -05:00
committed by GitHub
parent cb90f22c5e 7beddd16dd
commit c51e0f3bae
106 changed files with 1965 additions and 1418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PetalburgCity_WallysHouse/scripts.inc
+4 -4
View File
@@ -1,9 +1,9 @@
PetalburgCity_WallysHouse_MapScripts:: @ 8204229
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_OnWarp
.byte 0
PetalburgCity_WallysHouse_MapScript2_OnWarp: @ 8204234
PetalburgCity_WallysHouse_OnWarp: @ 8204234
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther
.2byte 0
@@ -12,7 +12,7 @@ PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E
turnobject 1, DIR_WEST
end
PetalburgCity_WallysHouse_MapScript2_OnFrame: @ 8204247
PetalburgCity_WallysHouse_OnFrame: @ 8204247
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_GiveHM03Surf
.2byte 0