Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

.drone.yml

@@ -0,0 +1,29 @@
+clone:
+  git:
+    image: plugins/git
+    recursive: false
+
+pipeline:
+  pull_build:
+    image: sots:latest
+    secrets: [ssh_private_key, ssh_known_hosts, ssh_host]
+    commands:
+      - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+      - eval $(ssh-agent -s)
+      - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+      - mkdir -p ~/.ssh
+      - chmod 700 ~/.ssh
+      - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
+      - chmod 644 ~/.ssh/known_hosts
+      - echo "$SSH_HOST" > ~/.ssh/config
+      - git submodule sync --recursive
+      - git submodule update --init
+
+      - mkdir -p ../tools
+      - rm -rf ../tools/v_tools
+      - cp -r /sots-tools/v_tools ../tools
+      - rm -f /base/bpre0.gba
+      - cp /bpre0.gba ./base/bpre0.gba
+      - chmod 644 ./base/bpre0.gba
+      
+      - make all

.gitlab-ci.yml

@@ -0,0 +1,56 @@
+before_script:
+  - echo "executing before script"
+  - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+
+  ##
+  ## Run ssh-agent (inside the build environment)
+  ##
+  - eval $(ssh-agent -s)
+
+  ##
+  ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+  ## We're using tr to fix line endings which makes ed25519 keys work
+  ## without extra base64 encoding.
+  ## https://gitlab.com/gitlab-examples/ssh-private-key/issues/1#note_48526556
+  ##
+  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+
+  ##
+  ## Create the SSH directory and give it the right permissions
+  ##
+  - mkdir -p ~/.ssh
+  - chmod 700 ~/.ssh
+
+  - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
+  - chmod 644 ~/.ssh/known_hosts
+
+  - echo "$SSH_HOST" > ~/.ssh/config
+  - chmod 644 ~/.ssh/config
+  - git submodule sync --recursive
+  - git submodule update --init
+
+
+  ## Move pymap from the docker image to the tools folder
+  - mkdir -p ../tools
+  - rm -rf ../tools/v_tools
+  - cp -r /sots-tools/v_tools ../tools
+  - rm -f base/bpre0.gba
+  - cp /bpre0.gba ./base/bpre0.gba
+  - chmod 644 ./base/bpre0.gba
+
+stages:
+  - build
+
+build-sots:
+  stage: build
+  only:
+    - tags
+    - web
+    - triggers
+
+  script:
+    - echo "Building Pokémon SotS"
+    - make all
+
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}

README.md

@@ -1,3 +1,17 @@
-Source Code von Pokémon Sovereign of the skies, ohne Anspruch auf Vollständigkeit oder Funktionsfähigkeit. Diese Repository soll lediglich dazu dienen einen Einblick in die Denkweise hinter Pokémon Sovereign of the Skies bieten.
+# Pokémon Sovereign of the Skies
+## Build Status
+[![pipeline 
+status](https://drone-ext.karathan.at/api/badges/SBird1337/source_of_the_sovereign/status.svg)](https://github.com/SBird1337/source_of_the_sovereign/commits/master)
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## General
+This repository provides insight into the Fangame `Pokémon Sovereign of the Skies` which is maintained since 2010. The project is lead by a 
+german team, which is why most of the community around it is as well german. You can find our main project thread on `RomhackersWorld`: [Pokémon Sovereign of the Skies](https://board.romhackersworld.eu/board/206-pokemon-sovereign-of-the-skies/)
+
+Since this is a playable game, most of the assets maintained by us would be heavily spoiling the experience. On the other hand, we want to have our source code publicly available, which is why we have only part of the repository publicly available for you, sorry!
+
+## Building
+Building the repository without access to all the assets is not possible. Though we are using a collection of tools, which is also publicly available for you: [sots-tools](https://github.com/ipatix/sots-tools)
+
+## Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

g3headers

@@ -1 +1 @@
-Subproject commit a2e68703dcfccb4ef2319f8fd79a8ea7803a63c7
+Subproject commit 732e4c1cc26397d8ac95c28886d29501b0baf5b4

src/pokedex/pokedex.c

@@ -7,6 +7,8 @@
 #include <pokedex/pdexScrollBar.h>
 #include <pokedex/pdexSelectHalf.h>
 
+//testing ci, no hate plz
+
 #include "pokedex_common.h"
 
 #define TB_TITLE 0

src/test/test.s

@@ -1,4 +1,3 @@
-
 .text
 .thumb