Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,712 Commits 1 Branch 0 Tags
Commit Graph

508 Commits

Author SHA1 Message Date
Eduardo Quezada
63e4a8adcd Fixed instances of .string being used with spaces instead of tabs 2022-08-15 14:32:01 -04:00
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
Ariel A
9beee311c4 Merge branch 'master' into romhack 2022-07-17 15:13:15 -04:00
Ariel A
11a7aa1ec8 Made cutting trees follower-safe. 2022-05-29 01:45:03 -04:00
TheXaman
cbe8f30001 added FLAG_ADVENTURE_STARTED to cheat start 2022-05-21 12:54:02 +02:00
Ariel A
4236f18f2d Fixed follower bugs when returning from a battle facility challenge. 2022-05-20 00:18:41 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
Ariel A
ec756d3d12 Fixed object events not being unfrozen after using Flash. 2022-05-17 00:33:37 -04:00
Eduardo Quezada
21d8c8e9c5 Using follower's nickname instead of ther species name. 2022-05-13 21:22:25 -04:00
Ariel A
831c73c18c Added system for conditional follower messages. 2022-05-03 23:01:02 -04:00
TheXaman
c54bf21b01 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2022-04-16 23:18:35 +02:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
cbt6
f826a5a82d Use constants for PC locations 2022-02-23 15:07:22 +08:00
GriffinR
a7e6045d71
Merge pull request #1597 from GriffinRichards/misc-cleanup 
Miscellaneous fixes
 2022-01-19 22:17:37 -05:00
GriffinR
110fbc559c Make item optional for givemon and setwildbattle 2022-01-11 02:08:14 -05:00
GriffinR
8b920691e6 Fix FLAG_DECORATION_0 name 2022-01-09 01:31:42 -05:00
Ariel A
cf673fda9f Added movements to follower messages. Movement credit: SonikkuA-DatH 2021-12-31 19:23:44 -05:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
Ariel A
c29516bc2f Fixed bug with follower update after the party was healed. Credit: Jaizu 2021-12-22 22:14:28 -05:00
Ariel A
bdcbb5c700 Merge branch 'master' into romhack 2021-12-18 17:14:52 -05:00
ultima-soul
4f2e3bf214 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 21:23:54 -08:00
Ariel A
c7593af215 Fixed bug where follower did not update after depositing in daycare. 2021-12-16 21:26:50 -05:00
GriffinR
42a83ee50e Use STR_VAR names for apprentice_buff and frontier_gettrainername 2021-11-18 23:20:05 -05:00
GriffinR
e66ea0cb99 Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
GriffinR
6c6487dd7a Missing spaces to tabs in scripts files 2021-11-18 21:02:22 -05:00
TheXaman
2f8896f2f0 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2021-11-18 15:13:04 +01:00
GriffinR
c89dfd9f56 Finish updating macro comments 2021-11-18 01:47:58 -05:00
GriffinR
c4f8f4d11a Add STR_VAR_# ids to string buffer macros 2021-11-17 22:00:44 -05:00
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR
61aa9c3ba9 More updating event macro comments 2021-11-16 17:46:34 -05:00
GriffinR
d414787932 Some TV clean-up 2021-11-16 16:22:17 -05:00
GriffinR
5d9c31a610 Label slot machine ids, fix GetPriceReduction 2021-11-16 15:43:52 -05:00
GriffinR
63c5905914 Continue updating event macro comments 2021-11-16 13:10:23 -05:00
GriffinR
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
GriffinR
65d3b58374 Add PARTY_NOTHING_CHOSEN 2021-11-15 10:57:06 -05:00
GriffinR
f85de6eca5 Start event macro comment updates 2021-11-15 10:54:57 -05:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata 
Clean up sound, add CRY_MODE constants
 2021-11-13 15:54:40 -05:00
GriffinR
54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
cbt6
32aaf6912f Rename movement scripts to use Faster over Fastest 2021-11-05 02:22:28 +08:00
GriffinR
fbf3bf2ce8 Replace 'mystery_event_club' 2021-10-26 22:43:56 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random 
Document random remaining symbols
 2021-10-24 23:43:17 -04:00
GriffinR
db8ce5d7f9 Clean up mauville_old_man, drop ScrSpecial prefix 2021-10-18 01:09:41 -04:00
GriffinR
ece7ef3410 Correct usage of MysteryEvent to MysteryGift 2021-10-17 03:00:48 -04:00
GriffinR
845a5e99cc General mystery gift documentation, finish mystery gift client/server/scripts 2021-10-16 23:35:17 -04:00
GriffinR
c02001c46d Document mystery gift link scripts, general mystery gift 2021-10-15 12:05:06 -04:00
Ariel Antonitis
8a3b04e837 Merge branch 'master' into romhack 2021-09-02 01:03:13 -04:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
ultima-soul
988320b89a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:25:13 -07:00
LOuroboros
b4c4650186 Corrected inconsistent flag label spelling 2021-08-05 17:26:03 -03:00
GriffinR
06351bf63c Remove address comments 2021-07-20 15:18:31 -04:00