Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,942 Commits 1 Branch 0 Tags
7622d84a4fa402f65daf6507c5344fa814dd4b5a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone 7622d84a4f Revert "Removed Unown hack" 2023-01-07 11:39:56 -03:00
Eduardo Quezada D'Ottone 34d27eca0e Merge pull request #2457 from AsparagusEduardo/RHH/pr/cleanup/unown 
Removed Unown hack
 2023-01-04 18:57:28 -03:00
Eduardo Quezada D'Ottone 11c3e9c7f8 Merge pull request #2318 from AsparagusEduardo/RHH/pr/palleteConversion2 
Gen 1-5 Palette Conversion Redemption
 2023-01-04 18:03:07 -03:00
Eduardo Quezada 74d8c587fe Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown 
# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/front_pic_anims.h
 2023-01-04 17:58:54 -03:00
Eduardo Quezada 55be15f690 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/config/pokemon.h
 2023-01-04 16:19:57 -03:00
Eduardo Quezada ada47831aa Fixed reusable repels/lures function forcefully using items while menu config is on 2023-01-04 00:00:13 -03:00
Eduardo Quezada D'Ottone 41d846c74c Merge pull request #2551 from ghoulslash/be/frontier_bp 
Reshape sBattlePointAwards to be easier to read
 2023-01-03 21:48:08 -03:00
Eduardo Quezada b897b7787e Applied bugfix from upstream 2023-01-03 15:41:03 -03:00
Eduardo Quezada e0802f13a2 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103 
# Conflicts:
#	include/link_rfu.h
 2023-01-03 15:40:33 -03:00
Eduardo Quezada D'Ottone 10bfc2a91f Merge pull request #2557 from LOuroboros/patch-1 
Updated HOLD_EFFECT_ZOOM_LENS check
 2023-01-03 06:43:29 -03:00
Eduardo Quezada D'Ottone 682bcd4554 Merge pull request #2548 from LOuroboros/clearBody 
Made Clear Body and similar abilities be normally affected by their own stat stage reductions
 2023-01-01 11:37:11 -03:00
Eduardo Quezada 965e2c3394 Newline fix 2023-01-01 10:31:09 -03:00
Eduardo Quezada D'Ottone a3411d0771 Merge pull request #2545 from Bassoonian/gen9moves 
Fix faulty gBaseStats reference
 2022-12-30 22:58:50 -03:00
Eduardo Quezada D'Ottone 0e1836d42b Merge pull request #2106 from Sneed69/PartyBattlerShouldAvoidHazards 
PartyBattlerShouldAvoidHazards rewrite
 2022-12-30 17:55:53 -03:00
Eduardo Quezada D'Ottone 2d222ad0a9 Merge pull request #2544 from LOuroboros/miscs 
Applied minor tweaks
 2022-12-30 17:51:55 -03:00
Eduardo Quezada D'Ottone 4dc72dcfc1 Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2 
Implementing Teatime effect
 2022-12-30 17:49:54 -03:00
Eduardo Quezada 1fc86e52b5 Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+ 2022-12-27 21:18:20 -03:00
Eduardo Quezada 95f39c8c81 Config to restore Gen 3's damage reduction to multi target moves 2022-12-27 15:24:43 -03:00
Eduardo Quezada D'Ottone d120f2f183 Merge pull request #2541 from sphericalice/beat-up 
Fix Beat Up's battle script to avoid an out-of-bounds array access
 2022-12-27 13:32:05 -03:00
Eduardo Quezada b0127428c6 Review suggestions. 2022-12-27 00:04:46 -03:00
Eduardo Quezada 701179eb1f Documented missing use of SPRITE_ARR_ID_MOVE_SELECTOR1 2022-12-26 21:05:18 -03:00
Eduardo Quezada D'Ottone 263ed33755 Fixed Eggs sometimes reading garbage graphic data. 2022-12-26 11:56:27 -03:00
Eduardo Quezada D'Ottone b74997f82e Merge pull request #2538 from LOuroboros/intimidate 
Fixed some issues of the Intimidate's rework
 2022-12-26 08:10:25 -03:00
