Ariel A
|
beb282a359
|
Added movements/scripts for overworld follower field moves.
|
2023-01-03 18:18:09 -05:00 |
|
Eduardo Quezada
|
3172273c73
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures
# Conflicts:
# src/pokemon.c
|
2022-10-30 12:16:09 -03:00 |
|
Ariel A
|
5d9e9d3e0e
|
Fixed some follower movements.
|
2022-10-22 18:50:27 -04:00 |
|
ghoulslash
|
4775e0372a
|
merge w pret
|
2022-10-17 09:06:27 -04:00 |
|
Ariel A
|
1c011a9c1c
|
Merge branch 'master' into followers
|
2022-10-07 20:52:15 -04:00 |
|
Eduardo Quezada
|
dc423ef7ff
|
Handling repel/lure menu
|
2022-09-14 00:18:01 -03:00 |
|
Eduardo Quezada
|
1d7e8bd730
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
|
2022-09-13 16:22:42 -03:00 |
|
Eduardo Quezada
|
e3005e5275
|
Item config for repel prompt
|
2022-09-12 10:21:52 -03:00 |
|
Eduardo Quezada
|
2d78ac0192
|
Implemented Lures using the same vars as repels
|
2022-09-12 10:21:49 -03:00 |
|
Deokishisu
|
e3c19f5df5
|
Implement B2W2 Repel System
The game now asks if the player would like to use another Repel when the one they used runs out.
# Conflicts:
# include/constants/vars.h
|
2022-09-12 10:21:38 -03:00 |
|
Eduardo Quezada
|
65108c3192
|
Cleaned trailing whitespace
|
2022-09-11 14:14:49 -04:00 |
|
Eduardo Quezada D'Ottone
|
4017fc3e20
|
Apply style suggestions from code review
|
2022-09-03 21:22:15 -04:00 |
|
TheXaman
|
b4b3e84cbd
|
removed default flags and added ingame warning if a function that requires them is used
|
2022-09-02 18:39:38 +02:00 |
|
TheXaman
|
ad57551db1
|
removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation
|
2022-09-02 12:10:11 +02:00 |
|
TheXaman
|
8c9a59ec1c
|
Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh
|
2022-08-29 19:13:11 +02:00 |
|
Ariel A
|
8c60050553
|
Added proper movement actions for exiting/entering pokeball.
|
2022-08-28 23:34:39 -04:00 |
|
crater-git
|
ed02c4b425
|
Removed tutor move distinction, combined llists
|
2022-08-25 19:56:47 -04:00 |
|
Eduardo Quezada
|
afcc1178b2
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
|
2022-08-22 20:30:45 -04:00 |
|
Ariel A
|
37ca4a6ceb
|
Made talking to defeated trainers follower-safe.
|
2022-08-16 19:59:14 -04:00 |
|
Eduardo Quezada
|
63e4a8adcd
|
Fixed instances of .string being used with spaces instead of tabs
|
2022-08-15 14:32:01 -04:00 |
|
ghoulslash
|
deddda451b
|
merge w pret
|
2022-07-30 18:35:41 -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 |
|
ghoulslash
|
8461ea7c16
|
merge rock climb
|
2021-12-20 12:59:06 -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 |
|
ghoulslash
|
6f6ed0a25c
|
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
|
2021-11-28 15:01:19 -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 |
|