Commit graph

7698 commits

Author SHA1 Message Date
pkmnsnfrn
91b48a10d4 Added constant for NUM_SNOWFLAKE_SPRITES 2024-07-26 21:57:42 -07:00
GriffinR
502eedaed8
Merge pull request #2009 from abcboy101/berry-blender
Decode unused JP text in berry_blender.c
2024-06-29 16:31:56 -04:00
abcboy101
779855ee02 Decode unused JP text in berry_blender.c 2024-06-29 14:02:50 -04:00
Martin Griffin
cb1a14c9fa
Merge pull request #2006 from leo60228/oops-not-expansion
Fix pokeemerald-expansion reference in INSTALL.md
2024-06-21 06:41:52 +01:00
leo60228
5dac97aa5d
Fix pokeemerald-expansion reference in INSTALL.md 2024-06-20 15:55:51 -04:00
Alex Nash
c0d630ee63 Add support for LF line endings to gbagfx 2024-06-20 21:44:32 +02:00
Martin Griffin
366f8b33a3
Merge pull request #1999 from leo60228/nixos-install
Fix build on NixOS and add instructions to INSTALL.md
2024-06-20 19:10:57 +01:00
Jaizu
189d542520
Fix Steven partner battle post-battle script (#2001) 2024-06-17 15:44:52 -04:00
leo60228
d8d4885c11
Add NixOS install instructions 2024-05-29 19:33:18 -04:00
leo60228
ef2330593c
Don't assume bash is at /bin/bash 2024-05-29 19:32:17 -04:00
GriffinR
18f84b78f2
Merge pull request #1998 from Sneed69/define-POKE_ICON_BASE_PAL_TAG
Move POKE_ICON_BASE_PAL_TAG to a header
2024-05-22 20:29:12 -04:00
sneed
b592c6eae5 Add POKE_ICON_BASE_PAL_TAG to a header 2024-05-23 02:45:22 +03:00
GriffinR
aa4fa925c2
Merge pull request #1995 from Jaizu/adjust_friendship
Make AdjustFriendship more readable
2024-05-21 12:01:53 -04:00
GriffinR
999731fbf1
Merge pull request #1996 from Jaizu/fix_pokeblocks
Fix Pokeblock script missing a releaseall
2024-05-21 11:58:08 -04:00
Jaizu
ef03daf6d4 Fix Pokeblock script missing a releaseall 2024-05-19 12:52:04 +02:00
Jaizu
411d7e6177 Make AdjustFriendship more readable 2024-05-14 12:48:20 +02:00
Kurausukun
5dbd90b917
Use Only One Loop in RandomlyGivePartyPokerus (#1991) 2024-04-19 14:17:12 -04:00
GriffinR
9cfe9b1bdd
Merge pull request #1990 from NTx86/fix-hoenn-pokedex-pal
Fix hoenn pokedex palette being split in two
2024-04-19 14:14:12 -04:00
GriffinR
8c4b1a37d6
Merge pull request #1989 from NTx86/fix-poison-anim-array
Fix poison projectile array being incorrectly combined into three separate arrays
2024-04-19 14:11:22 -04:00
NT_x86
2b78a85828
Fix hoenn pokedex palette being split in two 2024-04-13 13:09:24 +03:00
NT_x86
c64453efe5
Fix poison projectile array being incorrectly combined into three seperate arrays 2024-04-13 10:14:31 +03:00
GriffinR
af0165a35d
Merge pull request #1987 from PokemonSanFran/cancelGroundEffectsCamera
Added fix to Keep the Camera from Making Waves
2024-04-11 14:41:04 -04:00
GriffinR
a0637251f8
Merge pull request #1986 from LOuroboros/patch-1
Updated value of gMain.inBattle at OpponentHandleEndLinkBattle
2024-04-11 14:39:00 -04:00
GriffinR
0b73cd81d8
Merge pull request #1985 from PokemonSanFran/surfingDismountFix
BUGFIX for Surfing Dismount Ground Effects
2024-04-11 14:38:40 -04:00
pkmnsnfrn
f9d690bafe Added fix to Keep the Camera from Making Waves 2024-04-05 14:58:31 -07:00
LOuroboros
3135a1fc2b
Updated value-setting of gMain.inBattle at OpponentHandleEndLinkBattle 2024-04-05 17:04:46 -03:00
pkmnsnfrn
71b8d20397 Replaced magic numbers regarding triggerGroundEffectsOnMove to TRUE / FALSE 2024-04-04 16:21:34 -04:00
pkmnsnfrn
7ee921e9da Added BUGFIX for groundEffectsOnMove when the player stops Surfing 2024-04-04 16:17:48 -04:00
GriffinR
f19747d6cc
Merge pull request #1983 from LOuroboros/modernfateful
Renamed ScrCmd_setmonmodernfatefulencounter and ScrCmd_checkmonmodernfatefulencounter for consistency reasons
2024-03-21 21:28:30 -04:00
GriffinR
b08d62b615
Merge pull request #1961 from GriffinRichards/doc-camera-sprite
Document camera sprite functions
2024-03-21 21:23:53 -04:00
GriffinR
b4f92ad2e1
Merge pull request #1982 from DizzyEggg/anim_improvements
Simplify weirdly matching division/substraction code
2024-03-21 21:16:56 -04:00
LOuroboros
927f098cf5 Renamed setmodernfatefulencounter and checkmodernfatefulencounter for consistency reasons 2024-03-11 01:46:59 -03:00
DizzyEggg
82f8636502 Simplify division in berry_crush and field weather functions 2024-03-09 20:06:58 +01:00
DizzyEggg
9e67594dce Simplify weirdly matching division/substraction code 2024-03-08 16:19:04 +01:00
GriffinR
82c3e4af14
Merge pull request #1981 from DizzyEggg/patch-3
Make sure gHeap is always aligned
2024-03-07 10:33:52 -05:00
DizzyEggg
7da5cb421e
Make sure gHeap is always aligned 2024-03-06 16:13:06 +01:00
GriffinR
954ba0a155
Merge pull request #1980 from Kurausukun/dexcry
Missing Constant in Dex Cry Screen
2024-02-10 09:38:51 -05:00
Kurausukun
3342fdafc2 add missing constant 2024-02-10 05:32:03 -05:00
GriffinR
d7a361cef1
Merge pull request #1978 from DizzyEggg/windows_overflow
Fix HideMapNamePopUpWindow possible overflow
2024-02-04 20:34:17 -05:00
GriffinR
246f47d9d0
Merge pull request #1979 from DizzyEggg/patch-2
Change Safe Div to explicitly check b != 0
2024-02-04 20:22:37 -05:00
DizzyEggg
132ca1be14
Change Safe Div to explicitly check b != 0 2024-02-02 22:57:02 +01:00
DizzyEggg
e87a69a5e7 Fix HideMapNamePopUpWindow possible overflow 2024-02-02 22:31:20 +01:00
GriffinR
5be69b2713 Merge slot machine smoke SubspriteTable arrays 2024-01-30 11:46:19 -05:00
GriffinR
232eab4bee
Merge pull request #1975 from Sierraffinity/jsonproc-fix
jsonproc: filter out every non-alphanumeric character
2024-01-28 13:54:11 -05:00
GriffinR
f2276e14a2
Merge pull request #1976 from SBird1337/ld/malloc
fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld
2024-01-28 13:39:49 -05:00
sbird
e2eca97b02 fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld 2024-01-28 12:40:48 +01:00
Sierraffinity
b98e044ce9 jsonproc: filter out every non-alphanumeric character 2024-01-27 19:29:29 -08:00
GriffinR
5e47049b3c
Merge pull request #1974 from Sierraffinity/gbagfx-fix
gbagfx bit depth upconversion fix
2024-01-27 17:44:44 -05:00
Sierraffinity
e85750bb55 gbagfx bit depth upconversion fix 2024-01-27 14:29:31 -08:00
GriffinR
bcd5fc1481
Merge pull request #1972 from GriffinRichards/metatile-labels
Remove non-existent tilesets from label comments and alphabetize
2024-01-19 10:44:29 -05:00