12991 Commits

Author SHA1 Message Date
Eduardo Quezada
c74ad8251d Rearranged dex scrolling list UI to accomodate 4 digits and 12 character names 2023-10-28 17:01:15 -03:00
Eduardo Quezada
b484a215fb Scrollbar moved to the left 2023-10-28 15:22:07 -03:00
Eduardo Quezada
659bff4c0b Seen/Owned 4 digits in HGSS dex 2023-10-28 13:48:26 -03:00
Bassoonian
cd9ef3a566 Formatting fix 2023-10-28 16:34:11 +02:00
Bassoonian
f472d768dd Rename Undiscovered to No Eggs Discovered 2023-10-28 16:32:55 +02:00
Eduardo Quezada
6d128a71b2 Fixed compile when Gen 9 is disabled 2023-10-28 10:54:20 -03:00
Eduardo Quezada
6108d092d1 Updated Save Menu, main menu, match call and trainer card to use 4 digits 2023-10-28 10:38:46 -03:00
Eduardo Quezada
c9619b03b1 Shows 4 digits on the main Pokédex page 2023-10-27 22:59:46 -03:00
kittenchilly
5087095aae
Obedience levels now increase per badge (#3475) 2023-10-27 19:17:17 -03:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A (#3474) 2023-10-27 19:14:45 -03:00
kittenchilly
9d2be9f3a6
Remove all trailing whitespace (upcoming) (#3473) 2023-10-27 13:54:55 -03:00
kittenchilly
bd71946372
Remove all trailing whitespace (master) (#3472) 2023-10-27 13:52:44 -03:00
Eduardo Quezada D'Ottone
db00839d64
Fixes Syrup bomb, new Octolock script, some Intim changes + Tests (#3437) 2023-10-27 12:25:55 -03:00
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
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
Ariel A
c01fae4422 Merge branch 'lighting' into lighting-expanded-id 2023-10-26 19:44:42 -04:00
Ariel A
eaff8abefb Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-10-26 19:41:07 -04:00
Ariel A
294657a585 Fixes for make modern. 2023-10-26 19:37:19 -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
kittenchilly
1acaf7f869
Fixed icons 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
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
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
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
f6e5076dc0
add new sprites 2023-10-24 23:20:59 -04: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
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
Martin Griffin
1110d0aeb9
ROM space on debug menu (#3453) 2023-10-23 17:12:17 -03:00