Commit graph

7767 commits

Author SHA1 Message Date
Bassoonian
c1ee43254e Clean up defines lacking spaces 2024-08-15 19:34:56 +02:00
luckytyphlosion
7d921fa89b Slight storage system documentation 2024-08-14 18:27:44 -04:00
GriffinR
a3d5f54b75 Fix type for offset in MapConnection 2024-08-13 19:10:24 +02:00
psf
312749dd31
Changed type1 and type2 to be consistent (#2021)
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo
* Changed monType1 and monType2 to monTypes to match gSpeciesInfo
2024-08-07 06:44:03 +01:00
GriffinR
9a3c6d072b
Merge pull request #2018 from fdeblasio/fixMtPyreLabel
Fixed bottom half of Mt. Pyre not being labeled in PokeNav
2024-08-05 11:27:01 -04:00
Frank
62b4ea5aaa Fixed bottom half of Mt. Pyre not being labeled in PokeNav 2024-08-01 13:34:17 -04:00
Martin Griffin
30f8ccfe6e
Merge pull request #2017 from PokemonSanFran/numSnowflakeSpritesConstant
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-27 07:26:40 +01:00
pkmnsnfrn
91b48a10d4 Added constant for NUM_SNOWFLAKE_SPRITES 2024-07-26 21:57:42 -07:00
luckytyphlosion
7316e54161
Merge pull request #2016 from luckytyphlosion/master
Fix WSL1 install instructions
2024-07-26 19:22:58 -04:00
luckytyphlosion
3d2b861436 Fix WSL1 install instructions 2024-07-23 17:53:19 -04:00
Philipp AUER
550e6688aa
Support C-Style enum in preproc (#1984)
* [preproc] C-style enums

- asm files parseable from stdin
- 2nd preproc pass
- add parser for C-style `enum`
- positional arguments at end of command

---------

Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-07-13 18:26:33 +01:00
GriffinR
a0a02f9733
Merge pull request #2012 from DizzyEggg/patch-1
Berry blender's Task_HandleOpponent small fixes
2024-07-04 15:02:58 -04:00
DizzyEggg
47533e3a7e
Berry blender's Task_HandleOpponent small fixes 2024-07-04 20:56:22 +02: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
cawtds
5eea3d39cd UB fix ClockwiseWipe_TopRight 2024-06-25 21:53:05 +02: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