Skip to content

Commit

Permalink
Fix FLAG_DECORATION_0 name
Browse files Browse the repository at this point in the history
  • Loading branch information
@GriffinRichards
GriffinRichards committed Jan 9, 2022
1 parent a837d1f commit 8b92069
Show file tree
Hide file tree
Showing 27 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion data/maps/SecretBase_BlueCave1/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_BlueCave2/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_BlueCave3/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_BlueCave4/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_BrownCave1/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_BrownCave2/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_BrownCave3/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_BrownCave4/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_RedCave1/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_RedCave2/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_RedCave3/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_RedCave4/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_Shrub1/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_Shrub2/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_Shrub3/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_Shrub4/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_Tree1/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_Tree2/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_Tree3/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_Tree4/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_YellowCave1/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_YellowCave2/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_YellowCave3/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
2 changes: 1 addition & 1 deletion data/maps/SecretBase_YellowCave4/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
"flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
Expand Down
6 changes: 3 additions & 3 deletions data/scripts/secret_base.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ SecretBase_EventScript_InitSecretBase::
closemessage
playse SE_EXIT
setvar VAR_INIT_SECRET_BASE, 0
setflag FLAG_DECORATION_0
setflag FLAG_HIDE_SECRET_BASE_TRAINER
special SetPlayerSecretBase
special EnterSecretBase
setvar VAR_0x8004, 0
Expand Down Expand Up @@ -172,14 +172,14 @@ SecretBase_EventScript_Enter::
playse SE_EXIT
special IsCurSecretBaseOwnedByAnotherPlayer
goto_if_eq VAR_RESULT, FALSE, SecretBase_EventScript_EnterPlayersBase
clearflag FLAG_DECORATION_0
clearflag FLAG_HIDE_SECRET_BASE_TRAINER
special EnterSecretBase
setvar VAR_SECRET_BASE_INITIALIZED, 0
waitstate
end

SecretBase_EventScript_EnterPlayersBase::
setflag FLAG_DECORATION_0
setflag FLAG_HIDE_SECRET_BASE_TRAINER
special EnterSecretBase
setvar VAR_SECRET_BASE_INITIALIZED, 0
waitstate
Expand Down
2 changes: 1 addition & 1 deletion include/constants/flags.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
#define FLAG_RECEIVED_TM40 0xAA
#define FLAG_RECEIVED_TM04 0xAB
#define FLAG_RECEIVED_TM03 0xAC
#define FLAG_DECORATION_0 0xAD
#define FLAG_HIDE_SECRET_BASE_TRAINER 0xAD
#define FLAG_DECORATION_1 0xAE
#define FLAG_DECORATION_2 0xAF
#define FLAG_DECORATION_3 0xB0
Expand Down
2 changes: 1 addition & 1 deletion src/decoration.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

#define PLACE_DECORATION_SELECTOR_TAG 0xbe5
#define PLACE_DECORATION_PLAYER_TAG 0x008
#define NUM_DECORATION_FLAGS (FLAG_DECORATION_14 - FLAG_DECORATION_0)
#define NUM_DECORATION_FLAGS (FLAG_DECORATION_14 - FLAG_DECORATION_1 + 1)

#define tCursorX data[0]
#define tCursorY data[1]
Expand Down

0 comments on commit 8b92069

Please sign in to comment.