From 17758b7d66ade2003c5606aa61ad0d66a366a442 Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Sat, 3 Sep 2022 14:41:09 -0400 Subject: [PATCH] Updated Github metadata & build script. --- .github/workflows/build.yml | 2 +- README.md | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25e332491e..dd145771ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build ROM on: push: - branches: [ romhack ] + branches: [ followers ] pull_request: jobs: diff --git a/README.md b/README.md index c524149913..c3648a0443 100644 --- a/README.md +++ b/README.md @@ -2,18 +2,18 @@ This is a fork of the [matching decompilation](https://github.com/pret/pokeemerald) at [PRET](https://github.com/pret). -The general philosophy of this fork is to maintain vanilla behavior & compatibility where possible, especially in terms of data structures. For that reason, this fork does not increase the size of the save data structure or the object event structure, nor does it add a `nature` field to the Pokémon structure. +This fork tries to maintain vanilla compatibility whenever possible. It doesn't increase the size of any save data structure or the object event structure. -There are several branches, each with additional features compared to vanilla: +There are several branches, each with one main feature: -**romhack** branch: +**followers** branch: * [HGSS-style pokémon followers](https://bulbapedia.bulbagarden.net/wiki/Walking_Pok%C3%A9mon#Pok.C3.A9mon_HeartGold_and_SoulSilver) for all 386 pokémon, including emotes, the 28 Unown forms and a majority of follower messages. * Dynamic overworld palettes & reflections compatible with vanilla berry trees. -* A way to change a pokemon's nature while mangling its PID as little as possible. +* Function to change a pokemon's nature while preserving most properties of its PID. * Function to detect newer emulators/new GBA hardware. **icons** branch: -* Everything from the **romhack** branch. +* Everything from the **followers** branch. * All pokemon icons updated to Gen 6, based on [this repo](https://github.com/msikma/pokesprite/tree/master/icons/pokemon/regular) * This includes compatibility with the PC, trade, contests, mail, Battle Dome. Examples: ![PC](https://i.imgur.com/wzwJfd1.png) @@ -22,7 +22,7 @@ There are several branches, each with additional features compared to vanilla: * Icons share palettes with front sprites, meaning that shiny pokemon will also have shiny icons! **lighting** branch: -* Everything from the **romhack** branch. +* Everything from the **followers** branch. * Day/night shading compatible with weather. * GSC-style window lights. * WIP interframe-blended lamp lights at night, i.e in Rustboro.