ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/maps/PetalburgCity/map.json
View File

@ -35,8 +35,8 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_EventScript_WallyAunt", "script": "PetalburgCity_EventScript_WallysMom",
"flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_WALLY", "graphics_id": "OBJ_EVENT_GFX_WALLY",
@ -88,7 +88,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "0x0", "script": "0x0",
"flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE" "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

14
data/maps/PetalburgCity/scripts.inc
View File

@ -1,6 +1,6 @@
.set LOCALID_WALLY, 2 .set LOCALID_WALLY, 2
.set LOCALID_BOY, 3 .set LOCALID_BOY, 3
.set LOCALID_WALLYS_UNCLE, 5 .set LOCALID_WALLYS_DAD, 5
.set LOCALID_GYM_BOY, 8 .set LOCALID_GYM_BOY, 8
.set LOCALID_SCOTT, 9 .set LOCALID_SCOTT, 9
@ -68,17 +68,17 @@ PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E
PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390 PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390
lockall lockall
setflag FLAG_HIDE_MAP_NAME_POPUP setflag FLAG_HIDE_MAP_NAME_POPUP
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Movement_WalkToWallyHouseUncle applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkToWallyHouseWallysDad
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 5 setvar VAR_0x8005, 5
opendoor VAR_0x8004, VAR_0x8005 opendoor VAR_0x8004, VAR_0x8005
waitdooranim waitdooranim
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Movement_WalkInsideHouseUncle applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkInsideHouseWallysDad
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer
waitmovement 0 waitmovement 0
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor VAR_0x8004, VAR_0x8005 closedoor VAR_0x8004, VAR_0x8005
waitdooranim waitdooranim
@ -100,7 +100,7 @@ PetalburgCity_EventScript_Boy:: @ 81DC3E6
release release
end end
PetalburgCity_EventScript_WallyAunt:: @ 81DC3FD PetalburgCity_EventScript_WallysMom:: @ 81DC3FD
msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC
end end
@ -129,7 +129,7 @@ PetalburgCity_Movement_WalkInsideHousePlayer: @ 81DC418
walk_up walk_up
step_end step_end
PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B PetalburgCity_Movement_WalkToWallyHouseWallysDad: @ 81DC41B
delay_8 delay_8
walk_down walk_down
walk_down walk_down
@ -149,7 +149,7 @@ PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B
walk_up walk_up
step_end step_end
PetalburgCity_Movement_WalkInsideHouseUncle: @ 81DC42D PetalburgCity_Movement_WalkInsideHouseWallysDad: @ 81DC42D
walk_up walk_up
set_invisible set_invisible
step_end step_end

2
data/maps/PetalburgCity_Gym/map.json
View File

