Skip to content

Commit 18f1801

Browse files
committed
feat: update submodule to libultrahand + last atmosphere-libs
1 parent 84ab62d commit 18f1801

9 files changed

Lines changed: 29 additions & 21 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@ target
4242

4343
# VSCode
4444
.vscode
45+
46+
#jetbrains
47+
.idea

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "libs/Atmosphere-libs"]
22
path = libs/Atmosphere-libs
33
url = https://github.com/Atmosphere-NX/Atmosphere-libs.git
4-
[submodule "libs/libtesla"]
5-
path = libs/libtesla
6-
url = https://github.com/WerWolv/libtesla.git
4+
[submodule "libs/libultrahand"]
5+
path = libs/libultrahand
6+
url = https://github.com/ppkantorski/libultrahand.git

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,14 @@ include $(DEVKITPRO)/libnx/switch_rules
3939
#---------------------------------------------------------------------------------
4040

4141
APP_TITLE := CaptureSight
42-
APP_VERSION := 0.13.0b2
42+
APP_VERSION := 0.13.0
4343

4444
TARGET := capturesight
4545
BUILD := build
46-
SOURCES := src
46+
SOURCES := src libs/libultrahand/common libs/libultrahand/libultra/source
4747
DATA := data
48-
INCLUDES := libs/libtesla/include libs/csight-core/c-export libs/Atmosphere-libs/libstratosphere/source/dmnt
48+
INCLUDES := libs/libultrahand/common libs/libultrahand/libultra/include libs/libultrahand/libtesla/include \
49+
libs/csight-core/c-export libs/Atmosphere-libs/libstratosphere/source/dmnt
4950

5051
NO_ICON := 1
5152

@@ -60,12 +61,12 @@ RUST_LIB := $(RUST_DIR)/target/aarch64-none-elf/release/libcsight_core.a
6061
#---------------------------------------------------------------------------------
6162
ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
6263

63-
CFLAGS := -g -Wall -O2 -ffunction-sections \
64+
CFLAGS := -g -Wall -O2 -ffunction-sections -fdata-sections -flto -fuse-linker-plugin \
6465
$(ARCH) $(DEFINES)
6566

6667
CFLAGS += $(INCLUDE) -D__SWITCH__
6768

68-
CXXFLAGS := $(CFLAGS) -fno-exceptions -std=c++20
69+
CXXFLAGS := $(CFLAGS) -fno-exceptions -ffunction-sections -fdata-sections -std=c++20
6970

7071
ASFLAGS := -g $(ARCH)
7172
LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

libs/Atmosphere-libs

Submodule Atmosphere-libs updated 359 files

libs/csight-core/aarch64-none-elf.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"arch": "aarch64",
3-
"data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
3+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
44
"env": "",
55
"executables": true,
66
"disable-redzone": true,
@@ -14,9 +14,9 @@
1414
"os": "horizon",
1515
"panic-strategy": "abort",
1616
"relocation-model": "pic",
17-
"target-c-int-width": "32",
17+
"target-c-int-width": 32,
1818
"target-endian": "little",
19-
"target-pointer-width": "64",
19+
"target-pointer-width": 64,
2020
"exe-suffix": ".elf",
2121
"trap-unreachable": true,
2222
"emit-debug-gdb-scripts": true,

libs/csight-core/c-export/generated.h

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,24 @@ namespace csight {
1515

1616
static const size_t Spawn_DATA_SIZE = 56;
1717

18-
static const size_t den_t_SIZE = 24;
18+
static const size_t arceus_spawn_group_t_DATA_SIZE = 1088;
1919

20-
enum class SwshDenType {
21-
Vanilla = 0,
22-
IslandOfArmor = 1,
23-
CrownTundra = 2,
24-
};
20+
static const size_t SpawnPair_DATA_SIZE = 128;
21+
22+
static const size_t den_t_SIZE = 24;
2523

2624
enum class RngType {
2725
Xoroshiro = 0,
2826
Xorshift = 1,
2927
Lcrng = 2,
3028
};
3129

30+
enum class SwshDenType {
31+
Vanilla = 0,
32+
IslandOfArmor = 1,
33+
CrownTundra = 2,
34+
};
35+
3236
enum class SupportedGame : uint64_t {
3337
Sword = 72246641462509568,
3438
Shield = 72213381238669312,
@@ -369,6 +373,6 @@ pk8_t *swsh_read_wild_legend_pokemon();
369373

370374
pk8_t *swsh_read_wild_pokemon();
371375

372-
} // extern "C"
376+
} // extern "C"
373377

374-
} // namespace csight
378+
} // namespace csight

libs/libtesla

Lines changed: 0 additions & 1 deletion
This file was deleted.

libs/libultrahand

Submodule libultrahand added at 09019f2

0 commit comments

Comments
 (0)