Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,089 Commits 1 Branch 0 Tags
63b2bd9a44c4cf5faa561160dec788573f819a7b
Commit Graph
7089 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
W1serV1ser 63b2bd9a44 Merge branch 'master' into FollowingPokemon_Gen1-3 2022-07-06 00:53:51 -07:00
W1serV1ser c6b9e7994f Revert "Merge branch 'FollowingPokemon' into master" 
This reverts commit 435a4f84e2, reversing
changes made to bee11f31cd.
 2022-07-06 00:37:51 -07:00
W1serV1ser a716f522f3 Merge adjustments 2022-07-06 00:15:30 -07:00
W1serV1ser 59e91c9b5f Merge branch 'pr/3' into FollowingPokemon_Gen1-3 2022-07-05 23:58:14 -07:00
W1serV1ser 435a4f84e2 Merge branch 'FollowingPokemon' into master 2022-07-05 23:21:20 -07:00
W1serV1ser bee11f31cd Merge branch 'pret:master' into master 2022-07-05 23:09:56 -07:00
W1serV1ser 3421fdb1ed Added Gen 4 and fixed some bugs 
overworld.c: Fixed bug where, upon reloading a save with the follower present,  the follower wouldn't go into the pokeball.

event_object_movement.c, overworld.c: Fixed bug where follower would glitch out when the player immediately starts running after dismounting from their bike or immediately starts riding when they mount their bike. Fix forces player to stand still until follower sprite affine animation is complete.

follow_me.c: Fixed bug where follower would appear if the player steps out of a door, gets on their bike, and rides away.

field_player_avatar.c: Fixed bug where, upon reloading a save when the follower is present, the player couldn't run, even if they had the running shoes.
 2022-07-05 23:09:19 -07:00
GriffinR 76659a4091 Merge pull request #1700 from mrgriffin/battle-setup-water-transition 
Simplify GetBattleTransitionTypeByMap
 2022-07-05 11:10:16 -04:00
Martin Griffin c9958e3087 Simplify GetBattleTransitionTypeByMap 2022-07-05 14:17:46 +01:00
GriffinR 8231ea2b68 Merge pull request #1699 from mrgriffin/field-camera-mod-16 
Identify a % 16
 2022-07-04 16:31:37 -04:00
Martin Griffin 4e76ffb4ca Identify a % 16 2022-07-04 21:25:19 +01:00
GriffinR 650f033c2b Merge pull request #1695 from GriffinRichards/update-gfromh 
Update some GF rom header names
 2022-06-29 11:59:43 -04:00
GriffinR 06c9e0eb99 Merge pull request #1697 from Kurausukun/bpm 
Use Floats and Round Correctly in Tempo Calculation
 2022-06-28 00:27:44 -04:00
Kurausukun 2e7f50064c use floats for tempo calculation 2022-06-28 00:11:59 -04:00
GriffinR 8950a41bfd Update some GF rom header names 2022-06-21 18:31:09 -04:00
GriffinR c2a08cc84d Merge pull request #1689 from GriffinRichards/task-ub 
Remove UBFIX related to task destruction
 2022-06-21 16:33:17 -04:00
GriffinR a5291cbc10 Merge pull request #1694 from sphericalice/patch-1 
Fix missing COPYWIN_FULL constant use
 2022-06-19 11:54:29 -04:00
sphericalice 5d7140fa83 Fix missing COPYWIN_FULL constant use 2022-06-19 13:33:47 +01:00
GriffinR fa1ae45b39 Merge pull request #1692 from coltongit/script-fixes 
Supplant PR #1579 (Fix the last of the *.inc inconsistencies)
 2022-06-18 21:02:28 -04:00
Colton G. Rushton 3de23b332a Supplant https://github.com/pret/pokeemerald/pull/1579 2022-06-18 21:51:05 -03:00
GriffinR 21ed288f50 Merge pull request #1687 from SimplyBLGDev/patch-1 
Format newlines in surf.inc
 2022-06-18 11:04:39 -04:00
GriffinR a931874164 Merge pull request #1691 from coltongit/patch-5 
Format newline in BattleFrontier_BattlePikeLobby/scripts.inc
 2022-06-18 11:04:20 -04:00
