Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-27 12:26:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8,124 Commits 3 Branches 0 Tags
master
Commit Graph

8124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AZero13
c925b8482d Fix all fakematches in event object movement (#2263)
Some checks are pending
CI / build (push) Waiting to run
Details 
* Fix all fakematches in event object movement

Min changes needed. This also required adjusting faraway_mew's return type.

* Address feedback

---------

Co-authored-by: Mike-Goutokuji <83477269+mike-goutokuji@users.noreply.github.com>
 2026-09-26 16:47:46 -05:00
Marcus Huderle
f3a0ca8d82 A couple of audio-related improvements (#2359) 
* Add .porydaw to gitignore

* alt -> reverse, and add generic ADSR macros for compressed directsound voices
 2026-09-26 15:54:22 -05:00
GriffinR
5eff78649e Merge pull request #2322 from mrgriffin/pret-applywaitmovement
Some checks failed
CI / build (push) Has been cancelled
Details
2026-09-01 02:36:56 -04:00
GriffinR
f559fac24e Merge pull request #2347 from mrgriffin/pret-text-260720 
Minor text cleanups
 2026-09-01 02:26:56 -04:00
GriffinR
9702c24bd0 Merge pull request #2079 from GriffinRichards/items-enum 
Replace item define list with enum
 2026-09-01 02:26:00 -04:00
GriffinR
633b1c9c2f Replace item define list with enum 2026-09-01 02:04:27 -04:00
AZero13
c65e93f20a Move StartMonScrollingBgMask to battle_anim_utility_func.c (#2330)
Some checks failed
CI / build (push) Has been cancelled
Details 
So we don't need to do any extern shenanigans.
 2026-08-26 11:40:45 +01:00
AZero13
4d9208ea0c Fix TextIntoHealthboxObject fakematch (#2329) 2026-08-26 11:25:47 +01:00
AZero13
298239cbb4 j - (j / 8 * 8)) -> j % 8 in battle_interface.c (#2353)
Some checks failed
CI / build (push) Has been cancelled
Details 
Just do % 8
 2026-08-26 06:08:23 +01:00
AZero13
201378bdc0 Make sSpriteCopyRequests MAX_SPRITE_COPY_REQUESTS for consistency (#2351)
Some checks failed
CI / build (push) Has been cancelled
Details
2026-08-20 17:50:35 +01:00
AZero13
9a83a2bbe8 Alleviate some fakematches in battle_util.c (#2346)
Some checks failed
CI / build (push) Has been cancelled
Details
2026-08-04 05:35:46 +01:00
cawtds
98b522cda9 ubfix for strict aliasing violation (#2341) 2026-08-04 05:35:12 +01:00
Martin Griffin
a6b2c6134f Document MainMenu_FormatSavegameTime 2026-07-20 14:11:48 +01:00
Martin Griffin
f92fa0b803 text.h brace style 2026-07-20 13:42:59 +01:00
Martin Griffin
01a274bb10 s/SKIP/SKIP_TO 
CLEAR: takes number of pixels to clear
CLEAR_TO: takes x position to clear until

Therefore:
SKIP_TO: takes x position to skip until
 2026-07-20 13:42:58 +01:00
AZero13
83df84e406 Fix Mugshot_ShowBanner fakematch relying on merged stores (#2336)
Some checks failed
CI / build (push) Has been cancelled
Details 
If the fields ever change in proximity to each other, this breaks, so this fakematch must be fixed.
 2026-06-27 06:33:45 +01:00
Martin Griffin
c948da6df8 Remove PokenavListSub (#2317) 2026-06-26 22:50:18 -04:00
GriffinR
2509ad8073 Merge pull request #2337 from fdeblasio/fixBubblebeamSpelling 
Fixed BubblebeamCreateBubbles spelling
 2026-06-26 22:44:39 -04:00
Frank
091c147428 Fixed BubblebeamCreateBubbles spelling 2026-06-26 22:16:13 -04:00
aichiya
9b94f654cf PSG Wave should be aligned (#2335)
Some checks are pending
CI / build (push) Waiting to run
Details
2026-06-26 07:19:11 +01:00
psf
ebd27892ff comparison operators now use enum instead of raw numbers (#2334)
Some checks failed
CI / build (push) Has been cancelled
Details
2026-06-24 13:43:43 -04:00
GriffinR
8864b7b0b4 Merge pull request #2239 from kittenchilly/timer-ball-bugfix
Some checks are pending
CI / build (push) Waiting to run
Details 
BUGFIX: Use the unique fully open Timer Ball sprite
 2026-06-23 23:38:29 -04:00
GriffinR
81a28d6f57 Merge pull request #2100 from GriffinRichards/enc-constants 
Generate `include/constants/wild_encounter.h` automatically
 2026-06-23 23:34:14 -04:00
GriffinR
ac301324fb Generate encounter slot total constants 2026-06-23 23:27:06 -04:00
GriffinR
ac35f6695d Generate ENCOUNTER_CHANCE constants separately from encounter data 2026-06-23 23:27:02 -04:00
GriffinR
24596b0aa9 Merge pull request #2282 from ketsuban/how-many-status1-bits-are-there-again 
Mention the width of RAM variables in constants/battle.h
 2026-06-23 23:23:05 -04:00
GriffinR
199faad80f Merge pull request #2321 from mrgriffin/pret-getmondata-expansion 
Replace Get(Box)MonData2 aliases with functions in UBFIX builds
 2026-06-23 23:15:43 -04:00
GriffinR
d8c7839fa0 Merge pull request #2324 from mrgriffin/pret-pp 
s/Pp/PP/g
 2026-06-23 23:14:05 -04:00
GriffinR
84c2210e8b Merge pull request #2331 from mrgriffin/pret-sprite-bool
Some checks are pending
CI / build (push) Waiting to run
Details 
AddSpriteToOamBuffer: TRUE/FALSE
 2026-06-23 16:45:37 -04:00
GriffinR
263e0fb37f Merge pull request #2332 from mrgriffin/pret-pokelot-prize-item 
ResetLotteryCorner: VAR_POKELOT_PRIZE_ITEM contains an item ID
 2026-06-23 16:44:52 -04:00
Martin Griffin
e45e6c0851 AddSpriteToOamBuffer: TRUE/FALSE 
tbh I think it would be helpful to separate 'bool*' into two types:
- bool* { FALSE, TRUE }
- error* { SUCCESS, ERROR }

I find it really counterintuitive to read/write functions that return
'FALSE' for success.
 2026-06-23 21:28:13 +01:00
Martin Griffin
a7edc05325 ResetLotteryCorner: VAR_POKELOT_PRIZE_ITEM contains an item ID 2026-06-23 21:27:47 +01:00
Martin Griffin
e56dfdbc2b s/Pp/PP/g 2026-06-19 09:26:15 +01:00
Martin Griffin
654b7fa892 Migrate to implicit waitmovement 2026-06-18 15:21:53 +01:00
Martin Griffin
55a392457d Implicit waitmovement 
Applied to moverotatingtileobjects and turnrotatingtileobjects.
 2026-06-18 15:21:53 +01:00
Martin Griffin
9ab6f5b70a migrate to applywaitmovement 2026-06-18 06:22:44 +01:00
Martin Griffin
00acaf5dfd applywaitmovement 2026-06-18 06:20:29 +01:00
Martin Griffin
13ac1fdc8f Replace Get(Box)MonData2 aliases with functions in UBFIX builds 2026-06-17 21:49:28 +01:00
AZero13
c2dcc629fd Fix UB in battle_anim_ground (#2273)
Some checks failed
CI / build (push) Has been cancelled
Details 
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
Details 
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