GriffinR
|
4d74dd5e33
|
Merge pull request #1950 from Icedude907/build-makefile-cleanup
[Build System Rewrite] Refactored `Makefile`
|
2024-08-31 00:36:50 -04:00 |
|
GriffinR
|
a4dd821658
|
Restore review changes from dependent PR
|
2024-08-31 00:33:02 -04:00 |
|
GriffinR
|
19ad2e16ac
|
Merge branch 'master' of https://github.com/pret/pokeemerald into build-makefile-cleanup
|
2024-08-31 00:17:07 -04:00 |
|
Icedude907
|
625a006cab
|
[Build System Rewrite] mapjson now takes output directory parameters. (#1949)
|
2024-08-29 14:01:01 -04:00 |
|
GriffinR
|
bc7c46ffe2
|
Merge pull request #2026 from mrgriffin/preproc-enum-arbitrary-expr
preproc: support arbitrary expressions in enums
|
2024-08-26 00:02:41 -04:00 |
|
Martin Griffin
|
ac28fc52e5
|
Merge pull request #2007 from cawtds/ub-fix-battle-transition
UB fix in battle_transition.c
|
2024-08-21 19:08:07 +01:00 |
|
Martin Griffin
|
56d3faa32f
|
Merge pull request #2025 from Bassoonian/cleandefinespaces
Clean up defines lacking spaces
|
2024-08-21 19:04:12 +01:00 |
|
Martin Griffin
|
ea726eee31
|
Merge pull request #2024 from luckytyphlosion/master
Slight storage system documentation
|
2024-08-21 19:02:03 +01:00 |
|
Martin Griffin
|
5c55cc3748
|
[preproc] support arbitrary expressions in enums
|
2024-08-21 07:50:41 +01:00 |
|
GriffinR
|
3f49c5cbaf
|
Fix trainer match call flags
|
2024-08-15 23:00:20 +02:00 |
|
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 |
|
Ariel A
|
29b2a7512f
|
Merge branch 'followers' into lighting
|
2024-08-12 23:06:45 -04:00 |
|
Ariel A
|
ca755420ed
|
meta: ignored refactoring change
|
2024-08-12 23:06:30 -04:00 |
|
Ariel A
|
0ae5cb1e39
|
meta: cleaned up spacing of lighting code
|
2024-08-12 23:04:41 -04:00 |
|
Ariel A
|
0745eaf2e0
|
fix: Uninitialized value used in LightenSpritePaletteInFog
|
2024-08-12 22:42:31 -04: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 |
|
Ariel A.
|
8d79ea1b19
|
Merge pull request #39 from Bassoonian/followersstringfixes
Fix two small text errors in follower dialogue
|
2024-08-07 00:00:01 -04: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 |
|
Bassoonian
|
4dce7db714
|
Another text fix
|
2024-08-04 16:53:46 +01:00 |
|
Bassoonian
|
369efc1208
|
Fix two small text errors in follower dialogue
|
2024-08-04 01:15:36 +01: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 |
|
Ariel A
|
e899218dfb
|
fix: MSG_COND_TIME_OF_DAY now checks whether map is outdoors and not raining
|
2024-06-25 01:38:52 -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 |
|
Ariel A
|
d410ca6999
|
Merge branch 'followers' into lighting
|
2024-06-01 15:21:57 -04:00 |
|
Ariel A
|
3727be9511
|
fix: fixed a few oversights with follower message generation
|
2024-06-01 14:46:45 -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 |
|
Ariel A
|
f82b40178e
|
Merge branch 'followers' into lighting
|
2024-05-21 22:16:01 -04:00 |
|
Ariel A
|
b37d9b3000
|
fix: disable followers in Union Room
Fixed #17
|
2024-05-21 22:14:29 -04:00 |
|
Ariel A
|
ed98b0b8ba
|
fix: added shadows on direct corner map
Fixed #18
|
2024-05-21 22:12:03 -04:00 |
|
Ariel A
|
9b6843442a
|
fix: add mart light sprite to Route102
|
2024-05-21 22:10:53 -04:00 |
|
GriffinR
|
aa4fa925c2
|
Merge pull request #1995 from Jaizu/adjust_friendship
Make AdjustFriendship more readable
|
2024-05-21 12:01:53 -04:00 |
|