ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-20 10:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,461 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

6688 Commits

Author SHA1 Message Date
W1serV1ser
66faa6aa15 Follow Me/Rage Powder effect on target goes away once affected by Sky Drop 2022-01-04 12:33:31 -08:00
GriffinR
ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -05:00
sphericalice
48bf1ab98d
Use SPECIES_NONE and ITEM_NONE in battle_tower.c 2022-01-04 13:46:46 +00:00
sphericalice
2d536bf560
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu 2022-01-02 21:02:53 +00:00
Eduardo Quezada D'Ottone
d433d67558 Extrapolated Assist forbidden flags to Gen 8 moves 2022-01-01 20:21:29 -03:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup 
Ability Popup Fixes + Longer Ability Names config
 2022-01-01 19:39:55 -03:00
sphericalice
61a0036c47
Clarify ScrollableMultichoice_ProcessInput comment 2021-12-31 17:34:46 +00:00
sphericalice
9e660b2cdf
Update src/field_specials.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-12-31 16:29:11 +00:00
sphericalice
4f6323606f
Update field_specials.c to match the style 2021-12-31 16:24:44 +00:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
sphericalice
50522fdea4
Remove some magic numbers from TryPushBoulder 2021-12-30 12:21:47 +00:00
LOuroboros
34c6e6ca31
Update battle_ai_util.c 2021-12-30 01:48:56 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles 
Multi battle updates
 2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone
ba43280a7c Refactored Instruct to use the regular forbidden move lookup table 2021-12-29 21:04:15 -03:00
GriffinR
4192a40adf
Merge pull request #1583 from GriffinRichards/renametilemaps 
Give less generic names to some tilemaps, some misc fixes
 2021-12-29 00:57:37 -05:00
GriffinR
aadab8b016 Move pokemon and easy chat constants to global, misc clean-up 2021-12-28 18:07:41 -05:00
GriffinR
aba5264260 RGB macro use in slot_machine 2021-12-28 17:46:05 -05:00
GriffinR
4fc345fff5 Rename unused frontier pass tilemap 2021-12-28 14:54:09 -05:00
GriffinR
3acf002a9c Rename generic jp contest tilemaps 2021-12-28 13:16:40 -05:00
LOuroboros
cc1a243145
Update src/battle_script_commands.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-12-28 12:18:44 -03:00
GriffinR
ee5e65d9ed Rename generic title screen tilemaps 2021-12-28 03:57:44 -05:00
W1serV1ser
e0f7e7a2d9 Updated variable name in MOVEEND_SKY_DROP_CONFUSE 2021-12-27 12:10:38 -08:00
Eduardo Quezada D'Ottone
4d6f54e8d6
Merge pull request #2007 from ghoulslash/be/roleplay 
Update Role Play
 2021-12-25 11:37:57 -03:00
LOuroboros
599ca58059
Update main_menu.c 2021-12-25 07:04:19 -03:00
Eduardo Quezada D'Ottone
7bffe6d1d5
Merge pull request #2004 from ghoulslash/be/sports 
Add sport effects back
 2021-12-24 18:59:50 -03:00
LOuroboros
03205c995d
Update battle_script_commands.c 2021-12-24 01:59:40 -03:00
Eduardo Quezada D'Ottone
2ebe427a42 Merge branch 'BattleEngine' into BE_wildNaturalEnemies 
# Conflicts:
#	src/battle_controller_opponent.c
 2021-12-23 21:19:59 -03:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine 2021-12-23 15:29:10 -08:00
W1serV1ser
58a5a9cbec Simplified skyDropTargets storage and made other minor improvements 
A lot of these changes are based on ghoulslash's version of Sky Drop.
 2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone
a725592a6b
Merge pull request #1999 from ghoulslash/be/moveeffect 
More battle-will-end checks on stat-changing damaging effects
 2021-12-23 20:23:16 -03:00
Eduardo Quezada D'Ottone
67697d2de3
Merge pull request #1582 from ghoulslash/smart_wild_ai 
Smart Wild AI Option
 2021-12-23 20:18:18 -03:00
ghoulslash
0a95a31ee9 fix formatting 2021-12-23 08:44:54 -05:00
ghoulslash
b6b5d862f4 update role play mechanics 2021-12-23 08:37:11 -05:00
LOuroboros
d94dae18f7 Removed more commented out addresses 
I like to help.
 2021-12-21 22:49:30 -03:00
ghoulslash
4b5c5d14fc
Merge pull request #1989 from AsparagusEduardo/BE_debugHoldEffects 
Updated AI debug hold effect name display.
 2021-12-20 14:07:29 -05:00
ghoulslash
78b42fabef
Merge pull request #2001 from AsparagusEduardo/BE_debugDoc 
Using TAG_NONE in battle debug
 2021-12-20 14:06:59 -05:00
LOuroboros
cb44de13b3 B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT 2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports 2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone
a57043b589
Merge pull request #1983 from sphericalice/last_ball_refactor 
Refactor CanThrowLastUsedBall and related functions
 2021-12-19 20:21:50 -03:00
Eduardo Quezada D'Ottone
6d17156f74
Merge pull request #1934 from BuffelSaft/fix-burmy 
Fix Burmy form change
 2021-12-19 20:18:19 -03:00
LOuroboros
ffe35fbb06 Updated defeat condition on multi battles 2021-12-19 08:30:43 -03:00
Eduardo Quezada D'Ottone
4ca9f406f6
Merge pull request #1947 from LOuroboros/lightBall 
Updated Light Ball's effect and improved readability
 2021-12-18 15:03:18 -03:00
Eduardo Quezada D'Ottone
3a24bc8298
Merge branch 'battle_engine' into DizzyEggg-patch-1 2021-12-18 14:52:19 -03:00
Eduardo Quezada D'Ottone
1772997082
Merge pull request #1994 from AsparagusEduardo/BE_HPDrain 
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
 2021-12-18 13:50:05 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy 2021-12-18 13:38:12 -03:00
Eduardo Quezada D'Ottone
bd75ee9688 Using TAG_NONE in battle debug 2021-12-18 10:55:04 -03:00
LOuroboros
4a74d288d4 Review corrections 2021-12-18 00:01:50 -03:00
LOuroboros
dbca24aa82 [LEAK INFORMED] Documented the unk19 item field 2021-12-17 19:41:39 -03:00
ultima-soul
84ce9745d5
Merge pull request #1990 from AsparagusEduardo/BE_debugArrows 
Improved battle debug number value changing
 2021-12-17 09:21:04 -08:00
ghoulslash
31bbc4ddde prevent stat-raising damage effects if battle will end 2021-12-17 10:24:07 -05:00