Eduardo Quezada d103025527 Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/config/pokemon.h
 2022-12-22 10:30:01 -03:00
Eduardo Quezada D'Ottone da535fc8f1 Merge pull request #2530 from mrgriffin/rhh-setroost-cleanup 
Minor Roost fixes/cleanup
 2022-12-21 17:04:14 -03:00
Eduardo Quezada D'Ottone 341d2abdd6 Merge pull request #2533 from ghoulslash/be/aifix 
Fix Helping Hand AI
 2022-12-21 16:17:52 -03:00
Eduardo Quezada D'Ottone 42d2bee519 Merge pull request #2527 from mrgriffin/rhh-cleanup-handle-terrain-move 
Cleanup HandleTerrainMove
 2022-12-21 12:21:46 -03:00
Eduardo Quezada bd7d949f5f Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set 2022-12-18 13:49:02 -03:00
Eduardo Quezada 55ba9d8364 Fixed right Frontier move tutor not loading their move list correctly. 2022-12-18 13:17:33 -03:00
Eduardo Quezada D'Ottone 892fa1bc55 Merge pull request #2524 from LOuroboros/patch-1 
Removed repeated stat change defines
 2022-12-18 10:42:28 -03:00
Eduardo Quezada 66d1c9bc65 Documenting padding in structs used by Saveblocks 2022-12-17 22:55:43 -03:00
Eduardo Quezada D'Ottone f6a89c9cc8 Merge pull request #2520 from LOuroboros/patch-1 
Updated ENDTURN_PLASMA_FISTS
 2022-12-17 12:14:07 -03:00
Eduardo Quezada D'Ottone 937f5acc84 Merge pull request #2519 from AsparagusEduardo/RHH/pr/sync/pret_20221216 
I'll make your face the greatest in Hoenn! Or else you will DIE. (Pret merge 2022/12/16)
 2022-12-16 21:06:38 -03:00
Eduardo Quezada c03f354dca Finished cleaning up the animations to the new standard 2022-12-16 20:58:41 -03:00
Eduardo Quezada 6a57dcdc4c Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216 
# Conflicts:
#	src/data.c
#	src/data/pokemon_graphics/front_pic_anims.h
 2022-12-16 19:19:23 -03:00
Eduardo Quezada D'Ottone 0dca5a5230 Merge pull request #2516 from LOuroboros/patch-1 
Updated SetMoveEffect
 2022-12-15 18:10:08 -03:00
Eduardo Quezada D'Ottone 79a753efcc Merge pull request #2518 from LOuroboros/bSides 
Updated SIDE constant usages
 2022-12-15 18:09:37 -03:00
Eduardo Quezada 1290a9411d Reorganized SpecialStatus struct to minimize padding. 2022-12-12 00:37:00 -03:00
Eduardo Quezada D'Ottone db32032781 Merge pull request #2475 from Bassoonian/gen9moves 
Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon
 2022-12-11 18:39:25 -03:00
Eduardo Quezada 2f96344cd9 Removed ANIM_CMD macro from unused_anims.h 2022-12-10 11:46:41 -03:00
Eduardo Quezada D'Ottone 3718f58a0a Merge pull request #2469 from LOuroboros/patch-1 
Updated TryChangeBattleTerrain
 2022-12-05 23:40:52 -03:00
Eduardo Quezada 2d694a84e3 Trying to fix remote reference 2022-12-05 21:57:28 -03:00
Eduardo Quezada D'Ottone 63310df7c6 Merge pull request #2468 from LOuroboros/patch-1 
Update INSTALL.md
 2022-12-04 20:57:29 -03:00
Eduardo Quezada D'Ottone 14e35a4831 Merge pull request #2466 from ghoulslash/be/slidefix 
Set battler before BattleScript_TrainerSlideMsgRet
 2022-11-29 22:22:19 -03:00
Eduardo Quezada D'Ottone 816bc46694 Merge pull request #2456 from AsparagusEduardo/RHH/pr/sync/pretmerge_20221124 
Gen 9 when? (Pret sync 2022/11/24)
 2022-11-29 17:46:16 -03:00