@ -155,7 +155,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "0x0", "script": "0x0",
"flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE" "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD"
} }
], ],
"warp_events": [ "warp_events": [

116
data/maps/PetalburgCity_Gym/scripts.inc
View File

@ -1,6 +1,6 @@
.set LOCALID_NORMAN, 1 .set LOCALID_NORMAN, 1
.set LOCALID_WALLY, 10 .set LOCALID_WALLY, 10
.set LOCALID_WALLYS_UNCLE, 11 .set LOCALID_WALLYS_DAD, 11
PetalburgCity_Gym_MapScripts:: @ 8204889 PetalburgCity_Gym_MapScripts:: @ 8204889
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad
@ -213,7 +213,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyEast call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyEast
removeobject LOCALID_WALLY removeobject LOCALID_WALLY
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM
setvar VAR_PETALBURG_GYM_STATE, 1 setvar VAR_PETALBURG_GYM_STATE, 1
setvar VAR_PETALBURG_CITY_STATE, 2 setvar VAR_PETALBURG_CITY_STATE, 2
clearflag FLAG_HIDE_PETALBURG_CITY_WALLY clearflag FLAG_HIDE_PETALBURG_CITY_WALLY
@ -433,11 +433,11 @@ PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
delay 40 delay 40
playse SE_DOOR playse SE_DOOR
delay 10 delay 10
addobject LOCALID_WALLYS_UNCLE addobject LOCALID_WALLYS_DAD
switch VAR_FACING switch VAR_FACING
case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysDadArrivesNorth
case DIR_WEST, PetalburgCity_Gym_EventScript_WallysUncleArrivesWest case DIR_WEST, PetalburgCity_Gym_EventScript_WallysDadArrivesWest
case DIR_EAST, PetalburgCity_Gym_EventScript_WallysUncleArrivesEast case DIR_EAST, PetalburgCity_Gym_EventScript_WallysDadArrivesEast
end end
PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2 PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2
@ -448,119 +448,119 @@ PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2
msgbox PetalburgCity_Gym_Text_ExplainFacade, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_ExplainFacade, MSGBOX_DEFAULT
return return
PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth:: @ 8204EF5 PetalburgCity_Gym_EventScript_WallysDadArrivesNorth:: @ 8204EF5
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
goto PetalburgCity_Gym_EventScript_WallysUncleArrives goto PetalburgCity_Gym_EventScript_WallysDadArrives
PetalburgCity_Gym_EventScript_WallysUncleArrivesEast:: @ 8204EFF PetalburgCity_Gym_EventScript_WallysDadArrivesEast:: @ 8204EFF
setvar VAR_0x8008, 2 setvar VAR_0x8008, 2
goto PetalburgCity_Gym_EventScript_WallysUncleArrives goto PetalburgCity_Gym_EventScript_WallysDadArrives
PetalburgCity_Gym_EventScript_WallysUncleArrivesWest:: @ 8204F09 PetalburgCity_Gym_EventScript_WallysDadArrivesWest:: @ 8204F09
setvar VAR_0x8008, 3 setvar VAR_0x8008, 3
goto PetalburgCity_Gym_EventScript_WallysUncleArrives goto PetalburgCity_Gym_EventScript_WallysDadArrives
PetalburgCity_Gym_EventScript_WallysUncleArrives:: @ 8204F13 PetalburgCity_Gym_EventScript_WallysDadArrives:: @ 8204F13
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleEnterGym applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_ExclamationMark applymovement LOCALID_WALLYS_DAD, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_Delay48 applymovement LOCALID_WALLYS_DAD, Common_Movement_Delay48
waitmovement 0 waitmovement 0
delay 10 delay 10
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest
msgbox PetalburgCity_Gym_Text_PleaseComeWithMe, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_PleaseComeWithMe, MSGBOX_DEFAULT
closemessage closemessage
delay 20 delay 20
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest
msgbox PetalburgCity_Gym_Text_LetMeBorrowPlayer, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_LetMeBorrowPlayer, MSGBOX_DEFAULT
closemessage closemessage
setflag FLAG_DONT_TRANSITION_MUSIC setflag FLAG_DONT_TRANSITION_MUSIC
playbgm MUS_TSURETEK, 0 playbgm MUS_TSURETEK, 0
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest
removeobject LOCALID_WALLYS_UNCLE removeobject LOCALID_WALLYS_DAD
setvar VAR_PETALBURG_CITY_STATE, 4 setvar VAR_PETALBURG_CITY_STATE, 4
clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
warp MAP_PETALBURG_CITY, 255, 15, 8 warp MAP_PETALBURG_CITY, 255, 15, 8
waitstate waitstate
release release
end end
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth:: @ 8204FCC PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth:: @ 8204FCC
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast:: @ 8204FD7 PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast:: @ 8204FD7
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2 PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest:: @ 8204FE2
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth:: @ 8204FED
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009 PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast:: @ 8205009
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025 PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest:: @ 8205025
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041 PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth:: @ 8205041
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitNorth applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast:: @ 820505A PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast:: @ 820505A
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitEast applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitEast
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest:: @ 820506C PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest:: @ 820506C
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitWest applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitWest
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_Movement_WallysUncleExitNorth: @ 820507E PetalburgCity_Gym_Movement_WallysDadExitNorth: @ 820507E
walk_down walk_down
walk_down walk_down
walk_left walk_left
@ -573,7 +573,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitNorth: @ 820507E
set_invisible set_invisible
step_end step_end
PetalburgCity_Gym_Movement_WallysUncleExitEast: @ 8205089 PetalburgCity_Gym_Movement_WallysDadExitEast: @ 8205089
walk_down walk_down
walk_down walk_down
walk_left walk_left
@ -586,7 +586,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitEast: @ 8205089
set_invisible set_invisible
step_end step_end
PetalburgCity_Gym_Movement_WallysUncleExitWest: @ 8205094 PetalburgCity_Gym_Movement_WallysDadExitWest: @ 8205094
walk_down walk_down
walk_down walk_down
walk_left walk_left
@ -601,7 +601,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitWest: @ 8205094
set_invisible set_invisible
step_end step_end
PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth: @ 82050A1 PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth: @ 82050A1
delay_16 delay_16
walk_down walk_down
walk_down walk_down
@ -611,7 +611,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth: @ 82050A1
walk_down walk_down
step_end step_end
PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast: @ 82050A9 PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast: @ 82050A9
delay_16 delay_16
walk_down walk_down
walk_down walk_down
@ -621,7 +621,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast: @ 82050A9
walk_down walk_down
step_end step_end
PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest: @ 82050B1 PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest: @ 82050B1
delay_16 delay_16
walk_down walk_down
walk_down walk_down
@ -633,7 +633,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest: @ 82050B1
walk_down walk_down
step_end step_end
PetalburgCity_Gym_Movement_WallysUncleEnterGym: @ 82050BB PetalburgCity_Gym_Movement_WallysDadEnterGym: @ 82050BB
walk_up walk_up
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_fastest_right
@ -643,7 +643,7 @@ PetalburgCity_Gym_Movement_WallysUncleEnterGym: @ 82050BB
walk_in_place_fastest_up walk_in_place_fastest_up
step_end step_end
PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth: @ 82050C3 PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth: @ 82050C3
walk_right walk_right
walk_right walk_right
walk_up walk_up
@ -652,7 +652,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth: @ 82050C3
walk_in_place_fastest_right walk_in_place_fastest_right
step_end step_end
PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast: @ 82050CA PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast: @ 82050CA
walk_right walk_right
walk_right walk_right
walk_up walk_up
@ -660,7 +660,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast: @ 82050CA
walk_up walk_up
step_end step_end
PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest: @ 82050D0 PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest: @ 82050D0
walk_right walk_right
walk_right walk_right
walk_up walk_up

4
data/maps/PetalburgCity_WallysHouse/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_WallysHouse_EventScript_WallyUncle", "script": "PetalburgCity_WallysHouse_EventScript_WallysDad",
"flag": "0" "flag": "0"
}, },
{ {
@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_WallysHouse_EventScript_WallyAunt", "script": "PetalburgCity_WallysHouse_EventScript_WallysMom",
"flag": "0" "flag": "0"
} }
], ],

