 GriffinR
|
9275e71390
|
Merge pull request #2066 from surtr-games/bugfix_battle_ai
BUGFIX: Fix Counter and Mirror Coat checking the wrong category
|
2024-11-15 15:18:32 -05:00 |
|
|
GriffinR
|
9ea76f9815
|
Merge pull request #2064 from Lactozilla/fix-contestants-turn-blink-effect-offsets
Remove usage of gHeap in sSpritePalettes_ContestantsTurnBlinkEffect
|
2024-11-12 12:47:24 -05:00 |
|
|
GriffinR
|
1b8e6fbe3f
|
Lay out emerald version png horizontally
|
2024-11-04 15:40:10 -05:00 |
|
|
GriffinR
|
f04c2faeb0
|
Silence 'Nothing to be done for generated' messages (#2059)
|
2024-11-03 23:53:53 +01:00 |
|
|
GriffinR
|
a0be2cbf7b
|
Fix Fallorbor typo
|
2024-10-12 23:50:12 -04:00 |
|
|
GriffinR
|
b6892f5b67
|
Let scaninc ignore empty C files
|
2024-10-11 15:03:38 -04:00 |
|
|
GriffinR
|
6d24d8a78f
|
Fix libpng installation for workflow on Ubuntu 24.04
|
2024-10-11 13:29:16 -04:00 |
|
|
GriffinR
|
2b73d10a2a
|
Merge pull request #2041 from Jaizu/patch-9
Ignore mGBA screenshots
|
2024-10-02 15:35:20 -04:00 |
|
|
GriffinR
|
44e9228a6e
|
Merge pull request #2038 from GriffinRichards/gflib-syms
Remove explicit symbol sizes in sym_common.txt
|
2024-10-02 15:34:42 -04:00 |
|
|
GriffinR
|
37d104f7a5
|
Merge pull request #2039 from Scyrous/patch-1
Bugfix for cable car hikerGraphicsIds array
|
2024-10-02 15:34:22 -04:00 |
|
|
GriffinR
|
80a37c16be
|
Remove explicit symbol sizes in sym_common.txt
|
2024-09-25 16:14:10 -04:00 |
|
|
GriffinR
|
473e0623ba
|
Merge pull request #2031 from GriffinRichards/fix-toolchain
Minor toolchain fixes
|
2024-09-19 12:23:58 -04:00 |
|
|
GriffinR
|
8f41d9eb17
|
Merge branch 'master' into fix-toolchain
|
2024-09-19 12:20:51 -04:00 |
|
|
GriffinR
|
635325304b
|
Merge pull request #2033 from Kurausukun/goodbye_gflib
Remove gflib
|
2024-09-19 12:19:48 -04:00 |
|
|
GriffinR
|
62c27faba4
|
Merge pull request #2032 from DizzyEggg/patch-1
remove ScriptContext_Enable from secret_base.h
|
2024-09-14 13:17:26 -04:00 |
|
|
GriffinR
|
db898f8baa
|
Merge pull request #2030 from skyeforeverblue/patch-2
Update pull_request_template.md to include Discord username update
|
2024-09-14 10:56:50 -04:00 |
|
|
GriffinR
|
bc58a4ac04
|
Merge pull request #2029 from skyeforeverblue/patch-1
Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft
|
2024-09-14 10:56:41 -04:00 |
|
|
GriffinR
|
302193a814
|
Have scaninc ignore non-existing files
|
2024-09-14 00:28:57 -04:00 |
|
|
GriffinR
|
b8c71fa84d
|
Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings
|
2024-09-13 23:38:50 -04:00 |
|
|
GriffinR
|
7007439be8
|
Remove old ld_script processing
|
2024-09-12 13:50:47 -04:00 |
|
|
GriffinR
|
d9b824db3f
|
Sync missing alignment from pokefirered
|
2024-09-12 12:27:31 -04:00 |
|
|
GriffinR
|
9e22bf1af4
|
Merge pull request #1957 from Icedude907/build-music-config
[Build System Rewrite] Improved audio rules
|
2024-09-12 10:46:30 -04:00 |
|
|
GriffinR
|
51131e2582
|
Merge pull request #1954 from Icedude907/build-scaninc-speed
[Build System Rewrite] Massive build speed improvement via scaninc changes
|
2024-09-12 10:45:41 -04:00 |
|
|
GriffinR
|
cfdb06a813
|
Merge pull request #2028 from NTx86/fix-contest-ai-point-macros
Fix incorrect point macros in contest_ai_script.inc
|
2024-09-08 14:47:28 -04:00 |
|
|
GriffinR
|
04197b4912
|
Fix swapped cycling road entrances
|
2024-08-31 01:54:25 -04:00 |
|
|
GriffinR
|
32f05269a3
|
Add missing terminal newlines
|
2024-08-31 00:53:23 -04:00 |
|
|
GriffinR
|
c265c3f837
|
Merge branch 'master' of https://github.com/pret/pokeemerald into build-music-config
|
2024-08-31 00:51:15 -04:00 |
|
|
GriffinR
|
2d5231149e
|
Merge branch 'master' of https://github.com/pret/pokeemerald into build-scaninc-speed
|
2024-08-31 00:39:48 -04:00 |
|
|
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 |
|
|
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 |
|
|
GriffinR
|
3f49c5cbaf
|
Fix trainer match call flags
|
2024-08-15 23:00:20 +02:00 |
|
|
GriffinR
|
a3d5f54b75
|
Fix type for offset in MapConnection
|
2024-08-13 19:10:24 +02: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
GriffinR
|
82c3e4af14
|
Merge pull request #1981 from DizzyEggg/patch-3
Make sure gHeap is always aligned
|
2024-03-07 10:33:52 -05:00 |
|
|
GriffinR
|
954ba0a155
|
Merge pull request #1980 from Kurausukun/dexcry
Missing Constant in Dex Cry Screen
|
2024-02-10 09:38:51 -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 |
|
|
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 |
|
|
GriffinR
|
5e47049b3c
|
Merge pull request #1974 from Sierraffinity/gbagfx-fix
gbagfx bit depth upconversion fix
|
2024-01-27 17:44:44 -05: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 |
|
|
GriffinR
|
1eadbc39da
|
Merge pull request #1973 from AsparagusEduardo/_pret/pr2/braces
Fixed braces style
|
2024-01-19 10:40:25 -05:00 |
|
|
GriffinR
|
8e8d2f5efa
|
Remove non-existent tilesets from label comments and alphabetize
|
2024-01-18 14:31:04 -05:00 |
|
|
GriffinR
|
6c96641035
|
Merge pull request #1969 from Kurausukun/macros
Safeguard SQUARE and CUBE Macro Arguments in Parentheses
|
2023-12-27 17:39:37 -05:00 |
|
|
GriffinR
|
6385f0426d
|
Merge pull request #1968 from Jaizu/patch-5
Missing constant
|
2023-12-20 09:03:35 -05:00 |
|
|
GriffinR
|
0e10fc3ca5
|
Merge pull request #1966 from Bassoonian/pokeacutemonpret
Clean up pokemon/ball/dex mentions in comments
|
2023-12-13 13:30:32 -05:00 |
|
|
GriffinR
|
e4149e83f8
|
Merge pull request #1962 from LOuroboros/patch-1
Updated the size of the struct InGameTrade's otName variable
|
2023-12-02 10:44:31 -05:00 |
|
|
GriffinR
|
15e1cd81a7
|
Merge pull request #1952 from Icedude907/build-linkerscript
[Build System Rewrite] Linkerscript now tracks RAM/ROM usage
|
2023-11-23 17:01:29 -05:00 |
|
|
GriffinR
|
2db9ab2a2f
|
Document camera sprite functions
|
2023-11-22 13:52:56 -05:00 |
|
|
GriffinR
|
b302291bd3
|
Merge pull request #1953 from Icedude907/move-files
Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin
|
2023-11-20 12:27:05 -05:00 |
|
|
GriffinR
|
758f7446f0
|
Merge pull request #1959 from SnorlaxMonster/master
Rename HITMARKER_IGNORE_SAFEGUARD
|
2023-11-18 08:43:44 -05:00 |
|
|
GriffinR
|
12a64fecb4
|
Merge pull request #1936 from GriffinRichards/doc-datahpupdate
Document datahpupdate
|
2023-11-07 12:25:26 -05:00 |
|
|
GriffinR
|
2e1fe4c82b
|
Merge pull request #1940 from LOuroboros/copyMonToPC
Renamed SendMonToPC to CopyMonToPC instead
|
2023-11-07 12:22:31 -05:00 |
|
|
GriffinR
|
92e7963eff
|
Merge pull request #1939 from Bassoonian/noeggsdiscovered
Rename Undiscovered to No Eggs Discovered
|
2023-11-07 12:20:07 -05:00 |
|
|
GriffinR
|
973f797d95
|
Merge pull request #1944 from quocmanh94/master
Delete the redundant files generated after running build
|
2023-11-03 01:56:43 -04:00 |
|
|
GriffinR
|
959623f82e
|
Merge pull request #1942 from KABoissonneault/fix/dual-non-immunity
Added BUGFIX for "dual non-immunity" glitch.
|
2023-11-02 11:26:58 -04:00 |
|
|
GriffinR
|
2304283c3e
|
Merge pull request #1935 from GriffinRichards/bugfixfix
Use BUGFIX in assembly files
|
2023-10-26 17:42:41 -04:00 |
|
|
GriffinR
|
c169b856d4
|
Merge pull request #1937 from kittenchilly/removewhitespace
Remove all trailing whitespace
|
2023-10-26 10:09:00 -04:00 |
|
|
GriffinR
|
3a8df46832
|
Merge pull request #1938 from AsparagusEduardo/pret/pr2/ndebugModern
Fix mini_printf encoded string -Werror=pointer-sign warning
|
2023-10-26 10:08:25 -04:00 |
|
|
GriffinR
|
5712777dc2
|
Correct dynamic type flag name
|
2023-10-20 12:57:36 -04:00 |
|
|
GriffinR
|
ffdc2456cb
|
Document datahpupdate
|
2023-10-20 12:50:32 -04:00 |
|
|
GriffinR
|
a5c2ac5e49
|
Use BUGFIX in assembly files
|
2023-10-20 09:10:49 -04:00 |
|
|
GriffinR
|
ad0c28df70
|
Merge pull request #1919 from AnonymousRandomPerson/master
Replaced decomp list with pret.github.io link
|
2023-10-17 02:44:08 -04:00 |
|
|
GriffinR
|
104e81b359
|
Merge pull request #1915 from GriffinRichards/misc-tasks
Add some task/sprite data defines
|
2023-10-07 21:34:52 -04:00 |
|
|
GriffinR
|
f01a6afc98
|
Merge branch 'master' into misc-tasks
|
2023-10-07 17:25:20 -04:00 |
|
|
GriffinR
|
6f71fbe521
|
Add some missing trainer hill constant usage
|
2023-10-06 15:17:55 -04:00 |
|
|
GriffinR
|
dec4b580a3
|
Merge pull request #1930 from KABoissonneault/fix/factory_oob
Fixed out-of-bounds access in GetFactoryMonFixedIV for BUGFIX
|
2023-10-05 11:51:17 -04:00 |
|
|
GriffinR
|
654b6380b1
|
Merge pull request #1926 from AsparagusEduardo/pret/pr2/EggWall
Solved a bunch of -Wall errors on modern
|
2023-10-01 11:57:30 -04:00 |
|
|
GriffinR
|
3ff27bdae0
|
Merge pull request #1928 from kittenchilly/friendship
Add friendship evo threshold constant
|
2023-10-01 11:53:03 -04:00 |
|
|
GriffinR
|
3eb1fa6fcb
|
Merge pull request #1925 from AsparagusEduardo/pret/pr2/dayNightConst
Slight RTC documentation + Evolution times constants
|
2023-09-26 15:01:37 -04:00 |
|
|
GriffinR
|
7cc75eb5b8
|
Merge pull request #1927 from Kurausukun/m4asym
Add Missing Constant Usage in m4a_1
|
2023-09-23 21:49:12 -04:00 |
|
|
GriffinR
|
003d7d7e2e
|
Merge pull request #1923 from SBird1337/bugfix/ability-wild-mons
[BUGFIX] for abilities affecting wild encounter tables
|
2023-09-19 14:47:25 -04:00 |
|
|
GriffinR
|
de3493ff0e
|
Merge pull request #1921 from citrusbolt/blockboxrs
[LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`
|
2023-09-12 18:48:05 -04:00 |
|
|
GriffinR
|
16c0a24683
|
Merge pull request #1922 from AsparagusEduardo/pret/pr2/MrMime
Fixed Mr. Mime capitalization
|
2023-09-12 12:26:34 -04:00 |
|
|
GriffinR
|
4439253f39
|
Add include guards for assembly constants files
|
2023-09-03 20:57:54 -04:00 |
|
|
GriffinR
|
d67914e114
|
Merge pull request #1912 from GriffinRichards/moves-mask
Handful of fixes related to MAX_MON_MOVES
|
2023-08-27 19:40:59 -04:00 |
|
|
GriffinR
|
dcaf03e360
|
Merge pull request #1918 from WhenGryphonsFly/key_intr_enable
Correct KEY_INTR_ENABLE
|
2023-08-27 17:23:16 -04:00 |
|
|
GriffinR
|
843830374c
|
Merge pull request #1916 from grunt-lucas/gbagfx-cc
gbagfx to respect user CC setting
|
2023-08-22 14:57:32 -04:00 |
|
|
GriffinR
|
56ff4ce998
|
Add defines for field effect sprite data, misc task data
|
2023-08-20 17:45:58 -04:00 |
|
|
GriffinR
|
e70577d59b
|
Add missing sizeof in trainer_see
|
2023-08-20 17:22:29 -04:00 |
|
|
GriffinR
|
4941e2602a
|
Merge pull request #1909 from GriffinRichards/stat-anim
Document stat change animation
|
2023-08-20 14:29:11 -04:00 |
|
|
GriffinR
|
6792028254
|
Document title screen task data
|
2023-08-20 01:18:44 -04:00 |
|
|
GriffinR
|
5beec06d9d
|
Document Task_MapNamePopUpWindow
|
2023-08-19 17:20:53 -04:00 |
|
|
GriffinR
|
4f3068406c
|
Merge pull request #1914 from AnonymousRandomPerson/master
Added newer decomp projects to readme
|
2023-08-18 23:45:44 -04:00 |
|