Eduardo Quezada 9d1149c423 Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	src/pokemon.c
 2022-11-29 17:40:09 -03:00
Eduardo Quezada D'Ottone 7ab3d37a7c Merge pull request #2464 from ghoulslash/be/callnative 
add callnative bs func, convert metal burst dmg calc
 2022-11-28 16:16:04 -03:00
Eduardo Quezada 65a33ed442 Fix cry table alignment due to missing placeholder Enamorus Therian cry 2022-11-26 09:20:54 -03:00
Eduardo Quezada 4bac880042 Removed Unown hack 2022-11-25 16:55:53 -03:00
Eduardo Quezada e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2022-11-24 15:36:00 -03:00
Eduardo Quezada D'Ottone b48f057fe7 Merge pull request #1589 from cynderquil/pokemon_expansion 
Fix Bastiodon's second icon frame
 2022-11-20 20:47:07 -03:00
Eduardo Quezada 791c547b2c Renamed missing overworld debug configs 2022-11-14 14:07:32 -03:00
Eduardo Quezada 540f4679bb Implemented uses of Shiny config 2022-11-14 11:56:02 -03:00
Eduardo Quezada 011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
Eduardo Quezada D'Ottone 49b7328d32 Merge pull request #2451 from eatthepear/patch-1 
Fix Berries that were broken after Bug Bite fix
 2022-11-12 17:26:29 -03:00
Eduardo Quezada D'Ottone 6197e76875 Merge pull request #2449 from LOuroboros/patch-1 
Uncommented level up moves
 2022-11-11 01:46:42 -03:00
Eduardo Quezada D'Ottone a2b355f2a4 Merge pull request #2422 from AsparagusEduardo/RHH/pr/sync/pretmerge_20221030 
Support for Porymap 5.0.0 (pret merge 2022-10-30)
 2022-11-09 20:15:15 -03:00
Eduardo Quezada f2d0e547ac Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/rom_header_gf.c
 2022-11-09 19:54:44 -03:00
Eduardo Quezada bd63ef18af Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/pokemon_storage_system.c
 2022-11-09 19:33:26 -03:00
Eduardo Quezada D'Ottone e6ae0bd01e Merge pull request #2434 from LOuroboros/badDreams 
Optimized Bad Dreams' code
 2022-11-08 08:16:07 -03:00
Eduardo Quezada 237877e21b Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System 2022-11-07 00:00:23 -03:00
Eduardo Quezada D'Ottone fa8bf80905 Merge pull request #2420 from LOuroboros/teleport 
Updated CanTeleport
 2022-11-04 12:40:25 -03:00
Eduardo Quezada D'Ottone 2b5aff2764 Merge pull request #2426 from tustin2121-2/patch-linker 
GF Header and Modern Builds
 2022-11-04 12:27:13 -03:00
Eduardo Quezada 5b1552514e Review changes 2022-11-04 11:10:06 -03:00
Eduardo Quezada 8c66b318eb Fixed Bad Dream's ability popup message 2022-11-04 00:46:07 -03:00
Eduardo Quezada d23b5c95c9 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations 
# Conflicts:
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/pokemon.c
 2022-11-03 23:31:20 -03:00
Eduardo Quezada fbc71b3686 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-11-03 21:46:37 -03:00
Eduardo Quezada edf4e45c4d Config for Dark Void being only usable by Darkrai 2022-11-03 21:36:12 -03:00
Eduardo Quezada D'Ottone 9ea3ad8938 Merge pull request #2427 from BuffelSaft/fix-stat-boost-on-hit 
Fix abilities that raise target's stat after hit
 2022-11-03 08:50:18 -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 D'Ottone ebc9fc31d2 Merge pull request #2416 from DizzyEggg/fix_palace 
Fix battle palace bug
 2022-11-01 12:16:55 -03:00
Eduardo Quezada D'Ottone 9d64c838cf Merge pull request #2424 from LOuroboros/getItemId 
Actually removed ItemId_GetId
 2022-10-31 07:15:25 -03:00
