Merge with pret #14
Merged
Merge with pret #14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FIX CGBMODVOL FAKEMATCHING (WE DID IT REDDIT)
Resolve sio32intr_clock_slave fakematching. One left!
Eliminate the last fakematching (Sio32IDIntr). We are free of nonmatchings/fakematchings!
…Data fix rfu_NI_stopReceivingData fakematching; i guess it aint over yet cowboy
Document Pokémon Storage System
[LEAK INFORMED] Fix apprentice.c do{}while(0)
Document trade sequence animation, some trade cleanup
Label more unused battle anims
Clean up roamer.c
Document remaining symbols in pokemon.c
Convert sKeyboardChars to 3D array
Disallow negative sizes in SAVEBLOCK_CHUNK
Small correction to map script comments
Make calcrom data info optional
Document link_rfu / Union Room
Add some misc constants/usage
# Conflicts: # data/event_scripts.s # data/maps/LittlerootTown/scripts.inc # data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc # data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc # data/maps/LittlerootTown_MaysHouse_1F/scripts.inc # data/maps/LittlerootTown_MaysHouse_2F/scripts.inc # data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc # data/maps/Route101/scripts.inc # data/scripts/day_care.inc # data/text/abnormal_weather.inc # data/text/birch_speech.inc # data/text/braille.inc # data/text/contest_strings.inc # data/text/mart_clerk.inc # data/text/match_call.inc # data/text/obtain_item.inc # data/text/pc.inc # data/text/pc_transfer.inc # data/text/pkmn_center_nurse.inc # data/text/pokedex_rating.inc # data/text/save.inc # data/text/surf.inc # src/battle_main.c # src/battle_message.c # src/data/decoration/header.h # src/data/text/trainer_class_names.h # src/data/trainers.h # src/pokedex.c # src/strings.c
LOuroboros
pushed a commit
that referenced
this pull request
Aug 14, 2022
Fixed softlock when pressing the start button while in link room
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
I want to continue working on this xD
Discord contact info
AsparagusEduardo#6051