Commit Graph

3782 Commits

Author SHA1 Message Date
LOuroboros 3efb581e7e Linked STARTMENU labels to the entries of sStartMenuActionTable
This makes it easier to remove options from the start menu at will.
Looking for a STARTMENU label and removing it from enum StartMenuOption and the SetUpStartMenu functions isn't good enough by itself.
2025-05-15 04:39:59 -03:00
GriffinR d61f959453 Merge pull request #690 from pret/bugfix/keep_temps_in_builddir
.i and .s files should be under build/ when KEEP_TEMPS=1
2025-03-08 02:05:57 -05:00
PikalaxALT 7f7ff65e06 .i and .s files should be under build/ when KEEP_TEMPS=1 2025-03-07 20:29:16 -05:00
GriffinR bf6bfbd2ed Merge pull request #668 from Kurausukun/pockets
Add Constant for 3 Main Bag Pockets
2025-02-03 12:29:05 -05:00
cawtds 355b92f791 consolidate arrow tiles (#682) 2025-02-03 12:19:40 -05:00
Kevin d844877218 Rename the Move Relearner specials. (#684) 2025-01-19 14:14:55 -05:00
GriffinR 2a3e92e10f Sync Makefile and common syms (#676) 2024-11-26 12:46:12 -05:00
GriffinR b76867fc3b Replace incorrect Japanese characters 2024-11-19 19:35:18 -05:00
GriffinR d2c592030d Sync toolchain fixes from pokeemerald 2024-10-11 15:21:06 -04:00
GriffinR 99de06de5f Fix libpng installation for workflow on Ubuntu 24.04 2024-10-11 13:36:05 -04:00
GriffinR 311d317eb3 Merge pull request #672 from GriffinRichards/sync-toolchain
Sync Makefile and tools with pokeemerald
2024-09-18 19:40:16 -04:00
GriffinR e47a054393 Sync remaining tools 2024-09-14 11:26:14 -04:00
GriffinR f89a69a2d9 Have scaninc ignore non-existing files 2024-09-13 23:12:50 -04:00
GriffinR ab80760dfc Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings 2024-09-13 23:12:20 -04:00
GriffinR 93b4a7b815 Toolchain sync fixes 2024-09-12 17:49:50 -04:00
GriffinR 2ed7806380 Deleted generated constants, add midi.cfg 2024-09-12 12:58:22 -04:00
GriffinR f0566e68f0 Sync tools directory 2024-09-12 12:39:00 -04:00
GriffinR a14180a64e Initial Makefile sync 2024-09-12 12:22:25 -04:00
GriffinR 539ed36160 Merge pull request #662 from cawtds/ub-fix-battle-transition
UB fix in battle_transition.c
2024-08-29 14:18:26 -04:00
GriffinR caf8c6bfa9 Merge pull request #670 from abcboy101/decode
Update link_rfu_2.c
2024-08-29 14:16:53 -04:00
GriffinR 4f7b8c5e9e Merge pull request #663 from cawtds/ub-fix-camera-object
Fix for potential UB in CameraObjectReset2
2024-08-29 14:11:58 -04:00
abcboy101 6319b453bc Update link_rfu_2.c 2024-08-24 22:19:28 -04:00
Kurausukun bceff5fb5f add constant for 3 main bag pockets 2024-08-12 14:33:52 -04:00
cawtds 466a69a6e0 Update src/event_object_movement.c
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
2024-08-10 20:41:21 +02:00
GriffinR f155bf5419 Merge pull request #667 from abcboy101/decode
Decode unused JP text
2024-08-09 20:46:07 -04:00
abcboy101 588e164e67 Decode unused JP text 2024-08-09 20:19:38 -04:00
cawtds d61220569d fix for potential UB in CameraObjectReset2 2024-06-27 16:13:17 +02:00
cawtds e6eb717275 UB fix ClockwiseWipe_TopRight 2024-06-25 22:09:08 +02:00
GriffinR c6a2f50491 Merge pull request #657 from aarant/master
Linkerscript now tracks RAM/ROM usage
2024-06-22 12:02:35 -04:00
GriffinR 21e8a142db Revert section rename 2024-06-22 11:58:39 -04:00
GriffinR 4c015cd9db Merge pull request #659 from Deokishisu/patch-5
BUGFIX for Localization Oversight in Daisy's Text && Fix Typo in Nurse Script
2024-06-22 11:55:49 -04:00
GriffinR b2e2648d15 Use C preprocessor directives 2024-06-22 11:51:16 -04:00
GriffinR 9b2fc69e5e Merge pull request #656 from SatoMew/misc-fixes
Spring cleaning
2024-06-22 11:46:13 -04:00
GriffinR ceeb6a4ca0 Merge pull request #661 from Kurausukun/gcc14-fix
Fix Compilation on GCC 14
2024-06-19 09:29:49 -04:00
Kurausukun 6bd758f45d fix compilation on gcc 14 2024-06-06 23:22:37 -04:00
Deokishisu 4578a59673 Fix Localization Oversight in Daisy's Text
Based on the FONT_NORMAL and FONT_FEMALE control codes in Daisy's text when finishing her grooming of a Pokémon, it seems the original intention was for the first part of this text to be NPC_TEXT_COLOR_NEUTRAL and for Daisy's dialogue to be NPC_TEXT_COLOR_FEMALE. If the localizers had caught it, they would've replaced FONT_NORMAL with COLOR DARK_GRAY and FONT_FEMALE with COLOR RED. This commit creates a .ifdef BUGFIX for this oversight.
2024-05-24 22:09:31 -04:00
Deokishisu fb0c7dc3f2 Fix Typo in Nurse Script
EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom => EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom
2024-05-24 21:58:35 -04:00
Ariel A bc76541189 feat: Linkerscript now tracks RAM/ROM usage
Based on https://github.com/pret/pokeemerald/pull/1952
2024-05-16 19:03:37 -04:00
SatoMew b9dec717da Spring cleaning 2024-05-12 14:34:43 +01:00
GriffinR 0c17a3b041 Merge pull request #653 from GriffinRichards/metatile-labels
Remove non-existent tilesets from label comments and alphabetize
2024-01-19 10:46:18 -05:00
GriffinR efdae01b4b Remove non-existent tilesets from label comments and alphabetize 2024-01-18 14:42:20 -05:00
GriffinR 9588ba6e01 Merge pull request #652 from Kurausukun/macros
Safeguard SQUARE and CUBE Macro Arguments in Parentheses
2023-12-27 17:43:49 -05:00
Kurausukun 2da3a172d6 safeguard SQUARE and CUBE macros in parentheses 2023-12-27 17:37:11 -05:00
Jaizu 1d1754d37f Small mart changes (#651) 2023-12-07 12:43:27 -05:00
Kurausukun 7df4038c86 Ensure Alignment for Map Events (#649) 2023-11-21 15:46:51 -05:00
GriffinR 2d8c81eb21 Merge pull request #648 from SnorlaxMonster/master
Rename HITMARKER_IGNORE_SAFEGUARD
2023-11-16 15:47:14 +00:00
SnorlaxMonster 0d063af23f Rename HITMARKER_IGNORE_SAFEGUARD
Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT.
This flag is used exclusively by status-inflicting Abilities,
and has 3 main functions:
- Whether the effect bypasses Shield Dust
- Whether the effect bypasses Safeguard
- Which text string to display when the status condition is inflicted
   (i.e. whether it was inflicted by a move or Ability)

I believe this new name better represents what the flag actually does.
This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.
2023-11-10 18:21:56 +11:00
GriffinR 1dd602d914 Merge pull request #641 from AnonymousRandomPerson/master
Replaced decomp list with pret.github.io link
2023-10-17 02:44:44 -04:00
GriffinR 23dd337246 Merge pull request #645 from Kurausukun/m4asym
Add Missing Constant Usage in m4a_1
2023-09-23 21:49:28 -04:00
Kurausukun 5e7fada945 add missing constant usage in m4a_1 2023-09-23 19:37:52 -04:00