ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-29 13:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,684 Commits 1 Branch 0 Tags 235 MiB
57e2de092b
Commit Graph

9684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LOuroboros
ce5aba16f6 Removed global and unused IsPinchBerryItemEffect 2022-07-05 18:24:50 -03:00
ghoulslash
fc81b4cac6 fix GetAiLogicData logic 2022-07-05 13:19:03 -04:00
GriffinR
76659a4091
Merge pull request #1700 from mrgriffin/battle-setup-water-transition 
Simplify GetBattleTransitionTypeByMap
 2022-07-05 11:10:16 -04:00
Martin Griffin
c9958e3087 Simplify GetBattleTransitionTypeByMap 2022-07-05 14:17:46 +01:00
GriffinR
8231ea2b68
Merge pull request #1699 from mrgriffin/field-camera-mod-16 
Identify a % 16
 2022-07-04 16:31:37 -04:00
Martin Griffin
4e76ffb4ca Identify a % 16 2022-07-04 21:25:19 +01:00
BuffelSaft
ead52e0b48
Merge pull request #2036 from ghoulslash/be/ai 
AI Optimizations
 2022-07-04 23:16:08 +12:00
ghoulslash
3f739a8f3b AI_CalcDamage returns 0 for status moves 2022-07-03 17:23:59 -04:00
ghoulslash
57e110aa6a fix AI_GetEffectiveness declaration 2022-07-03 17:20:39 -04:00
ghoulslash
f0edbeb0b0 minor format fix 2022-07-03 16:31:00 -04:00
ghoulslash
fac6f21ed0 AI_EFFECTIVENESS_xY are enums 2022-07-03 16:28:34 -04:00
ghoulslash
e4bf99d777 merge w be 2022-07-03 16:20:05 -04:00
ghoulslash
02a62e245b
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney 
Config for lost money after losing a battle
 2022-07-01 11:58:36 -04:00
ghoulslash
b9be123716
Merge pull request #2163 from Sneed69/terrain-softlock-fix 
Fix terrain move softlock
 2022-07-01 11:58:00 -04:00
ghoulslash
1ddf3ca7e0
Merge pull request #2169 from Sneed69/inverse-flying 
Make ungrounded flying mons weak to ground in inverse battles
 2022-07-01 11:57:43 -04:00
ghoulslash
6cf0620f93
Merge pull request #2159 from Sneed69/trap-move-arrays 
Trap move battle string related code cleanup
 2022-07-01 11:07:28 -04:00
sneed
c1af418340 define B_MSG_WRAPPED_ constants 2022-07-01 17:52:46 +03:00
ghoulslash
5ed30b43a4
Merge pull request #2170 from Sneed69/best_type_matchup 
AI chooses most resistant mon instead of best offensive type
 2022-07-01 10:37:06 -04:00
ghoulslash
a349462b78
Merge pull request #2134 from LOuroboros/bePretMerge 
Pret merge for the battle_engine
 2022-07-01 09:21:51 -04:00
ghoulslash
42f3cccdbe
Merge pull request #2154 from HamishSinclair/poltergeist 
add poltergeist animation
 2022-07-01 09:19:49 -04:00
ghoulslash
f4918222e8
Merge pull request #2156 from Sneed69/ai_3rd_type 
Type effectivess related AI bugfixes
 2022-07-01 09:09:12 -04:00
ghoulslash
80ac427443
Merge pull request #2160 from Sneed69/ignore-mystery-type-3 
IS_BATTLER_OF_TYPE ignores third type if it's Mystery
 2022-07-01 08:55:08 -04:00
ghoulslash
14c531cf75
Merge pull request #2161 from Sneed69/confusion-fix 
Fix confusion and disobedience self damage benefiting from STAB
 2022-07-01 08:53:30 -04:00
ghoulslash
ce5c85dd13
Merge pull request #2165 from Sneed69/battle_engine 
Heal Block stops Jungle Healing / Life Dew
 2022-07-01 08:51:10 -04:00
GriffinR
650f033c2b
Merge pull request #1695 from GriffinRichards/update-gfromh 
Update some GF rom header names
 2022-06-29 11:59:43 -04:00