Colton G. Rushton c8e6d69fdc Format newline in BattleBattleFrontier_BattlePikeLobby/scripts.inc 
One of the strings declared in BattleFrontier_BattlePikeLobby/scripts.inc was poorly formatted.
 2022-06-18 11:49:13 -03:00
GriffinR 57222323c1 Merge pull request #1678 from GriffinRichards/const-frontier 
Add some battle frontier constant usage
 2022-06-18 10:22:58 -04:00
GriffinR d11b04f251 Merge pull request #1690 from Kurausukun/ai_doc 
Document Design Oddity, Use Constants, Correct Comment
 2022-06-17 22:09:43 -04:00
Kurausukun d3c8346a67 fix type, add bugfix 2022-06-17 21:58:56 -04:00
Kurausukun 23e9455e0a document design oddity, use constants, correct comment 2022-06-17 21:52:58 -04:00
GriffinR 7a6b417b8e Remove UBFIX related to task destruction 2022-06-17 21:01:23 -04:00
GriffinR de1145e790 Merge pull request #1688 from coltongit/patch-4 
Add bugfix from bugs_and_glitches.md to BUGFIX
 2022-06-17 17:48:53 -04:00
Colton G. Rushton f02ea58a68 Add comment description of this bugfix 2022-06-17 18:32:46 -03:00
Colton G. Rushton d7ab1ba588 Fix formatting 2022-06-17 18:22:47 -03:00
Colton G. Rushtonandsneed b885e01b39 Update src/item_menu_icons.c 
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
 2022-06-17 18:16:14 -03:00
Colton G. Rushton b17fb2ff56 Delete bugs_and_glitches.md 2022-06-17 18:07:46 -03:00
Colton G. Rushton e42498ab40 Add bugfix from bugs_and_glitches.md to BUGFIX 
Item flicker fix now in `BUGFIX`
Supersedes and resolves #1680
Fixes #1215
Fixes #1514
 2022-06-17 18:06:37 -03:00
Simply BLG 324a157b34 Format newlines in surf.inc 
One of the strings declared in surf.inc was poorly formatted.

## Description
Some of the strings declared in surf.inc contained newline characters in the middle of the .string line, opposing the format used by every string in the `data/text` directory, I just updated them to match the format, making it more readable.
 2022-06-17 15:21:12 -03:00
GriffinR 03e74c4aff Merge pull request #1686 from SimplyBLGDev/patch-2 
Format newlines in pc_transfer.inc
 2022-06-17 13:37:57 -04:00
Simply BLG 380cc8615b Format newlines in pc_transfer.inc 2022-06-17 14:22:31 -03:00
GriffinR 0e5fac564e Merge pull request #1684 from SimplyBLGDev/patch-1 
Format newlines in contest_string.inc
 2022-06-17 11:20:20 -04:00
Simply BLG 1860b61fe3 Corrected two missing newlines 2022-06-17 12:05:32 -03:00
Simply BLG e48341f7fc Format newlines in contest_string.inc 
Some of the strings declared in contest_string.inc were poorly formatted, containing newline characters in the middle of the string, opposing the format used by every string in data/text, I just updated them to match the format, making it more readable.
 2022-06-17 11:52:54 -03:00
GriffinR 4660f8c88b Document battle tower TV show 2022-06-14 09:37:39 -04:00
GriffinR 95f075ec90 Remove erroneous bugfix 2022-06-13 15:01:04 -04:00
GriffinR dec54e6e92 Additional constant usage 2022-06-13 03:21:20 -04:00
GriffinR 6418f08944 Merge pull request #1679 from LOuroboros/ribbons 
Untangled CheckPartnersMonForRibbons
 2022-06-09 14:47:38 -04:00
LOuroboros 7470a56d44 Untangled CheckPartnersMonForRibbons 2022-06-09 15:08:58 -03:00
GriffinR 7143865f6f Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
GriffinR 1f540845cb Merge pull request #1675 from GriffinRichards/doc-arg 
Document generic arguments
 2022-06-09 11:11:02 -04:00
GriffinR ceaff148f7 Shift to multiply 2022-06-09 10:52:19 -04:00
GriffinR 89e6e11f4c Merge pull request #1676 from GriffinRichards/obj-warning 
Add warning to NUM_OBJ_EVENT_GFX
 2022-06-05 21:19:39 -04:00
GriffinR bc2dbd772e Add warning to NUM_OBJ_EVENT_GFX 2022-06-03 16:18:34 -04:00