Start by removing badge requirements for HM moves.

This reverts commit 4b02cad24b.

.gitlab/issue_templates/Bug Report.md

@@ -0,0 +1,14 @@
+# Bug Report
+
+## What issue have you found?
+
+<!--- Please provide a detailed explanation of the bug here. -->
+
+## What did you expect to happen instead of this bug?
+
+<!--- What did you expect to happen instead? Please explain in detail. -->
+
+<!--- Please check the following boxes. -->
+
+- [ ] I am using the **latest version** of TumbledEmerald.
+- [ ] I am using mGBA, the official CIA package, or a Game Boy Advance flashcart.

.gitlab/issue_templates/Default.md

@@ -0,0 +1,4 @@
+<!---
+Please make sure to look at the issue templates and use the one that best describes your problem. If your issue
+doesn't fit into one of these categories, please type your issue below. If we need more information, we'll ask!
+-->

.gitlab/issue_templates/Feature Request.md

@@ -0,0 +1,18 @@
+# Feature Request
+
+## Requested feature: <!--- type what you want added here. -->
+
+
+
+## Why do you want this feature?
+
+
+
+
+<!--- Please check the following boxes. -->
+
+- [ ] I have submitted a merge request to implement this feature. <!--- not required, but if this is the case, please indicate so! -->
+    - If you have submitted a merge request, please reference it here: <!--- use the !NUMBER format. -->
+- [ ] This feature has not been requested in another issue before.
+- [ ] I would like to be listed in the credits.
+

.gitlab/issue_templates/Save Porting.md

@@ -0,0 +1,16 @@
+## Save Porting Request
+
+Version of my save: <!--- replace this text with the game version that your save was created in. -->  
+Version I want to have my save ported to: <!--- replace this text with the game version you want to use your save in. -->
+
+- [ ] I have attached my save file in `.sav` format to this request.
+- [ ] I would like to authorize my save file to be used for testing and debugging purposes. (OPTIONAL)
+
+<!---
+Please note:
+
+I might not get to your save right away. If it takes longer than a month to make you a new save, I'll update
+it to work with the latest version of the game for you.
+
+This process is NOT a conversion. This is me (an idiot!) rummaging through your save and trying to replicate it on the version you chose. I might miss something. If you notice something I missed, let me know.
+-->

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "agbcc"]
+	path = agbcc
+	url = https://github.com/pret/agbcc

.gitpod.yml

@@ -3,6 +3,6 @@
 # and commit this file to your remote git repository to share the goodness with others.
 
 tasks:
-  - init: echo "See INSTALL.md for compilation instructions."
+  - init: make clean && sudo apt install binutils-arm-none-eabi -y && git submodule update --remote && cd agbcc && ./build.sh && ./install.sh ../
 
 

CREDITS.md

@@ -1,6 +1,9 @@
 # Cool people:
 
