Eduardo Quezada
|
8e0991475c
|
Incorporated upstream fixes
|
2023-10-27 11:04:10 -03:00 |
|
Eduardo Quezada
|
7ae37ab79c
|
Merge branch 'pret_master' into RHH/upcoming
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/event_scripts.s
|
2023-10-27 11:03:37 -03:00 |
|
Alex
|
57a99e9be6
|
Fixes dynamax move target and canceling in doubles (#3470)
|
2023-10-27 10:38:40 -03:00 |
|
Eduardo Quezada
|
b5607209f3
|
Fixed G-Max Finale test
|
2023-10-27 09:16:39 -03:00 |
|
Eduardo Quezada
|
59c0de0967
|
Merge branch 'RHH/master' into RHH/upcoming
|
2023-10-27 09:16:21 -03:00 |
|
leo60228
|
7e3f11709d
|
kitakami dex entries
|
2023-10-27 01:33:31 -04:00 |
|
leo60228
|
5a70555915
|
Try to better abbreviate >10 character names
|
2023-10-26 21:52:39 -04:00 |
|
leo60228
|
fca19a03f1
|
downsample cries (like #3359)
|
2023-10-26 21:45:21 -04:00 |
|
leo60228
|
a505afac1d
|
address review
|
2023-10-26 18:57:06 -04:00 |
|
leo60228
|
1762b28696
|
Ursaluna-Bloodmoon fixes
|
2023-10-26 17:48:01 -04:00 |
|
GriffinR
|
2304283c3e
|
Merge pull request #1935 from GriffinRichards/bugfixfix
Use BUGFIX in assembly files
|
2023-10-26 17:42:41 -04:00 |
|
leo60228
|
144ed150c0
|
update cry tables
|
2023-10-26 17:42:14 -04:00 |
|
kittenchilly
|
1acaf7f869
|
Fixed icons
|
2023-10-26 17:34:21 -04:00 |
|
kittenchilly
|
ad210c5170
|
Update icon.png
|
2023-10-26 17:34:21 -04:00 |
|
kittenchilly
|
91b4659d5c
|
Ogerpon sprites
|
2023-10-26 17:34:21 -04:00 |
|
kittenchilly
|
d9ccc80b31
|
Sprites
|
2023-10-26 17:34:21 -04:00 |
|
kittenchilly
|
8fefdbe914
|
Evo and form changes
|
2023-10-26 17:34:20 -04:00 |
|
kittenchilly
|
3a9172de06
|
It can build now
|
2023-10-26 17:34:20 -04:00 |
|
kittenchilly
|
bb855f965c
|
Almost done with data
|
2023-10-26 17:34:20 -04:00 |
|
kittenchilly
|
5cbcf60c7e
|
Begin some stuff
|
2023-10-26 17:34:18 -04:00 |
|
kittenchilly
|
86917f1453
|
Update species.h
|
2023-10-26 17:33:20 -04:00 |
|
leo60228
|
5f2b6f57f7
|
Merge branch 'upcoming' into gen9-species-nomigration
|
2023-10-26 17:31:31 -04:00 |
|
kittenchilly
|
a8632f0fc5
|
Update PLA Pokemon data to correct values (#3458)
* Fix PLA Pokemon data to use correct values
* oops, cant forget basculin white stripe
* Update level_up_learnsets.h
* Update species_info.h
|
2023-10-26 22:45:33 +02:00 |
|
GriffinR
|
c169b856d4
|
Merge pull request #1937 from kittenchilly/removewhitespace
Remove all trailing whitespace
|
2023-10-26 10:09:00 -04:00 |
|
GriffinR
|
3a8df46832
|
Merge pull request #1938 from AsparagusEduardo/pret/pr2/ndebugModern
Fix mini_printf encoded string -Werror=pointer-sign warning
|
2023-10-26 10:08:25 -04:00 |
|
Bassoonian
|
bb9d3208b0
|
Frontier ban refactor (#3465)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-10-26 10:52:43 -03:00 |
|
Eduardo Quezada
|
25d6f8ba74
|
Fix mini_printf encoded string -Werror=pointer-sign warning
|
2023-10-26 09:25:50 -03:00 |
|
Alex
|
cb38f3bee6
|
Fixes legendary backgrounds (#3464)
* Fixes legendary backgrounds
* missed one
* forgot break
|
2023-10-25 17:06:25 +02:00 |
|
Bassoonian
|
7a9221e7b9
|
Rename output roms (#3462)
* Rename output roms
* Update build.yml
|
2023-10-25 07:51:12 -03:00 |
|
Alex
|
25a57d48d9
|
fixes tests
|
2023-10-25 10:18:59 +02:00 |
|
Alex
|
f6781a77d4
|
merge rhh/upcoming
|
2023-10-25 09:42:19 +02:00 |
|
Alex
|
591ef71e3b
|
Fixes form change when using switch moves (#3463)
* Fixes form change with switch moves
|
2023-10-25 08:33:43 +01:00 |
|
leo60228
|
95aa3028bb
|
updated great tusk sprite
|
2023-10-25 00:23:22 -04:00 |
|
leo60228
|
f6e5076dc0
|
add new sprites
|
2023-10-24 23:20:59 -04:00 |
|
Eduardo Quezada D'Ottone
|
81cbbdb185
|
Setting Modern as default (#3305)
|
2023-10-24 13:31:03 +01:00 |
|
Eduardo Quezada D'Ottone
|
4b1d774373
|
Merge master (#3460)
|
2023-10-24 06:42:56 -03:00 |
|
Martin Griffin
|
74c08dc955
|
Merge remote-tracking branch 'rhh/master' into upcoming
|
2023-10-24 08:58:02 +01:00 |
|
Martin Griffin
|
5fe564f014
|
Detect 'NOT x; NOT y;' (#3459)
Fix Purifying Salt to be immune to statuses from secondary effects.
|
2023-10-24 09:55:32 +02:00 |
|
Martin Griffin
|
bb6efb1d83
|
fix -Wmaybe-uninitialized for ModifyPersonalityForNature test (#3457)
|
2023-10-24 06:10:51 +01:00 |
|
sbird
|
4488f983be
|
fix -Wmaybe-uninitialized for ModifyPersonalityForNature test
|
2023-10-24 01:02:02 +02:00 |
|
leo60228
|
176dec6e6f
|
new tinkaton sprite
|
2023-10-23 18:19:37 -04:00 |
|
leo60228
|
95e0dabfa3
|
icon/palette fixes
|
2023-10-23 18:16:48 -04:00 |
|
leo60228
|
1359df7f86
|
new iron bundle and tinkatink sprites
|
2023-10-23 17:53:25 -04:00 |
|
Eduardo Quezada
|
1137d54b61
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# asm/macros/battle_script.inc
# src/battle_script_commands.c
|
2023-10-23 17:36:42 -03:00 |
|
leo60228
|
2edd20c5f7
|
correct quaxwell and palafin-hero back sprite coordinates
|
2023-10-23 16:26:00 -04:00 |
|
leo60228
|
60d746729d
|
enable floragato icon and tinkatuff shiny palette
|
2023-10-23 16:18:56 -04:00 |
|
Alex
|
0756dc1d4a
|
coords and roaring moon
|
2023-10-23 16:16:11 -04:00 |
|
Alex
|
d1165c0471
|
A few better sprites
|
2023-10-23 16:14:06 -04:00 |
|
Martin Griffin
|
1110d0aeb9
|
ROM space on debug menu (#3453)
|
2023-10-23 17:12:17 -03:00 |
|
Frank DeBlasio
|
bac135c6e8
|
Gave Razor Fang EVO_HELD_ITEM type/fieldUseFunc properties (#3456)
|
2023-10-23 17:03:31 -03:00 |
|