3283 Commits

Author SHA1 Message Date
Ariel A
0f706ac9e0 Merge branch 'followers' into followers-expanded-id 2024-10-21 00:05:26 -04:00
Ariel A
4056804575 feat: improved follower handling during scripted movements 2024-10-20 23:55:05 -04:00
GriffinR
0eb6d1d74c Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants 2024-10-15 22:04:45 -04:00
GriffinR
da9c0239d9 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-10-15 22:02:40 -04:00
luckytyphlosion
a55c75d350
Get rid of common syms (#2040) 2024-10-14 23:52:11 -04:00
GriffinR
a0be2cbf7b Fix Fallorbor typo 2024-10-12 23:50:12 -04:00
GriffinR
f61c0099b9 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-12 23:34:02 -04:00
Ariel A
e10005010e Merge branch 'followers' into followers-expanded-id 2024-10-12 12:27:05 -04:00
Ariel A
d80190fe10 fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh 2024-10-12 12:23:18 -04:00
GriffinR
a2a3255bdd Fix typo, remove old size check 2024-10-12 03:30:35 -04:00
GriffinR
9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
GriffinR
091b7269df
Move heal locations data to their associated map.json (#2034) 2024-10-11 15:15:55 -04:00
GriffinR
a551efea43 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-09-19 12:33:34 -04:00
GriffinR
e4e90eacd6
Merge pull request #2023 from Bassoonian/updatemapmacros
Fix defines in MAP_NUM and MAP_GROUP
2024-09-19 12:17:16 -04:00
Kurausukun
52c2728ff6 remove gflib 2024-09-18 10:37:34 -04:00
DizzyEggg
c4b5818d98
remove ScriptContext_Enable from secret_base.h 2024-09-14 19:13:02 +02:00
Ariel A
d3a4839808 meta: included COLOR_MAP constants in field_effect_script. Credit: SDH 2024-09-08 16:02:51 -04:00
Ariel A
8795c15ab9 feat: Allowed custom COLOR_MAP_* in field_effect_scripts. Credit: SDH 2024-09-01 17:22:44 -04:00
Ariel A
42d9f24c84 feat: added OW_MON_WANDER_WALK config option 2024-09-01 17:17:24 -04:00
Ariel A
839cf2e790 feat: static OW pokemon now bob while walking in place (per OW_MON_BOBBING) 2024-09-01 15:31:12 -04:00
Icedude907
625a006cab
[Build System Rewrite] mapjson now takes output directory parameters. (#1949) 2024-08-29 14:01:01 -04:00
GriffinR
7532f8ddb8 Revert MB name changes 2024-08-28 11:19:27 -04:00
psf
113226b03a
Change metatile behaviors to enum (#2027) 2024-08-28 00:45:09 -04:00
Martin Griffin
56d3faa32f
Merge pull request #2025 from Bassoonian/cleandefinespaces
Clean up defines lacking spaces
2024-08-21 19:04:12 +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
Bassoonian
5fefd743a2 Fix defines in MAP_NUM and MAP_GROUP 2024-08-14 13:02:40 +02:00
GriffinR
a3d5f54b75 Fix type for offset in MapConnection 2024-08-13 19:10:24 +02:00
Ariel A
3abf4871fd Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-08-12 23:13:02 -04:00
Ariel A
8a8c27c6c7 Merge branch 'lighting' into lighting-expanded-id 2024-08-12 23:11:27 -04:00
Ariel A
0745eaf2e0 fix: Uninitialized value used in LightenSpritePaletteInFog 2024-08-12 22:42:31 -04:00
Eduardo Quezada
e6e2285c44 Added OBJ_EVENT_GFX_SPECIES_SHINY 2024-08-11 14:50:38 -04:00
Eduardo Quezada
d88834dd58 Backported OBJ_EVENT_GFX_SPECIES macro from Expansion 2024-08-07 13:42:18 -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
pkmnsnfrn
0fb48e8a9a Fixed expanded OW IDs 2024-08-03 17:04:33 -07:00
pkmnsnfrn
91b48a10d4 Added constant for NUM_SNOWFLAKE_SPRITES 2024-07-26 21:57:42 -07:00
Bassoonian
367f6dc8fd Address concerns 2024-07-13 18:01:54 +02:00
Bassoonian
003bd54600 Rename battle terrain to environment 2024-07-13 12:02:18 +02:00
Ariel A
d6762d4dbc Merge branch 'lighting' into lighting-expanded-id 2024-06-01 15:22:21 -04:00
Ariel A
d410ca6999 Merge branch 'followers' into lighting 2024-06-01 15:21:57 -04:00
Ariel A
e420f99fc3 Merge branch 'followers' into followers-expanded-id 2024-06-01 15:20:56 -04:00
Ariel A
3727be9511 fix: fixed a few oversights with follower message generation 2024-06-01 14:46:45 -04:00
sneed
b592c6eae5 Add POKE_ICON_BASE_PAL_TAG to a header 2024-05-23 02:45:22 +03:00
Ariel A
ed98b0b8ba fix: added shadows on direct corner map
Fixed #18
2024-05-21 22:12:03 -04:00
Ariel A
991b104d52 Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-05-17 21:45:44 -04:00
Ariel A
05bf03975a Merge branch 'followers' into lighting 2024-05-17 21:40:20 -04:00
Ariel A
d785fad8cf refactor: code review for expansion 2024-05-17 21:37:18 -04:00
Ariel A
d3849f2fc6 Merge branch 'followers' into followers-expanded-id 2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610 refactor: code review for expansion 2024-05-17 20:45:32 -04:00
Ariel A
3c9c48e2a1 Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-04-28 20:39:39 -04:00