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

Fix wallys parents misnamed as uncle/aunt

Browse Source
This commit is contained in:
GriffinR
2020-08-18 17:51:41 -04:00
parent 54fb8eb68e
commit 503dafd210
8 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PetalburgCity_WallysHouse/scripts.inc
+6 -6
View File
@@ -1,4 +1,4 @@
.set LOCALID_WALLYS_UNCLE, 1
.set LOCALID_WALLYS_DAD, 1
PetalburgCity_WallysHouse_MapScripts:: @ 8204229
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame
@@ -6,12 +6,12 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229
.byte 0
PetalburgCity_WallysHouse_OnWarp: @ 8204234
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther
.2byte 0
PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E
PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther:: @ 820423E
turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST
turnobject LOCALID_WALLYS_UNCLE, DIR_WEST
turnobject LOCALID_WALLYS_DAD, DIR_WEST
end
PetalburgCity_WallysHouse_OnFrame: @ 8204247
@@ -28,7 +28,7 @@ PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251
releaseall
end
PetalburgCity_WallysHouse_EventScript_WallyUncle:: @ 8204278
PetalburgCity_WallysHouse_EventScript_WallysDad:: @ 8204278
lock
faceplayer
goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad
@@ -54,7 +54,7 @@ PetalburgCity_WallysHouse_EventScript_PlayedWithWally:: @ 82042B6
release
end
PetalburgCity_WallysHouse_EventScript_WallyAunt:: @ 82042C0
PetalburgCity_WallysHouse_EventScript_WallysMom:: @ 82042C0
lock
faceplayer
goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf