ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1637 from cbt6/pc-location

Browse Source 
Use constants for PC locations
This commit is contained in:
GriffinR 2022-02-23 08:04:16 -05:00 committed by GitHub
commit f7ba502c52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
View File

@ -243,7 +243,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_PC::
end
LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC::
setvar VAR_0x8004, 1
setvar VAR_0x8004, PC_LOCATION_BRENDANS_HOUSE
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT
@ -253,7 +253,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC::
end
LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC::
setvar VAR_0x8004, 1
setvar VAR_0x8004, PC_LOCATION_BRENDANS_HOUSE
playse SE_PC_OFF
special DoPCTurnOffEffect
releaseall

4
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
View File

@ -294,7 +294,7 @@ LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC::
end
LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC::
setvar VAR_0x8004, 2
setvar VAR_0x8004, PC_LOCATION_MAYS_HOUSE
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT
@ -304,7 +304,7 @@ LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC::
end
LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC::
setvar VAR_0x8004, 2
setvar VAR_0x8004, PC_LOCATION_MAYS_HOUSE
playse SE_PC_OFF
special DoPCTurnOffEffect
releaseall

4
data/scripts/pc.inc
View File

@ -1,6 +1,6 @@
EventScript_PC::
lockall
setvar VAR_0x8004, 0
setvar VAR_0x8004, PC_LOCATION_OTHER
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox Text_BootUpPC, MSGBOX_DEFAULT
@ -51,7 +51,7 @@ EventScript_AccessLanettesPC::
return
EventScript_TurnOffPC::
setvar VAR_0x8004, 0
setvar VAR_0x8004, PC_LOCATION_OTHER
playse SE_PC_OFF
special DoPCTurnOffEffect
releaseall

6
src/field_specials.c
View File

@ -1069,11 +1069,11 @@ static void PCTurnOffEffect(void)
dy = -1;
break;
}
if (gSpecialVar_0x8004 == 0)
if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
tileId = METATILE_Building_PC_Off;
else if (gSpecialVar_0x8004 == 1)
else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE)
tileId = METATILE_BrendansMaysHouse_BrendanPC_Off;
else if (gSpecialVar_0x8004 == 2)
else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE)
tileId = METATILE_BrendansMaysHouse_MayPC_Off;
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + MAP_OFFSET, gSaveBlock1Ptr->pos.y + dy + MAP_OFFSET, tileId | MAPGRID_COLLISION_MASK);
DrawWholeMapView();