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
|
ce7815ebcc
|
Update pokemon.h
|
2021-12-28 15:11:52 -03: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 |
|
GriffinR
|
f554f09aed
|
Merge pull request #1582 from LOuroboros/patch-2
Update main_menu.c
|
2021-12-27 16:29:08 -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 |
|
Eduardo Quezada D'Ottone
|
75fbc5c0ab
|
Merge pull request #1981 from ghoulslash/be/aquaring
Fix aqua ring heal anim
|
2021-12-24 15:11:28 -03:00 |
|
ghoulslash
|
93a7e139ec
|
merge w be
|
2021-12-24 09:40:12 -05:00 |
|
GriffinR
|
84925a892b
|
Merge pull request #1576 from Kurausukun/aif2pcm16
Accept 16-bit AIFF Files and Convert to 8-bit
|
2021-12-24 02:48:48 -05:00 |
|
GriffinR
|
94c2b7f1c6
|
Merge pull request #1581 from LOuroboros/patch-2
Fixed typo in src/battle_script_commands.c
|
2021-12-24 00:07:24 -05: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 |
|
ghoulslash
|
770224d341
|
increase TEXT_BUFF_ARRAY_COUNT for expanded ability names
|
2021-12-23 18:58:15 -05: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
|
713d97891f
|
Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2021-12-22 21:32:10 -03:00 |
|
GriffinR
|
f663e310b1
|
Merge pull request #1580 from LOuroboros/patch-2
Removed some commented out addresses
|
2021-12-21 20:55:41 -05:00 |
|
LOuroboros
|
d94dae18f7
|
Removed more commented out addresses
I like to help.
|
2021-12-21 22:49:30 -03:00 |
|
LOuroboros
|
e28fa7f91c
|
Update event_scripts.s
|
2021-12-21 22:10:54 -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 |
|
ghoulslash
|
05f91bc243
|
Update include/constants/battle_config.h
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-12-20 14:06:32 -05:00 |
|
ghoulslash
|
02fe96cc08
|
fix config settings
|
2021-12-20 13:06:23 -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
|
66e6b140ac
|
Merge pull request #1987 from rh-hideout/DizzyEggg-patch-1
Fix Intimidate affecting fainted mons
|
2021-12-18 15:01:19 -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 |
|
Kurausukun
|
39f493287f
|
one more lel
|
2021-12-17 23:03:09 -05:00 |
|
Kurausukun
|
f336acb3a9
|
fix indentation again
|
2021-12-17 23:00:03 -05:00 |
|
Kurausukun
|
efee1288a0
|
fix indentation
|
2021-12-17 22:56:20 -05:00 |
|
Kurausukun
|
0f6311b470
|
accept 16-bit aiff files and convert to 8-bit
|
2021-12-17 22:49:45 -05:00 |
|
GriffinR
|
32a9ac6eb1
|
Merge pull request #1575 from LOuroboros/benriBotan
[LEAK INFORMED] Documented the unk19 item field
|
2021-12-17 22:27:45 -05:00 |
|
LOuroboros
|
4a74d288d4
|
Review corrections
|
2021-12-18 00:01:50 -03:00 |
|