ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 23:23:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,313 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

3306 Commits

Author SHA1 Message Date
LOuroboros
86e322dcea Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-11-01 22:41:31 -03:00
Eduardo Quezada D'Ottone
b8371500d3
Merge pull request #1676 from BuffelSaft/multistrike 
Multi-hit refactor and Parental Bond
 2022-11-01 21:16:04 -03:00
Eduardo Quezada
e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
 2022-10-30 12:30:38 -03: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
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5 
Update for Porymap 5.0.0
 2022-10-30 11:01:37 -04:00
GriffinR
01c71b4ce1 Fix more text and movements labeled as scripts 2022-10-30 03:27:28 -04:00
GriffinR
f439a2dee7 Fix EventScript_WroteSecretCodeLockOpened typo 2022-10-30 03:14:47 -04:00
BuffelSaft
224ca256ce Requested clean up 
Rename constants, remove white space, improve B_BEAT_UP description.

* Rename B_BEAT_UP_DMG to B_BEAT_UP
* Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG
* Remove trailing whitespace
* Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE
 2022-10-27 22:25:33 +13:00
GriffinR
cc182bf05e Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
BuffelSaft
1b056f9044 Fix various Parental Bond issues 
- Dragon Tail and Circle Throw strike twice and then switch the target
- Z moves are unaffected by Parental Bond
- Renamed parentalBondOn to parentalBondState
- Added constants for possible values of parentalBondState
- Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP
 2022-10-23 17:37:23 +13:00
BuffelSaft
6035c5a280 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-10-22 14:31:13 +13:00
GriffinR
a418f8d976
Merge pull request #1755 from GriffinRichards/map-dynamic 
Rename special map constants, treat warp ids as strings
 2022-10-18 22:45:56 -04:00
tustin2121
4730870646 VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY 
Getting rid of the VAR_ prefix, to avoid the porymap problem.
 2022-10-18 21:12:31 -04:00
ghoulslash
a585d56053 fix whitespace 2022-10-16 23:39:12 -04:00
tustin2121
327c648e87 Document seldom-used trigger functionality 
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
 2022-10-16 20:46:50 -04:00
ghoulslash
71023512fd update psycho cut anim 2022-10-16 19:20:24 -04:00
Eduardo Quezada
77f24d42e4 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
 2022-10-07 15:39:02 -03:00
GriffinR
4f407a1066 Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
Eduardo Quezada D'Ottone
17c8842ad4
Merge branch 'dev' into teleport 2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone
a483899043
Merge branch 'dev' into symbiosis 2022-09-24 11:58:35 -03:00
LOuroboros
c64593cb9c Fixed LTBTS's animation 2022-09-24 09:04:15 -03:00
Eduardo Quezada
720cb249d6 Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-16 12:06:06 -03:00
Eduardo Quezada
6b79c7772c Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	src/battle_interface.c
 2022-09-16 11:56:50 -03:00
Eduardo Quezada
77696ca686 Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change 2022-09-16 10:31:02 -03:00
ghoulslash
6616c89451
Merge pull request #2303 from Blackforest92/RHH-PR-Branch 
Tidying graphics - Trio Weather
 2022-09-15 18:01:43 -04:00
Eduardo Quezada
dc423ef7ff Handling repel/lure menu 2022-09-14 00:18:01 -03:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -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
GriffinR
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace 
Cleaned trailing whitespace
 2022-09-13 14:00:11 -04:00
LOuroboros
222362e804 Fixed Raquaza typo 2022-09-12 21:26:22 -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
69f01d73cd Added missing uses of Fairy type for Union Room and Battle Factory 2022-09-11 12:41:56 -04:00
Blackforest92
431cb6fa7c Tidying graphics - Trio Weather 2022-09-09 21:57:40 +07:00
Blackforest92
3acb32acb8 Tyding graphics - Acupressure 2022-09-09 00:25:43 +07:00
Eduardo Quezada D'Ottone
066a5bee85
Merge pull request #2277 from TheXaman/tx_debug_system_rhh 
Inclusion of the tx_debug_system
 2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
LOuroboros
c8f4a44380 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-09-06 20:40:34 -03:00
LOuroboros
8705d1656b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-09-06 20:38:28 -03:00
TheXaman
6062cf45fa
Merge branch 'master' into tx_debug_system_rhh 2022-09-07 00:03:58 +02:00
Eduardo Quezada
3a6318f1d9 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-06 15:20:54 -04:00
Eduardo Quezada
e253a87bc5 Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once. 2022-09-05 14:49:14 -04:00
Eduardo Quezada
7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs 
# Conflicts:
#	src/battle_script_commands.c
 2022-09-05 14:43:04 -04:00
Eduardo Quezada D'Ottone
4017fc3e20
Apply style suggestions from code review 2022-09-03 21:22:15 -04:00
GriffinR
36551dff2f Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
Eduardo Quezada
c7fc2e13f7 Renamed TM flags to keep consistency with the rest of the repo 2022-09-02 16:54:58 -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