GriffinR
06c9e0eb99
Merge pull request #1697 from Kurausukun/bpm 
Use Floats and Round Correctly in Tempo Calculation
 2022-06-28 00:27:44 -04:00
Kurausukun
2e7f50064c use floats for tempo calculation 2022-06-28 00:11:59 -04:00
GriffinR
8950a41bfd Update some GF rom header names 2022-06-21 18:31:09 -04:00
GriffinR
c2a08cc84d
Merge pull request #1689 from GriffinRichards/task-ub 
Remove UBFIX related to task destruction
 2022-06-21 16:33:17 -04:00
GriffinR
a5291cbc10
Merge pull request #1694 from sphericalice/patch-1 
Fix missing COPYWIN_FULL constant use
 2022-06-19 11:54:29 -04:00
sphericalice
5d7140fa83
Fix missing COPYWIN_FULL constant use 2022-06-19 13:33:47 +01:00
GriffinR
fa1ae45b39
Merge pull request #1692 from coltongit/script-fixes 
Supplant PR #1579 (Fix the last of the *.inc inconsistencies)
 2022-06-18 21:02:28 -04:00
Colton G. Rushton
3de23b332a Supplant https://github.com/pret/pokeemerald/pull/1579 2022-06-18 21:51:05 -03:00
sneed
5e7df653bd no gest 2022-06-18 19:18:01 +03:00
sneed
f43d54af89 AI chooses most resistant mon 2022-06-18 19:00:33 +03:00
GriffinR
21ed288f50
Merge pull request #1687 from SimplyBLGDev/patch-1 
Format newlines in surf.inc
 2022-06-18 11:04:39 -04:00
GriffinR
a931874164
Merge pull request #1691 from coltongit/patch-5 
Format newline in BattleFrontier_BattlePikeLobby/scripts.inc
 2022-06-18 11:04:20 -04:00
Colton G. Rushton
c8e6d69fdc
Format newline in BattleBattleFrontier_BattlePikeLobby/scripts.inc 
One of the strings declared in BattleFrontier_BattlePikeLobby/scripts.inc was poorly formatted.
 2022-06-18 11:49:13 -03:00
GriffinR
57222323c1
Merge pull request #1678 from GriffinRichards/const-frontier 
Add some battle frontier constant usage
 2022-06-18 10:22:58 -04:00
GriffinR
d11b04f251
Merge pull request #1690 from Kurausukun/ai_doc 
Document Design Oddity, Use Constants, Correct Comment
 2022-06-17 22:09:43 -04:00
Kurausukun
d3c8346a67 fix type, add bugfix 2022-06-17 21:58:56 -04:00
Kurausukun
23e9455e0a document design oddity, use constants, correct comment 2022-06-17 21:52:58 -04:00
GriffinR
7a6b417b8e Remove UBFIX related to task destruction 2022-06-17 21:01:23 -04:00
GriffinR
de1145e790
Merge pull request #1688 from coltongit/patch-4 
Add bugfix from bugs_and_glitches.md to BUGFIX
 2022-06-17 17:48:53 -04:00
Colton G. Rushton
f02ea58a68
Add comment description of this bugfix 2022-06-17 18:32:46 -03:00
Colton G. Rushton
d7ab1ba588
Fix formatting 2022-06-17 18:22:47 -03:00
Colton G. Rushton
b885e01b39
Update src/item_menu_icons.c 
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
 2022-06-17 18:16:14 -03:00
Colton G. Rushton
b17fb2ff56
Delete bugs_and_glitches.md 2022-06-17 18:07:46 -03:00
Colton G. Rushton
e42498ab40
Add bugfix from bugs_and_glitches.md to BUGFIX 
Item flicker fix now in `BUGFIX`
Supersedes and resolves #1680
Fixes #1215
Fixes #1514
 2022-06-17 18:06:37 -03:00
Simply BLG
324a157b34
Format newlines in surf.inc 
One of the strings declared in surf.inc was poorly formatted.

## Description
Some of the strings declared in surf.inc contained newline characters in the middle of the .string line, opposing the format used by every string in the `data/text` directory, I just updated them to match the format, making it more readable.
 2022-06-17 15:21:12 -03:00