Bivurnum
47723c34e5
Follower NPCs (follow-me) ( #6500 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-27 14:56:18 +02:00
Hedara
9afd8800f3
Merge branch 'upcoming' into merrps-dns
2025-04-12 16:33:02 +02:00
psf
17d851e1f9
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles ( #6456 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 14:59:58 +02:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" ( #6082 )
2025-01-22 21:50:39 +01:00
hedara90
2a8f4b03dc
Revert "Revert map related enum conversion" ( #6079 )
2025-01-22 21:25:24 +01:00
hedara90
2b9c5fe4e7
Revert map related enum conversion ( #6078 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-22 19:37:56 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums ( #6071 )
2025-01-21 21:19:41 +01:00
Eduardo Quezada
d1fc3d7009
Reverted orb effect shadow change
2025-01-19 22:13:08 -03:00
Eduardo Quezada
6162628104
A bit more of addressing
2025-01-17 19:25:29 -03:00
Eduardo Quezada
89f90e1f69
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-03 13:58:10 -03:00
Eduardo Quezada
8cb2f31961
Removed redundant call to FillPalBufferBlack in FRLG whiteout sequence ( #5854 )
2024-12-23 13:51:19 +01:00
Eduardo Quezada
458bd5ad4d
Review changes pt 1
2024-12-05 07:56:49 -03:00
Eduardo Quezada
d1056f887b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-09-30 15:52:49 -03:00
pkmnsnfrn
874d4d0470
Removed switch case per https://github.com/rh-hideout/pokeemerald-expansion/pull/5278\#discussion_r1779197182
2024-09-27 17:19:58 -07:00
pkmnsnfrn
eb1469af1d
added curly braces per https://github.com/rh-hideout/pokeemerald-expansion/pull/5278\#discussion_r1779196726
2024-09-27 17:15:05 -07:00
pkmnsnfrn
796a598549
Combined lines per https://github.com/rh-hideout/pokeemerald-expansion/pull/5278\#discussion_r1779193552
2024-09-27 17:13:17 -07:00
pkmnsnfrn
cf2f85bdd7
Fixed identation per
...
https://github.com/rh-hideout/pokeemerald-expansion/pull/5278\#discussion_r1779192846
https://github.com/rh-hideout/pokeemerald-expansion/pull/5278#discussion_r1779195689
https://github.com/rh-hideout/pokeemerald-expansion/pull/5278#discussion_r1779196484
2024-09-27 17:12:20 -07:00
pkmnsnfrn
04faf370e6
Cleaned up and reordered functions
2024-08-27 20:56:09 -07:00
pkmnsnfrn
fe428fc89b
original merge of branch
2024-08-25 16:46:22 -07:00
Greenphx9
ad969c968c
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
2024-08-25 17:54:28 +10:00
cawtds
3af93bdfee
FRLG+ whiteout message ( #4967 )
...
* FRLG whiteout message + post whiteout event
2024-08-02 08:28:05 -07:00
Ariel A
7cf2d1eca0
Merge branch 'followers' into lighting
2024-02-17 17:51:30 -05:00
Ariel A
afbb88d77a
Undo (most) indentation changes.
2024-02-15 22:24:20 -05:00
Eduardo Quezada
ebbcb7d025
Whitespace, documentation and style
2024-01-22 19:12:52 -03:00
Eduardo Quezada
bf814e11cd
Cleanup
...
- Proper whitespace
- Bracket pret style
- Simplified RemoveObjectEventInternal
- SImplified GetMonInfo
- Made IsFollowerVisible easier to read
2023-06-18 01:19:46 -04:00
ghoulslash
9bf64085ba
fix script context func names
2023-05-21 12:56:15 -04:00
ghoulslash
0585123da9
merge w pret
2023-05-11 10:44:57 -04:00
Ariel A
2ddd292b36
Merge branch 'followers' into lighting
2023-02-10 19:27:23 -05:00
Ariel A
66c57e3442
Merge branch 'master' into followers
2023-01-29 18:44:06 -05:00
GriffinR
0cc10a1ada
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
Ariel A
4bee03bc18
Merge branch 'followers' into lighting
2023-01-03 18:19:19 -05:00
Ariel A
a59564fc1e
Improved follower pokemon animation code.
2023-01-03 18:18:13 -05:00
Ariel A
3a86c8bd4c
Merge branch 'followers' into lighting
2022-10-07 21:08:06 -04:00
Ariel A
1c011a9c1c
Merge branch 'master' into followers
2022-10-07 20:52:15 -04:00
GriffinR
e515e52abb
Add DISPLAY_TILE_* constants
2022-09-26 19:52:17 -04:00
Martin Griffin
d57442a511
Decimal paletteNums
2022-08-19 17:05:22 +01:00
Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01:00
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
ghoulslash
906622f04d
add gExitStairsMovementDisabled
2022-07-29 11:26:21 -04:00
ghoulslash
bed5472014
fix pos2 to x2,y2
2022-07-29 11:18:03 -04:00
ghoulslash
7322166f8b
merge w pret
2022-07-29 11:05:08 -04:00
Ariel A
671fa68410
Merge branch 'romhack' into lighting
2022-07-17 16:07:50 -04:00
Ariel A
9beee311c4
Merge branch 'master' into romhack
2022-07-17 15:13:15 -04:00
Ariel A
6d79b6dbaa
Merge branch 'romhack' into lighting
2022-05-18 20:14:22 -04:00
Ariel A
01f73f54e1
Added follower transform effect and Castform forms. Credit: larryturbo
...
Castform forms from https://www.deviantart.com/larryturbo/art/351-Castform-Froms-830190053
2022-05-18 19:12:30 -04:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
Ariel A
f576556df7
Merge branch 'romhack' into lighting
2022-05-08 01:49:59 -04:00
Ariel A
b5cf90a931
Fixed shadow brightness during orb effect.
2022-05-08 01:49:53 -04:00
Ariel A
e8f3dcaa79
Fixed OrbEffect hanging when follower pokemon is out.
2022-05-08 01:28:12 -04:00
Ariel A
bdcbb5c700
Merge branch 'master' into romhack
2021-12-18 17:14:52 -05:00
