summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/build.yml7
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc1
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_2F/map.json2
-rw-r--r--data/maps/LittlerootTown_MaysHouse_2F/map.json2
-rw-r--r--data/maps/OldaleTown_Mart/scripts.inc1
-rw-r--r--data/maps/RustboroCity_Mart/scripts.inc1
-rw-r--r--data/maps/SlateportCity/scripts.inc2
-rw-r--r--data/maps/SlateportCity_Mart/scripts.inc1
-rw-r--r--data/maps/SootopolisCity_Mart/scripts.inc1
-rw-r--r--data/scripts/new_game.inc2
-rw-r--r--include/constants/flags.h2
-rw-r--r--src/region_map.c24
12 files changed, 30 insertions, 16 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b904ae9f..1dfb5763e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,7 @@ jobs:
uses: actions/checkout@master
- name: Checkout syms
+ if: ${{ github.event_name == 'push' }}
uses: actions/checkout@master
with:
path: symbols
@@ -52,7 +53,7 @@ jobs:
run: make -j${nproc} all
- name: Webhook
- if: ${{ github.event_name == 'push' }}
+ if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
env:
CALCROM_DISCORD_WEBHOOK_USERNAME: OK
CALCROM_DISCORD_WEBHOOK_AVATAR_URL: https://i.imgur.com/38BQHdd.png
@@ -63,7 +64,7 @@ jobs:
if: ${{ github.event_name == 'push' }}
run: |
cp -v *.sym symbols/
- export GITHUB_COMMIT_MSG="$( git log --format=%s ${GITHUB_SHA} )"
+ echo "SYMBOLS_COMMIT_MSG=$( git log --format=%s ${GITHUB_SHA} )" >> $GITHUB_ENV
- name: Update symfiles
if: ${{ github.event_name == 'push' }}
@@ -72,4 +73,4 @@ jobs:
branch: symbols
cwd: "./symbols"
add: "*.sym"
- message: $GITHUB_COMMIT_MSG
+ message: ${{ env.SYMBOLS_COMMIT_MSG }}
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
index ddb927519..20480068b 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
@@ -11,6 +11,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft::
release
end
+ .align 2
LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins:
.2byte ITEM_PROTEIN
.2byte ITEM_CALCIUM
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json
index 03e2dcd82..c938aaae2 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json
@@ -194,7 +194,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
- "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM"
+ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM"
},
{
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json
index 1fa2ff01d..080eb0fe5 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/map.json
+++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json
@@ -194,7 +194,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
- "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM"
+ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM"
},
{
"graphics_id": "OBJ_EVENT_GFX_PICHU_DOLL",
diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc
index fa97dfe8d..0b3c7b1a3 100644
--- a/data/maps/OldaleTown_Mart/scripts.inc
+++ b/data/maps/OldaleTown_Mart/scripts.inc
@@ -12,6 +12,7 @@ OldaleTown_Mart_EventScript_Clerk::
release
end
+ .align 2
OldaleTown_Mart_Pokemart_Basic:
.2byte ITEM_POTION
.2byte ITEM_ANTIDOTE
diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc
index 91ffafdda..18120cb4d 100644
--- a/data/maps/RustboroCity_Mart/scripts.inc
+++ b/data/maps/RustboroCity_Mart/scripts.inc
@@ -16,6 +16,7 @@ RustboroCity_Mart_EventScript_PokemartBasic::
release
end
+ .align 2
RustboroCity_Mart_Pokemart_Basic:
.2byte ITEM_POKE_BALL
.2byte ITEM_POTION
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index 0f7057359..4a5671714 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -147,6 +147,7 @@ SlateportCity_EventScript_EnergyGuru::
release
end
+ .align 2
SlateportCity_Pokemart_EnergyGuru:
.2byte ITEM_PROTEIN
.2byte ITEM_IRON
@@ -543,6 +544,7 @@ SlateportCity_EventScript_DecorClerk::
release
end
+ .align 2
SlateportCity_PokemartDecor:
.2byte DECOR_RED_BRICK
.2byte DECOR_BLUE_BRICK
diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc
index bd5fc3b55..a0c0a8612 100644
--- a/data/maps/SlateportCity_Mart/scripts.inc
+++ b/data/maps/SlateportCity_Mart/scripts.inc
@@ -11,6 +11,7 @@ SlateportCity_Mart_EventScript_Clerk::
release
end
+ .align 2
SlateportCity_Mart_Pokemart:
.2byte ITEM_POKE_BALL
.2byte ITEM_GREAT_BALL
diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc
index 69e5407cb..0975abd2b 100644
--- a/data/maps/SootopolisCity_Mart/scripts.inc
+++ b/data/maps/SootopolisCity_Mart/scripts.inc
@@ -11,6 +11,7 @@ SootopolisCity_Mart_EventScript_Clerk::
release
end
+ .align 2
SootopolisCity_Mart_Pokemart:
.2byte ITEM_ULTRA_BALL
.2byte ITEM_HYPER_POTION
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index f31cedc80..7c5c3fc7d 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -209,7 +209,7 @@ EventScript_ResetAllMapFlags::
setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
- setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM
+ setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM
setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 950fd28f1..6702fa5ee 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -799,7 +799,7 @@
#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 0x2F2
#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 0x2F3
#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA 0x2F4
-#define FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM 0x2F5
+#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM 0x2F5
#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM 0x2F6
#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM 0x2F7
#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM 0x2F8
diff --git a/src/region_map.c b/src/region_map.c
index 1a25d140c..4e547b5fb 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -48,6 +48,12 @@
#define FLYDESTICON_RED_OUTLINE 6
+enum {
+ TAG_CURSOR,
+ TAG_PLAYER_ICON,
+ TAG_FLY_ICON,
+};
+
// Static type declarations
struct MultiNameFlyDest
@@ -237,13 +243,13 @@ static const union AnimCmd *const sRegionMapCursorAnimTable[] =
static const struct SpritePalette sRegionMapCursorSpritePalette =
{
.data = sRegionMapCursorPal,
- .tag = 0
+ .tag = TAG_CURSOR
};
static const struct SpriteTemplate sRegionMapCursorSpriteTemplate =
{
- .tileTag = 0,
- .paletteTag = 0,
+ .tileTag = TAG_CURSOR,
+ .paletteTag = TAG_CURSOR,
.oam = &sRegionMapCursorOam,
.anims = sRegionMapCursorAnimTable,
.images = NULL,
@@ -419,7 +425,7 @@ static const struct WindowTemplate sFlyMapWindowTemplates[] =
static const struct SpritePalette sFlyTargetIconsSpritePalette =
{
.data = sFlyTargetIcons_Pal,
- .tag = 2
+ .tag = TAG_FLY_ICON
};
static const u16 sRedOutlineFlyDestinations[][2] =
@@ -497,8 +503,8 @@ static const union AnimCmd *const sFlyDestIcon_Anims[] =
static const struct SpriteTemplate sFlyDestIconSpriteTemplate =
{
- .tileTag = 2,
- .paletteTag = 2,
+ .tileTag = TAG_FLY_ICON,
+ .paletteTag = TAG_FLY_ICON,
.oam = &sFlyDestIcon_OamData,
.anims = sFlyDestIcon_Anims,
.images = NULL,
@@ -1692,8 +1698,8 @@ void CB2_OpenFlyMap(void)
break;
case 4:
InitRegionMap(&sFlyMap->regionMap, FALSE);
- CreateRegionMapCursor(0, 0);
- CreateRegionMapPlayerIcon(1, 1);
+ CreateRegionMapCursor(TAG_CURSOR, TAG_CURSOR);
+ CreateRegionMapPlayerIcon(TAG_PLAYER_ICON, TAG_PLAYER_ICON);
sFlyMap->mapSecId = sFlyMap->regionMap.mapSecId;
StringFill(sFlyMap->nameBuffer, CHAR_SPACE, MAP_NAME_LENGTH);
sDrawFlyDestTextWindow = TRUE;
@@ -1827,7 +1833,7 @@ static void LoadFlyDestIcons(void)
LZ77UnCompWram(sFlyTargetIcons_Gfx, sFlyMap->tileBuffer);
sheet.data = sFlyMap->tileBuffer;
sheet.size = sizeof(sFlyMap->tileBuffer);
- sheet.tag = 2;
+ sheet.tag = TAG_FLY_ICON;
LoadSpriteSheet(&sheet);
LoadSpritePalette(&sFlyTargetIconsSpritePalette);
CreateFlyDestIcons();
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 09:31:12 +0000