Eduardo Quezada D'Ottone dc4c5757f6 Merge pull request #2423 from LOuroboros/debugPCFlag 
Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config
 2022-10-31 07:14:48 -03:00
Eduardo Quezada 14e85249d1 Review changes 2022-10-30 17:12:13 -03:00
Eduardo Quezada d02fc43703 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-10-30 13:38:25 -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
Eduardo Quezada 85c0d2dac8 Review changes 2022-10-27 11:26:09 -03:00
Eduardo Quezada D'Ottone 93dd8786ee Merge pull request #2413 from kaisermg5/fix_tmhm_lock 
Fix lock when teaching a TM/HM after learning a move by level up.
 2022-10-26 22:27:19 -03:00
Eduardo Quezada 85ce30b1d6 Created macros for Bard Sounds 2022-10-25 14:33:02 -03:00
Eduardo Quezada 3ed485632f Renamed gBaseStats to gSpeciesInfo 2022-10-24 17:01:48 -03:00
Eduardo Quezada D'Ottone 449f4c0caa Merge pull request #2408 from LOuroboros/patch-1 
Fixed CanFling
 2022-10-22 10:46:11 -03:00
Eduardo Quezada D'Ottone 18e7fc5efc Introduce NUM_BATTLE_SIDES 2022-10-20 08:41:18 -03:00
Eduardo Quezada D'Ottone c57ab9e529 Merge pull request #2392 from gruxor/wait-fix 
Replaced busy-wait loops
 2022-10-17 15:34:22 -03:00
Eduardo Quezada D'Ottone ffc5ffcfe5 Merge pull request #2390 from ghoulslash/be/psychocut 
Improve psycho cut anim
 2022-10-17 00:41:01 -03:00
Eduardo Quezada D'Ottone 1607291982 Implemented Honey's Sweet Scent functionality 2022-10-16 20:20:13 -03:00
Eduardo Quezada D'Ottone dd2d6107bd Fixed Z-Move not being cleared if Pokémon faints 2022-10-16 09:57:21 -03:00
Eduardo Quezada D'Ottone 4cbc6d4de1 Config for running indoors 2022-10-14 22:31:45 -03:00
Eduardo Quezada D'Ottone 068422bc3f Merge pull request #2386 from LOuroboros/patch-1 
Uncommented evo moves for each species
 2022-10-14 12:00:56 -03:00
Eduardo Quezada D'Ottone 71dad6aec9 Merge pull request #2384 from May8th1995/confuseAI 
Fix AI issue giving decrementing score to confuse hit instead of confuse
 2022-10-13 12:16:00 -03:00
Eduardo Quezada D'Ottone 839d7063fe Merge pull request #2383 from May8th1995/badgeFlagBug 
Fix bug where badge boosts apply in all gens but gen 3.
 2022-10-13 11:45:18 -03:00
Eduardo Quezada D'Ottone 2ce340e8e1 Merge pull request #2262 from LOuroboros/becomingAHero 
Fixed Mega Evolved Pokémon being able to get Friendship effects in battle
 2022-10-07 18:27:29 -03:00
Eduardo Quezada 8ea060044a Battle text pauses config 2022-10-07 17:22:29 -03:00
Eduardo Quezada 044898fe95 Documented missing gSoftResetDisabled uses 2022-10-07 15:56:00 -03:00
Eduardo Quezada 453da8aa8c Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID 2022-10-07 15:49:00 -03:00
Eduardo Quezada 44754f8ca7 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/constants/pokemon_config.h
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon_icon.c
 2022-10-07 15:27:16 -03:00
Eduardo Quezada 2a8048b677 Removed ItemId_GetId like in upstream 2022-10-07 14:53:58 -03:00
Eduardo Quezada 68b474c0f0 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007 
# Conflicts:
#	include/constants/items.h
#	src/battle_interface.c
 2022-10-07 14:52:32 -03:00
Eduardo Quezada 9b977486fe Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2022-10-07 14:05:45 -03:00
Eduardo Quezada a20334f79a Removed unused functions in item header 2022-10-04 22:06:07 -03:00