12
data/maps/PetalburgCity_WallysHouse/scripts.inc
View File

@ -1,4 +1,4 @@
.set LOCALID_WALLYS_UNCLE, 1 .set LOCALID_WALLYS_DAD, 1
PetalburgCity_WallysHouse_MapScripts:: @ 8204229 PetalburgCity_WallysHouse_MapScripts:: @ 8204229
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame
@ -6,12 +6,12 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229
.byte 0 .byte 0
PetalburgCity_WallysHouse_OnWarp: @ 8204234 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 .2byte 0
PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther:: @ 820423E
turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST
turnobject LOCALID_WALLYS_UNCLE, DIR_WEST turnobject LOCALID_WALLYS_DAD, DIR_WEST
end end
PetalburgCity_WallysHouse_OnFrame: @ 8204247 PetalburgCity_WallysHouse_OnFrame: @ 8204247
@ -28,7 +28,7 @@ PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251
releaseall releaseall
end end
PetalburgCity_WallysHouse_EventScript_WallyUncle:: @ 8204278 PetalburgCity_WallysHouse_EventScript_WallysDad:: @ 8204278
lock lock
faceplayer faceplayer
goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad
@ -54,7 +54,7 @@ PetalburgCity_WallysHouse_EventScript_PlayedWithWally:: @ 82042B6
release release
end end
PetalburgCity_WallysHouse_EventScript_WallyAunt:: @ 82042C0 PetalburgCity_WallysHouse_EventScript_WallysMom:: @ 82042C0
lock lock
faceplayer faceplayer
goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf

4
data/scripts/new_game.inc
View File

@ -115,7 +115,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
setflag FLAG_HIDE_PETALBURG_GYM_GREETER setflag FLAG_HIDE_PETALBURG_GYM_GREETER
setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
@ -142,7 +142,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA
setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
setflag FLAG_HIDE_PETALBURG_GYM_WALLY setflag FLAG_HIDE_PETALBURG_GYM_WALLY
setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE

6
include/constants/flags.h
View File

@ -768,7 +768,7 @@
#define FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT 0x2D5 #define FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT 0x2D5
#define FLAG_HIDE_PETALBURG_CITY_WALLY 0x2D6 #define FLAG_HIDE_PETALBURG_CITY_WALLY 0x2D6
#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY 0x2D7 #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY 0x2D7
#define FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT 0x2D8 #define FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM 0x2D8
#define FLAG_UNUSED_0x2D9 0x2D9 // Unused Flag #define FLAG_UNUSED_0x2D9 0x2D9 // Unused Flag
@ -866,13 +866,13 @@
#define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE 0x335 #define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE 0x335
#define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE 0x336 #define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE 0x336
#define FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA 0x337 #define FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA 0x337
#define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE 0x338 #define FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD 0x338
#define FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN 0x339 // Unused, leftover from R/S #define FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN 0x339 // Unused, leftover from R/S
#define FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE 0x33A #define FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE 0x33A
#define FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE 0x33B #define FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE 0x33B
#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE 0x33C #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE 0x33C
#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE 0x33D #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE 0x33D
#define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE 0x33E #define FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD 0x33E
#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS 0x33F #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS 0x33F
#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER 0x340 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER 0x340
#define FLAG_HIDE_GRANITE_CAVE_STEVEN 0x341 #define FLAG_HIDE_GRANITE_CAVE_STEVEN 0x341