-# creepyguy: Compiled 1.0.0, since I couldn't. He's awesome, go check him out on [Scratch](https://scratch.mit.edu/users/creepyguy256/)
+# Compilation Hall of Fame
+These people have built or compiled TumbledEmerald releases in a pinch, lending their time to the project in a super helpful way!
+## SanicConnoissuer_91: Built the 22.08a .CIA. Thanks a bunch, dude!
+## creepyguy: Compiled 1.0.0, since I couldn't. He's awesome, go check him out on [Scratch](https://scratch.mit.edu/users/creepyguy256/)
 
 - @ghoulslash: A lot of the features here are directly from [ghoulslash/pokeemerald](https://github.com/ghoulslash/pokeemerald.git) and its many amazing feature branches.
 - Tutorial authors: ~~Some~~ Most features were adapted from code in the [tutorials](https://github.com/pret/pokeemerald/wiki/Tutorials/) in [pret](https://github.com/pret/)'s wiki.
@@ -14,6 +17,7 @@
 - @sh4/@Daisenryaku: you know why. (yes, I'm still using that "clicky clicky `****` frontend" ;)
 - @issotm: for running my awful sprite editing attempts through GIMP.
 - @cosarara: for showing me how to use `CTRL`+`Shift`+`F` in VSCodium.
+- @pokechu22: for dealing with my GNU hatred. (no luck with clang and CMake yet, but I'm working on it!)
 
 # Cool people who put up with me on Discord/GitHub:
 - @Rangi42: sorry for sliding into ur dm's.

FEATURES.md

@@ -13,4 +13,9 @@ titles and update them while still remaining faithful to the original games.
 * The keyboard prompt automatically switches to lowercase after the first character.
 * Dynamic trade names have been implemented: rather than pulling trade Pokemon info from a list, it pulls from the Pokemon's data instead.
 * The "move grammar" table leftover from the Japanese versions has been completely nuked, making the game faster.
-* 
+* Pokémon Center receptionists now heal your Pokémon without prompt, and you turn around once the process is over to avoid accidentally healing again
+* Default options have been changed to make the game quicker.
+* The Aurora Ticket, Mystic Ticket, and Old Sea Map have been reimplemented:
+    * For the tickets, beat Wallace and talk to the girl who originally blocks Route 101 back in Littleroot Town.
+    * For the map, beat Wallace and talk to the fisherman who gives you the Old Rod, telling him that fishing is "not so good."
+* The Fairy type from Generation VI+ has been added.

README.md

@@ -1,39 +1,160 @@
-# tumbledemerald [![Chat on Matrix](https://matrix.to/img/matrix-badge.svg)](https://matrix.to/#/#rebirthteam:matrix.org)
+# tumbledemerald
+`tumbledemerald` is an open-source project to modernize and update Pokémon: Emerald Version.
 
-This is a decompilation of Pokémon Emerald, with many improvements and edits, similar to Rangi42's [polishedcrystal](https://github.com/Rangi42/polishedcrystal)
+[TOC]
 
-It builds the following ROM:
+## Why?
+About a year ago, I started working on the `pokecrystal` code to update and modernize it. That fell through for two main reasons:
 
-**tumbledemerald.gba**
+- People were already doing it, a lot.
+- I suck at assembly language.
 
-To set up the repository, see [INSTALL.md](INSTALL.md), or see our `utilities` repo for buildscripts
+Eventually, the project was put on hold while I looked for a new project to take on. I found the `pokeemerald` decompilation about a week later. It was nice, it was clean, and it seemed like almost no one was making QoL hacks out of it. It started as a "running indoors and Repel system" hack. Then it got bigger. And bigger. And bigger. That's about all there is to it; a little project to work on when I have nothing better to do.
 
+## How do I play `tumbledemerald`?
+Tumbled has [releases](https://gitlab.com/tbld/game/-/releases) once or twice every week on average, with pre-compiled ROM images. I test the latest changes, run a [specific buildscript](https://gitlab.com/tbld/binaries/-/blob/main/scripts/gitpod.sh) to build the files, clean up the repository, and push it to GitLab.
 
-Here is the last time Tumbled was updated to `pret:master`
+For those who prefer to compile themselves, we have comprehensive [install documentation](INSTALL.md), or you can use the T.E.C.S. (TumbledEmerald Compilation Script) [here](https://gitlab.com/tbld/binaries/-/blob/main/scripts/main.sh)
 
-**20 December 2021**
+Once you've found your way over to the releases, or compiled the latest code yourself, you'll need a way to run the game:
 
-## See also
+> Please note that save files are not compatible between versions of the game, and regular Emerald saves are not compatible *at all*.
 
-Other disassembly and/or decompilation projects:
-* [**Pokémon Red and Blue**](https://github.com/pret/pokered)
-* [**Pokémon Gold and Silver (Space World '97 demo)**](https://github.com/pret/pokegold-spaceworld)
-* [**Pokémon Yellow**](https://github.com/pret/pokeyellow)
-* [**Pokémon Trading Card Game**](https://github.com/pret/poketcg)
-* [**Pokémon Pinball**](https://github.com/pret/pokepinball)
-* [**Pokémon Stadium**](https://github.com/pret/pokestadium)
-* [**Pokémon Gold and Silver**](https://github.com/pret/pokegold)
-* [**Pokémon Crystal**](https://github.com/pret/pokecrystal)
-* [**Pokémon Ruby and Sapphire**](https://github.com/pret/pokeruby)
-* [**Pokémon Pinball: Ruby & Sapphire**](https://github.com/pret/pokepinballrs)
-* [**Pokémon FireRed and LeafGreen**](https://github.com/pret/pokefirered)
-* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red)
-* [**Pokémon Diamond and Pearl**](https://github.com/pret/pokediamond)
-* [**Pokémon HeartGold and SoulSilver**](https://github.com/pret/pokeheartgold)
+### Game Boy Advance, Game Boy Advance SP, Game Boy micro, Game Boy Player, Nintendo DS, Nintendo DS lite, Nintendo DSi, and Nintendo DSi XL/LL consoles
+We recommend the usage of a device known as a "flashcart" to play `tumbledemerald` on the Game Boy line and Nintendo DS/DSi consoles. A cart we recommend can be found [here](https://krikzz.com/our-products/cartridges/everdrive-gba-mini.html).
 
+### Nintendo 3DS, Nintendo 3DS XL/LL, Nintendo 2DS, New Nintendo 3DS, New Nintendo 3DS XL/LL, and New Nintendo 2DS XL/LL consoles
+All Nintendo 3DS and 2DS consoles will need to be modified by the end-user (that's you!) to play `tumbledemerald`.
+> This is a limitation imposed by Nintendo's default software. There's no better way to go about this, sadly. (Believe me, I've looked!)
+* Follow [the recommended guide](https://3ds.hacks.guide) to install the necessary software modifications onto the console.
+> We are not liable for any hardware or software damage caused by this procedure. While we believe this process to be perfectly safe, and have used it ourselves, this is being done **at your own risk**.
 
-## Contacts
+* Download the latest `tumbledemerald.cia` package from the [releases](https://gitlab.com/tbld/game/-/releases) page and transfer it to your console's SD or μSD card.
+* Open the **FBI** application on your console.
+    - Select **SD** on the menu that appears.
+    - Navigate to the `tumbledemerald.cia` package.
+    - Select **Install and delete CIA**.
+    - Wait while the program is installed.
+* Return to the HOME Menu and unwrap the "tumbledemerald version xx.xx" present.
+* Launch the game and enjoy!
 
-You can slide into my **[matrix]** PM's: @fierymewtwo:matrix.org. However, there is an official Rebirth "room" (see the **[matrix]** badge above)
+### Nintendo Switch
 
-> The old GitHub repositories are now unmaintained, and all future development will take place on GitLab.
+All Nintendo Switch consoles will need to be modified by the end-user (that's you!) to play `tumbledemerald`.
+
+Running `tumbledemerald` on the Nintendo Switch is a little more complex than other platforms. Nevertheless, the instructions are relatively simple:
+
+* Follow [the recommended guide](https://switchgui.de) to install the necessary software modifications onto the console. Please note that later Nintendo Switch consoles, as well as all Nintendo Switch Lite and Nintendo Switch (OLED version) consoles are not compatible with `tumbledemerald`.
+> We are not liable for any hardware or software damage caused by this procedure. While we believe this process to be perfectly safe, and have used it ourselves, this is being done **at your own risk**.
+
+* Download the latest `tumbledemerald.gba` file from the [releases](https://gitlab.com/tbld/game/-/releases) page and transfer it to your console's μSD card.
+* Open the [4TU QuickStore](https://apps.fortheusers.org/switch/quickstore) on your computer.
+> If **Homebrew App Store** is selected, de-select it by clicking on it or touching it.
+    - Select **mGBA** from the list.
+    - Click **Download 1 Selected**.
+    - Copy the *contents* of the downloaded `.zip` file to the [root](https://ibin.co/6xpoMqUta7Dm.jpg) of the µSD card, overwriting any existing files.
+    - Reinsert the µSD card and boot Atmosphère.
+* Open the **Album** from Atmosphère's HOME Menu to open the Homebrew Menu.
+* Open **mGBA**
+* Browse to and select `tumbledemerald.gba`.
+* Enjoy!
+
+### PlayStation Vita
+
+All PlayStation Vita consoles will need to be modified by the end-user (that's you!) to play `tumbledemerald`.
+> This is a limitation imposed by Sony's default software. There's no better way to go about this, sadly. (Believe me, I've looked!)
+* Follow [the recommended guide](https://vita.hacks.guide) to install the necessary software modifications onto the console.
+> We are not liable for any hardware or software damage caused by this procedure. While we believe this process to be perfectly safe, this is being done **at your own risk**.
+
+* Download the latest `tumbledemerald.gba` file from the [releases](https://gitlab.com/tbld/game/-/releases) page and transfer it to your console's Memory Card.
+* Install the latest version of [**mGBA**](https://mgba.io) using the `.vpk` package.
+* Open **mGBA**
+* Browse to and select `tumbledemerald.gba`.
+* Enjoy!
+
+### Windows
+
+On some devices, you may need to disable S mode before you can play `tumbledemerald`. For instructions on how to do so, see [this](https://support.microsoft.com/en-us/windows/switching-out-of-s-mode-in-windows-4f56d9be-99ec-6983-119f-031bfb28a307) knowledge base article.
+
+> Why do I need to disable these settings? Is this safe to use?
+
+> mGBA, the program used on macOS to play `tumbledemerald` is perfectly safe to use. You are welcome to browse the [source code](https://github.com/mgba-emu/mgba) to verify this. The reason that you may need to tweak system settings is due to the fact that `endrift`, mGBA's developer, has not submitted mGBA to the Microsoft Store. S mode allows **only** apps from the Microsoft Store, hence why S mode needs to be disabled.
+
+> Disabling S mode won't cause your computer to lose any functionality. However, disabling S mode *is* permanent. Once disabled, S mode **can't be re-enabled**.
+
+* Download the latest `tumbledemerald.gba` file from the [releases](https://gitlab.com/tbld/game/-/releases) page.
+* Install the latest version of [**mGBA**](https://mgba.io), depending on what kind of computer you have.
+* Open **mGBA**
+* Navigate to File > Load ROM.
+* Browse to and select `tumbledemerald.gba`.
+* Enjoy!
+
+### macOS
+
+Playing `tumbledemerald` on macOS is a bit more complicated due to macOS security features. You may have to change several preferences on your Mac before you can play.
+
+See [this page](https://support.apple.com/en-us/HT202491) for more details.
+
+> Why do I need to disable these settings? Is this safe to use?
+
+> mGBA, the program used on macOS to play `tumbledemerald` is perfectly safe to use. You are welcome to browse the [source code](https://github.com/mgba-emu/mgba) to verify this. The reason that you may need to tweak system settings is due to the fact that `endrift`, mGBA's developer, has not gotten mGBA notarized and signed by Apple as of yet. Additionally, mGBA is *not* available in the Mac App Store. You will need to allow apps from outside the Mac App Store, and you may or may not need to add mGBA to the Gatekeeper whitelist.
+
+* Download the latest `tumbledemerald.gba` file from the [releases](https://gitlab.com/tbld/game/-/releases) page.
+* Install the latest version of [**mGBA**](https://mgba.io), depending on what kind of Mac and/or what version of macOS you have.
+* Open **mGBA**
+* Navigate to File > Load ROM.
+* Browse to and select `tumbledemerald.gba`.
+* Enjoy!
+
+### Linux
+
+(No, I will *not* call it GNU/Linux.)
+
+To play `tumbledemerald` on Steam Deck, we recommend the use of the standalone `mgba` program rather than RetroArch.
+
+> Handy tip: When using Steam Deck in Desktop mode, press the Steam and X buttons simultaneously to open the virtual keyboard.
+
+* Power on your Deck.
+* Once Deck UI loads, press and hold the power key.
+* Select **Switch to Desktop**.
+    - If you have never used Steam Deck's desktop mode, you will need to set a password. Do this now if necessary.
+
+> mGBA can usually be found in your distribution's repositories or ports tree. If not, download the latest development `appimage` from [here](https://mgba.io/download)
+* Open a web browser on your computer and download `tumbledemerald.gba` from [this page](https://gitlab.com/tbld/game/-/releases).
+* Open the mGBA application.
+* Navigate to File > Load ROM.
+* Browse to and select `tumbledemerald.gba`.
+* Enjoy!
+
+### Steam Deck
+
+To play `tumbledemerald` on Steam Deck, we recommend the use of the standalone `mgba` program rather than RetroArch.
+
+> Handy tip: When using Steam Deck in Desktop mode, press the Steam and X buttons simultaneously to open the virtual keyboard.
+
+* Power on your Deck.
+* Once Deck UI loads, press and hold the power key.
+* Select **Switch to Desktop**.
+    - If you have never used Steam Deck's desktop mode, you will need to set a password. Do this now if necessary.
+* Use the right trackpad to open **Discover**. It looks like a small shopping bag with a "K" on it.
+* Search for **mGBA**.
+* Select **Install**.
+    - You *will* be prompted to enter your password at this step. Don't forget it!
+- If you have never used Steam Deck's desktop mode, you will need to install a web browser:
+- Use the right trackpad to open **Discover**. It looks like a small shopping bag with a "K" on it.
+- Search for any web browser you like. (I personally prefer Firefox)
+- Select **Install**.
+    - You *will* be prompted to enter your password at this step. Don't forget it!
+* Open a web browser on your Deck and download `tumbledemerald.gba` from [this page](https://gitlab.com/tbld/game/-/releases).
+* Open the mGBA application.
+* Navigate to File > Load ROM.
+* Browse to and select `tumbledemerald.gba`.
+* Enjoy!
+
+## How can I contribute?
+
+Merge Requests and Issues are appreciated greatly. If you find a bug, have a cool idea, or need help with something, just tell us in an issue! (Make sure to mark it with `not-issue`.)
+
+We do not, have not, cannot, and will not accept **any** financial contributions due to legal issues. If someone tries to solicit money while masquerading as us, let us know!
+
+***If you paid for any part of `tumbledemerald`, you were ripped off and should ask your bank or credit union for a refund directly.***

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -1378,7 +1378,7 @@ BattleFrontier_BattleTowerLobby_Text_ExplainMultiLinkRules:
 	.string "The Link Multi Battle Mode is for two\n"
 	.string "friends to mount a challenge together.\p"
 	.string "You and your friend must be linked with\n"
-	.string "Wireless Adapters or a Gba Game Link\l"
+	.string "Wireless Adapters or a GBA Game Link\l"
 	.string "cable.\p"
 	.string "You must choose two Pokémon at\n"
 	.string "the registration counter.\p"

data/maps/DewfordTown/scripts.inc

@@ -118,6 +118,19 @@ DewfordTown_EventScript_FishingExcellent::
 
 DewfordTown_EventScript_FishingNotSoGood::
 	msgbox DewfordTown_Text_FishingAdvice, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, DewfordTown_EventScript_Intermediate_GiveOldSeaMap
+	release
+	end
+
+DewfordTown_EventScript_Intermediate_GiveOldSeaMap::
+	goto_if_unset FLAG_RECEIVED_OLD_SEA_MAP, DewfordTown_EventScript_GiveOldSeaMap
+	release
+	end	
+
+DewfordTown_EventScript_GiveOldSeaMap::
+	msgbox DewfordTown_Text_MaybeExploringWouldBeBetter, MSGBOX_DEFAULT
+	giveitem ITEM_OLD_SEA_MAP
+	setflag FLAG_RECEIVED_OLD_SEA_MAP
 	release
 	end
 
@@ -723,6 +736,12 @@ DewfordTown_Text_ThrowInFishingAdvice:
 	.string "you need to time the pulls on your Rod\l"
 	.string "to haul them in.$"
 
+DewfordTown_Text_MaybeExploringWouldBeBetter:
+	.string "Hmmm... Well, if you aren't having much\n"
+	.string "luck with fishing...\l"
+	.string "Maybe exploring would be a better\n"
+	.string "fit for a Trainer like you?$"
+
 DewfordTown_Text_ThatsTooBadThen:
 	.string "Oh, is that so?\n"
 	.string "That's too bad, then.$"

data/maps/LittlerootTown/scripts.inc

@@ -259,6 +259,7 @@ LittlerootTown_EventScript_Twin::
 	faceplayer
 	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_GoodLuck
 	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_YouSavedBirch
+	goto_if_set FLAG_SYS_GAME_CLEAR, LittlerootTown_EventScript_Intermediate_DustyTickets
 	goto_if_ne VAR_LITTLEROOT_TOWN_STATE, 0, LittlerootTown_EventScript_GoSaveBirch
 	msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT
 	release
@@ -285,6 +286,20 @@ LittlerootTown_EventScript_GoodLuck::
 	release
 	end
 
+LittlerootTown_EventScript_Intermediate_DustyTickets::
+	goto_if_unset FLAG_AURORA_MYSTIC_RECEIVED, LittlerootTown_EventScript_DustyTickets
+	end
+
+LittlerootTown_EventScript_DustyTickets::
+	msgbox LittlerootTown_Text_FoundTickets, MSGBOX_DEFAULT
+	giveitem ITEM_MYSTIC_TICKET
+	giveitem ITEM_AURORA_TICKET
+	setflag FLAG_RECEIVED_AURORA_TICKET
+	setflag FLAG_RECEIVED_MYSTIC_TICKET
+	setflag FLAG_AURORA_MYSTIC_RECEIVED @ because I'm bad at hacking.
+	release
+	end
+
 LittlerootTown_EventScript_NeedPokemonTriggerLeft::
 	lockall
 	applymovement LOCALID_TWIN, LittlerootTown_Movement_TwinApproachPlayerLeft
@@ -997,6 +1012,13 @@ LittlerootTown_Text_GoodLuckCatchingPokemon:
 	.string "Are you going to catch Pokémon?\n"
 	.string "Good luck!$"
 
+LittlerootTown_Text_FoundTickets:
+	.string "Um, hi!\p"
+	.string "I found these in an old suitcase. My\n"
+	.string "daddy doesn't want them, so I decided\n"
+	.string "to give these to you!$"
+	
+
 LittlerootTown_Text_TownSign:
 	.string "Littleroot Town\n"
 	.string "“A town that can't be shaded any hue.”$"

data/scripts/cable_club.inc

@@ -1258,7 +1258,7 @@ EventScript_CloseMossdeepGameCornerBarrier::
 	return
 
 CableClub_OnResume:
-	special InitUnionRoom
+@	special InitUnionRoom   commented out by default, but can be easily re-enabled, see docs.
 	end
 
 MossdeepCity_GameCorner_1F_EventScript_InfoMan2::

data/scripts/field_move_scripts.inc

@@ -1,7 +1,6 @@
 @ Interact with cuttable tree
 EventScript_CutTree::
 	lockall
-	goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
 	checkpartymove MOVE_CUT
 	goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CheckTreeCantCut
 	setfieldeffectargument 0, VAR_RESULT
@@ -54,7 +53,6 @@ Text_CantCut:
 @ Interact with smashable rock
 EventScript_RockSmash::
 	lockall
-	goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
 	checkpartymove MOVE_ROCK_SMASH
 	goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantSmashRock
 	setfieldeffectargument 0, VAR_RESULT
@@ -111,7 +109,6 @@ Text_CantSmash:
 
 EventScript_StrengthBoulder::
 	lockall
-	goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
 	goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
 	checkpartymove MOVE_STRENGTH
 	goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantStrength

data/scripts/pkmn_center_nurse.inc

@@ -17,7 +17,7 @@ EventScript_PkmnCenterNurse_HealPkmn::
 	waitmessage
 	call EventScript_PkmnCenterNurse_TakeAndHealPkmn
 	goto_if_unset FLAG_POKERUS_EXPLAINED, EventScript_PkmnCenterNurse_CheckPokerus
-	goto EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom
+	goto EventScript_PkmnCenterNurse_ReturnPkmn
 	end
 
 EventScript_PkmnCenterNurse_IllTakeYourPkmn::
@@ -75,7 +75,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom::
 EventScript_PkmnCenterNurse_CheckPokerus::
 	specialvar VAR_RESULT, IsPokerusInParty
 	goto_if_eq VAR_RESULT, TRUE, EventScript_PkmnCenterNurse_ExplainPokerus
-	goto_if_eq VAR_RESULT, FALSE, EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom
+	goto_if_eq VAR_RESULT, FALSE, EventScript_PkmnCenterNurse_ReturnPkmn
 	end
 
 EventScript_PkmnCenterNurse_ExplainPokerus::

data/scripts/players_house.inc

@@ -116,7 +116,7 @@ PlayersHouse_2F_EventScript_SetWallClock::
 
 PlayersHouse_2F_Movement_MomEntersMale:
 	delay_8
-	walk_down
+	walk_faster_down
 	walk_in_place_faster_left
 	delay_16
 	delay_8
@@ -124,18 +124,18 @@ PlayersHouse_2F_Movement_MomEntersMale:
 	step_end
 
 PlayersHouse_2F_Movement_MomExitsMale:
-	walk_right
+	walk_faster_right
 	walk_up
 	delay_8
 	step_end
 
 PlayersHouse_2F_Movement_MomEntersFemale:
 	delay_8
-	walk_down
+	walk_faster_down
 	walk_in_place_faster_right
 	delay_16
 	delay_8
-	walk_right
+	walk_faster_right
 	step_end
 
 PlayersHouse_2F_Movement_MomExitsFemale:
@@ -221,11 +221,11 @@ PlayersHouse_1F_EventScript_WatchGymBroadcast::
 
 PlayersHouse_1F_Movement_MomApproachDadMale:
 	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
+	walk_faster_right
+	walk_faster_right
+	walk_faster_right
+	walk_faster_right
+	walk_faster_down
 	walk_in_place_faster_right
 	step_end
 
@@ -235,12 +235,12 @@ PlayersHouse_1F_Movement_MomApproachDadFemale:
 	walk_left
 	walk_left
 	walk_left
-	walk_down
+	walk_faster_down
 	walk_in_place_faster_left
 	step_end
 
 PlayersHouse_1F_Movement_MomApproachPlayerMale:
-	walk_right
+	walk_faster_right
 	step_end
 
 PlayersHouse_1F_Movement_MomApproachPlayerFemale:
@@ -277,8 +277,8 @@ PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale:
 
 PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale:
 	walk_up
-	walk_right
-	walk_right
+	walk_faster_right
+	walk_faster_right
 	step_end
 
 PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale:
@@ -287,19 +287,19 @@ PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale:
 	step_end
 
 PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale:
-	walk_right
+	walk_faster_right
 	walk_in_place_faster_left
 	step_end
 
 PlayersHouse_1F_Movement_MomReturnToSeatMale:
 	walk_left
-	walk_down
+	walk_faster_down
 	walk_in_place_faster_right
 	step_end
 
 PlayersHouse_1F_Movement_MomReturnToSeatFemale:
-	walk_right
-	walk_down
+	walk_faster_right
+	walk_faster_down
 	walk_in_place_faster_left
 	step_end
 
@@ -393,27 +393,27 @@ PlayersHouse_1F_EventScript_Vigoroth2::
 	end
 
 PlayersHouse_1F_Movement_PlayerApproachTVForGymMale:
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
+	walk_faster_down
+	walk_faster_down
+	walk_faster_left
+	walk_faster_left
+	walk_faster_left
 	step_end
 
 PlayersHouse_1F_Movement_PlayerMoveToTVMale:
-	walk_left
+	walk_faster_left
 	step_end
 
 PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale:
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
+	walk_faster_down
+	walk_faster_down
+	walk_faster_right
+	walk_faster_right
+	walk_faster_right
 	step_end
 
 PlayersHouse_1F_Movement_PlayerMoveToTVFemale:
-	walk_right
+	walk_faster_right
 	step_end
 
 PlayersHouse_1F_Movement_MovePlayerAwayFromDoor:
@@ -603,8 +603,8 @@ PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale::
 	return
 
 PlayersHouse_1F_Movement_DadApproachPlayerMale:
-	walk_right
-	walk_right
+	walk_faster_right
+	walk_faster_right
 	step_end
 
 PlayersHouse_1F_Movement_DadApproachPlayerFemale:
@@ -621,24 +621,24 @@ PlayersHouse_1F_Movement_DadFaceMomFemale:
 	step_end
 
 PlayersHouse_1F_Movement_DadExitsMale:
-	walk_down
-	walk_right
-	walk_down
+	walk_faster_down
+	walk_faster_right
+	walk_faster_down
 	delay_8
 	step_end
 
 PlayersHouse_1F_Movement_DadExitsFemale:
-	walk_down
+	walk_faster_down
 	walk_left
-	walk_down
+	walk_faster_down
 	delay_8
 	step_end
 
 PlayersHouse_1F_Movement_PlayerEnterRoomMale:
 	delay_16
-	walk_down
-	walk_down
-	walk_down
+	walk_faster_down
+	walk_faster_down
+	walk_faster_down
 	walk_in_place_faster_left
 	step_end
 
@@ -651,9 +651,9 @@ PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit:
 
 PlayersHouse_1F_Movement_PlayerEnterRoomFemale:
 	delay_16
-	walk_down
-	walk_down
-	walk_down
+	walk_faster_down
+	walk_faster_down
+	walk_faster_down
 	walk_in_place_faster_right
 	step_end
 
@@ -668,10 +668,10 @@ PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale:
 
 PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale:
 	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
+	walk_faster_right
+	walk_faster_right
+	walk_faster_right
+	walk_faster_right
 	walk_in_place_faster_up
 	step_end
 

data/text/cable_club.inc

@@ -10,15 +10,15 @@ CableClub_Text_WhichService:
 
 CableClub_Text_TradeUsingLinkCable::
 	.string "Trade Pokémon with another player\n"
-	.string "using a Gba Game Link cable.$"
+	.string "using a GBA Game Link cable.$"
 
 CableClub_Text_BattleUsingLinkCable::
 	.string "You may battle another Trainer\n"
-	.string "using a Gba Game Link cable.$"
+	.string "using a GBA Game Link cable.$"
 
 CableClub_Text_RecordCornerUsingLinkCable::
 	.string "You can use the Record Corner with\n"
-	.string "others using a Gba Game Link cable.$"
+	.string "others using a GBA Game Link cable.$"
 
 @ Unused
 CableClub_Text_CloseThisMenu:
@@ -440,7 +440,7 @@ CableClub_Text_ExplainWirelessClubFirstTime:
 	.string "with your friends in this room.\p"
 	.string "If the Wireless Adapter isn't\n"
 	.string "connected, you may still link up\l"
-	.string "using a Gba Game Link cable.\p"
+	.string "using a GBA Game Link cable.\p"
 	.string "If that is the case, you must go\n"
 	.string "to the Direct Corner.\p"
 	.string "I hope you enjoy the Wireless \n"
@@ -476,7 +476,7 @@ CableClub_Text_ExplainWirelessClub:
 	.string "to your friends.\p"
 	.string "If the Wireless Adapter isn't\n"
 	.string "connected, you may still link up\l"
-	.string "using a Gba Game Link cable.\p"
+	.string "using a GBA Game Link cable.\p"
 	.string "If that is the case, you must go\n"
 	.string "to the Direct Corner.\p"
 	.string "I hope you enjoy the Wireless \n"

include/constants/flags.h

@@ -97,7 +97,7 @@
 #define FLAG_LEGENDARIES_IN_SOOTOPOLIS           0x53
 
 #define FLAG_REMOVE_WARP_FADE                0x54  // Custom flag used in tumbledemerald.
-#define FLAG_UNUSED_0x055                    0x55  // Unused Flag
+#define FLAG_AURORA_MYSTIC_RECEIVED          0x55  // Custom flag used in tumbledemerald. Basically a workaround.
 
 #define FLAG_HIDE_CONTEST_POKE_BALL          0x56  // Always set after new game, object it hides is added directly
 #define FLAG_MET_RIVAL_MOM                   0x57

rom.sha1

@@ -1 +0,0 @@
-f3ae088181bf583e55daf962a92bb46f4f1d07b7  pokeemerald.gba

src/data/text/move_names.h

@@ -189,7 +189,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
     [MOVE_SWEET_KISS] = _("Sweet Kiss"),
     [MOVE_BELLY_DRUM] = _("Belly Drum"),
     [MOVE_SLUDGE_BOMB] = _("Sludge Bomb"),
-    [MOVE_MUD_SLAP] = _("Mud-slap"),
+    [MOVE_MUD_SLAP] = _("Mud-Slap"),
     [MOVE_OCTAZOOKA] = _("Octazooka"),
     [MOVE_SPIKES] = _("Spikes"),
     [MOVE_ZAP_CANNON] = _("Zap Cannon"),

src/strings.c

@@ -1180,7 +1180,7 @@ const u8 gText_ThunderWave48BP[] = _("Thunder Wave{CLEAR_TO 0x4E}48Bp");
 const u8 gText_SwordsDance48BP[] = _("Swords Dance{CLEAR_TO 0x4E}48Bp");
 const u8 gText_DefenseCurl16BP[] = _("Defense Curl{CLEAR_TO 0x4E}16Bp");
 const u8 gText_Snore24BP[] = _("Snore{CLEAR_TO 0x4E}24Bp");
-const u8 gText_MudSlap24BP[] = _("Mud-slap{CLEAR_TO 0x4E}24Bp");
+const u8 gText_MudSlap24BP[] = _("Mud-Slap{CLEAR_TO 0x4E}24Bp");
 const u8 gText_Swift24BP[] = _("Swift{CLEAR_TO 0x4E}24Bp");
 const u8 gText_IcyWind24BP[] = _("Icy Wind{CLEAR_TO 0x4E}24Bp");
 const u8 gText_Endure48BP[] = _("Endure{CLEAR_TO 0x4E}48Bp");