Commit Graph

8085 Commits

Author SHA1 Message Date
Martin Griffin
e56dfdbc2b s/Pp/PP/g 2026-06-19 09:26:15 +01:00
AZero13
c2dcc629fd Fix UB in battle_anim_ground (#2273)
Some checks failed
CI / build (push) Has been cancelled
gBattleAnimArgs is 8 elements, not 15.

Co-authored-by: AZero13 <83477269+SiliconA-Z@users.noreply.github.com>
2026-06-17 20:36:43 +01:00
GriffinR
46b1988a20 Merge pull request #2280 from mrgriffin/pret-press-start
Some checks are pending
CI / build (push) Waiting to run
Rearrange press_start.png
2026-06-17 13:43:16 -04:00
Martin Griffin
5a9f566bbd Minor cleanups (#2318)
* Cleanup commas in .macro

* Cleanup src/item_use.c post #2313

* Cleanup src/fieldmap.c post #2314

* s/int/s32/g in fieldmap.h/fieldmap.c

* Cleanup src/battle_pyramid.c post #2310

* Cleanup src/battle_anim_effects_2.c post #2266
2026-06-17 15:36:35 +01:00
AZero13
9424eaf622 Fix fakematch in AnimMissileArc_Step (#2267)
Co-authored-by: AZero13 <83477269+SiliconA-Z@users.noreply.github.com>
2026-06-17 15:25:38 +01:00
AZero13
5b621f1819 Fix MoveItemSlotInList fakematch (#2260)
Co-authored-by: AZero13 <83477269+SiliconA-Z@users.noreply.github.com>
2026-06-17 14:48:29 +01:00
Martin Griffin
030b1781cd Cleanup src/battle_anim_effects_2.c post #2266 2026-06-17 14:36:52 +01:00
Martin Griffin
f1c806b31d Cleanup src/battle_pyramid.c post #2310 2026-06-17 14:35:40 +01:00
Martin Griffin
059268950f s/int/s32/g in fieldmap.h/fieldmap.c 2026-06-17 14:35:40 +01:00
Martin Griffin
b48256a074 Cleanup src/fieldmap.c post #2314 2026-06-17 14:35:40 +01:00
Martin Griffin
ed2da75f43 Cleanup src/item_use.c post #2313 2026-06-17 14:35:40 +01:00
Martin Griffin
167b05f2a7 Cleanup commas in .macro 2026-06-17 14:35:40 +01:00
AZero13
8a702fb8fd Fix weird fakematches in src/battle_anim_effects_2.c (#2266)
Co-authored-by: AZero13 <83477269+SiliconA-Z@users.noreply.github.com>
2026-06-17 14:35:25 +01:00
AZero13
8f0ec532e7 Fix fakematchings and warnings in overworld.c (#2275)
Co-authored-by: AZero13 <83477269+SiliconA-Z@users.noreply.github.com>
2026-06-17 14:29:59 +01:00
Martin Griffin
933cb969b2 Rearrange press_start.png 2026-06-17 14:14:19 +01:00
AZero13
80f23292d2 Make data1 and learnMoveState an array to prevent UB (#2284)
Fixes https://github.com/pret/pokeemerald/issues/2102
2026-06-17 14:09:24 +01:00
AZero13
a545d575ef Fix fakematches in battle pyramid (#2310)
In modern, it also decreases instruction count by 1.

Co-authored-by: Mike-Goutokuji <83477269+mike-goutokuji@users.noreply.github.com>
2026-06-17 12:55:38 +01:00
AZero13
305a831b2d Use DMA Macros more consistently (#2309)
I also had to move the check to first for some places to match.

Co-authored-by: Mike-Goutokuji <83477269+mike-goutokuji@users.noreply.github.com>
2026-06-17 11:51:53 +01:00
AZero13
2da84f7e3c Simplify and const-correct fieldmap.c (#2314)
Changing MapGridGetMetatileIdAt to output int also reduces number of casts

Co-authored-by: Mike-Goutokuji <83477269+mike-goutokuji@users.noreply.github.com>
2026-06-17 11:37:16 +01:00
AZero13
f901611773 Remove unneeded u16 casts in item_use.c (#2313)
Some checks are pending
CI / build (push) Waiting to run
Co-authored-by: Mike-Goutokuji <83477269+mike-goutokuji@users.noreply.github.com>
2026-06-17 11:10:19 +01:00
Estellar
0eda6d14e9 Add TextPrinterCallback (#2306)
Some checks failed
CI / build (push) Has been cancelled
2026-06-11 18:54:19 +01:00
mike-goutokuji
a90ff9c3d4 Const qualify walda_phase (#2304)
Some checks are pending
CI / build (push) Waiting to run
2026-06-11 15:56:16 +01:00
mike-goutokuji
2c8d157658 Fix SetObjectSubpriorityByElevation fakematch (#2259)
Some checks failed
CI / build (push) Has been cancelled
2026-06-04 16:32:36 +01:00
FosterProgramming
4b6a69ae24 Rename daycare special to account for string side effects (#2287)
Some checks are pending
CI / build (push) Waiting to run
2026-06-04 12:08:01 +01:00
hedara90
b1d9308623 Clean up sSpriteTileRanges (#2299)
Some checks failed
CI / build (push) Has been cancelled
Co-authored-by: Hedara <hedara90@gmail.com>
2026-05-31 19:30:49 +01:00
GriffinR
a6941e1bec Merge pull request #2298 from mrgriffin/pret-fix-event-script-typos
Some checks failed
CI / build (push) Has been cancelled
Fix typos in event script labels
2026-05-28 11:38:48 -04:00
Martin Griffin
c46e53bd02 Fix typos in event scripts 2026-05-28 15:14:36 +01:00
William Jackson
2d29864375 Bugfix: ensure move is correctly read (#2297)
Some checks are pending
CI / build (push) Waiting to run
2026-05-27 17:14:19 +01:00
FosterProgramming
0d3100185e Rename mass outbreak show to distinguish from savefile outbreakDaysLeft (#2288)
Some checks failed
CI / build (push) Has been cancelled
2026-05-15 21:51:57 -04:00
GriffinR
d310bae591 Merge pull request #2296 from mrgriffin/pret-text-cleanup
Minor string cleanups
2026-05-15 21:49:32 -04:00
Martin Griffin
3960a18c1b Consistently use decimal for CLEAR and CLEAR_TO 2026-05-15 20:05:13 +01:00
Martin Griffin
701c665786 Consistently use '{PAUSE 15}' 2026-05-15 20:05:13 +01:00
Martin Griffin
3ca6792d20 Minor string-related cleanups 2026-05-15 20:05:13 +01:00
hedara90
a1da009d36 Merge pull request #2295 from hedara90/git-add-dot-considered-harmful
Remove incorrectly added expansion tooling
2026-05-15 19:04:03 +01:00
Martin Griffin
4451df0d6b Merge pull request #2294 from mrgriffin/pret-preproc-line-diagnostics
Fix line numbers in preproc diagnostics
2026-05-15 18:07:30 +01:00
Martin Griffin
4aafe5904a preproc: Correct line numbers in errors involving macros
Seemingly a bug, GNU as reports errors as occurring in the file that
ultimately expanded the chain of macros rather than the files that
defined them.
2026-05-15 15:45:17 +01:00
Martin Griffin
e38dfaa92c preproc: Parse cpp linemarkers
The line numbers in preproc's errors involving strings or INCBINs were
incorrect before this change because all the lines from '#include'd
files incremented the line number that would be reported.
2026-05-15 15:45:17 +01:00
Martin Griffin
44addf349e Merge pull request #2290 from fdeblasio/moreMoveAnimationMacros
Some checks failed
CI / build (push) Has been cancelled
Added more move animation macros
2026-05-13 06:50:21 +01:00
Martin Griffin
6c2b2a9cdd Merge pull request #2291 from ravepossum/incgfx_performance
INCGFX performance - define individual Make variables instead of appending to list
2026-05-13 06:48:03 +01:00
RavePossum
5e148dfabd INCGFX performance - individual variables instead of list 2026-05-12 18:58:47 -06:00
Frank
76799d84eb Added electric puff macro 2026-05-06 19:47:22 -04:00
Frank
edc58c881f Added fist and foot templates 2026-05-06 19:43:40 -04:00
Martin Griffin
a3c551fe21 Merge pull request #2238 from SiliconA-Z/patch-1
Some checks failed
CI / build (push) Has been cancelled
Add gBattleOutcome == B_OUTCOME_DREW to bugfix
2026-04-23 17:48:59 +01:00
Martin Griffin
e178c18bf4 Merge pull request #2277 from SiliconA-Z/stray
Some checks failed
CI / build (push) Has been cancelled
Remove stray dereference in union room chat
2026-04-21 16:40:32 +01:00
Martin Griffin
af8e0b2516 Merge pull request #2264 from SiliconA-Z/modulo
Fix fakematchings regarding modulo
2026-04-21 16:32:20 +01:00
Martin Griffin
f9173995c1 Merge pull request #2261 from SiliconA-Z/assertion
Fix fakematch in AllocateBattleResources
2026-04-21 16:31:00 +01:00
Martin Griffin
619c4a3245 Merge pull request #2258 from SiliconA-Z/DynamicPlaceholderTextUtil_Reset
Fix fakematch in DynamicPlaceholderTextUtil_Reset
2026-04-21 16:29:27 +01:00
Martin Griffin
98ed1a6e6e Merge pull request #2140 from AsparagusEduardo/_pret/BtlController_EmitTwoReturnValues
`BtlController_EmitTwoReturnValues` cleanup
2026-04-21 16:01:35 +01:00
Martin Griffin
c314cc1e52 Merge pull request #2231 from GriffinRichards/match-call-rematch
Document gym leader match call texts
2026-04-21 15:57:49 +01:00
Martin Griffin
1dcb9c75b9 Merge pull request #2212 from Mitsunee/ismondisobedient-enum
Added enum for IsMonDisobedient
2026-04-21 15:57:06 +01:00