Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-05-09 04:13:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,658 Commits 3 Branches 0 Tags 879 MiB
401df8da4d
Commit Graph

142 Commits

Author SHA1 Message Date
Eduardo Quezada
afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
 2022-08-22 20:30:45 -04:00
ghoulslash
c7c7a76608 Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav 2022-08-04 19:06:29 -04:00
GriffinR
06dc93fc2f Clean up field_poison.c 2022-07-06 21:04:54 -04:00
AgustinGDLV
b197da077f
Update src/strings.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-05-16 16:08:26 -07:00
AgustinGDLV
bd008e4c80 fixed softlocks / messages 2022-05-16 15:25:13 -07:00
TheXaman
b2601f043b added the ability to check out all data (base stats, moves, abilities etc) for the forms implmeneted in the RHH pokemon_expansion 2022-01-03 21:38:59 +01:00
TheXaman
9446ad112a added the ability to directly open evolutions from the EVO page 2022-01-03 16:48:50 +01:00
ghoulslash
6f6ed0a25c Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav 2021-11-28 15:01:19 -05:00
ultima-soul
01a90ca6c2 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-27 22:17:05 -08:00
ultima-soul
57bf1c7824 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-21 10:41:12 -08:00
TheXaman
111555132f Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2021-11-18 16:48:49 +01:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav 
Document Pokénav
 2021-11-17 14:47:34 -05:00
GriffinR
f5152094a9 Finish pokenav conditions doc 2021-11-12 11:01:22 -05:00
GriffinR
684f599a44 Label remaining battle_interface symbols 2021-11-08 16:03:44 -05:00
ghoulslash
eee3f5b181 merge w pret 2021-11-05 09:22:24 -04:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
LOuroboros
5536bce88d SIZE -> FONT 2021-10-29 18:39:31 -03:00
ghoulslash
222d1d3194 merge with pret 2021-10-26 13:21:50 -04:00
Katelyn Gigante
347a173402 Prevent text glitch if a pokemon has an unspecified custom evolution 2021-10-25 13:24:48 +11:00
TheXaman
475bb8a624 added preEvolutions to the EvoScreen! 2021-10-24 16:31:19 +02:00
ultima-soul
78d2215196 Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding. 2021-10-03 10:16:09 -07:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
ghoulslash
03fa4939ff merge with pret 2021-08-18 20:22:03 -06:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
TheXaman
883995da16 shortened "human like" to "humane" to avoid clipping 2021-07-12 12:30:28 +02:00
TheXaman
6b8f40b3b1 new layout for evo screen and new buttons for the PE version 2021-06-14 17:29:42 +02:00
TheXaman
2d4a91f0b4 added Decapped version of the button prompts 2021-06-14 15:00:26 +02:00
TheXaman
d0012305c0 stats page new navigation button prompts 2021-06-14 14:55:55 +02:00
TheXaman
1530da10a0 changed catch rate to words 2021-06-13 01:17:47 +02:00
TheXaman
537a17714c EV Arrows now close to stats 2021-06-13 00:35:38 +02:00
TheXaman
3896ce3abe changed info per stats toggle page to an equal 5 2021-06-13 00:09:27 +02:00
TheXaman
13256b856e Egg groups now in one line (if 2 different one), 
changed where the bg is cleared
 2021-06-12 23:38:08 +02:00
TheXaman
ac56eec979 shortened evo methodes, fixed typos 2021-06-12 23:00:58 +02:00
TheXaman
6bbdc79f5a EVs represented by Arrows instead of numbers, also now in 1 line 2021-06-12 21:55:02 +02:00
TheXaman
73cc40fd03 Egg cycles now with icons insteat of numbers 2021-06-12 19:52:43 +02:00
TheXaman
74e562da33 friendship now emoji based 2021-06-12 15:29:01 +02:00
ghoulslash
0c14ec4b78 Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav 2021-06-11 12:22:15 -06:00
ExpoSeed
3ed06c2cc2 Remove remaining grey and replace with gray 2021-06-10 11:36:10 -05:00
ghoulslash
3c4bf808f1 merge with pret 2021-05-18 09:31:34 -06:00
GriffinR
8c820878bf Document Battle Pyramid Bag 2021-04-23 15:07:36 -04:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04:00
ghoulslash
5e948e746b add dexnav 2021-04-02 12:28:00 -06:00
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04:00
TheXaman
1b3b717248 Added Forms screen for PokemonExpansion (rhh) 2021-02-11 17:55:53 +01:00
TheXaman
e663c35d1f Fixed missing SHEDINJA and updated ingame evolution description, thanks to juan.je7 2021-02-05 16:56:00 +01:00
TheXaman
fbbc604848 Added evolution screen! Improved BE compatibility 2021-02-04 13:48:32 +01:00
TheXaman
abf5d238c2 PokedexPlus with HGSS styled UI by TheXaman 
more ui, BROKEN atm

type icons in info screen

working topbar

dpad for switching and white mon name

initial working stats screen

additional stats, proper move list array

Working stats screen, all infos in, all icons in, buggy when switching

Fixed sprite bug, proper sprite destruction, works with old compiler

new navigation: info>area>stats

power+accuracy text, change of positions

layout for stats screen, other screen visually broken

new stats layout properly working plus toggle infos

show lvl of LevelUpMove and TM/HM of TMHM_Move

3 dashes for EggMoves and CORRECT icon for TM/HMs pog

improved layout and contest move data!

TutorMoves now available

hold dpad to scroll, pure relieve

search by move code working

6evs, 16 character move names, tripple digit moves, new eduardo layout

working tileset, info screen no correct xy layout for elements yet

new list menu start

new layout working, only missing stats bars

new list, new search

fixed area screen change and fixed "new caught" bug (type icons)
 2020-11-08 00:49:14 +01:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
cc4255d4c0 Add some charmap constant usage 2020-08-11 00:23:28 -04:00
GriffinR
0c4f3b269e
Merge pull request #1083 from GriffinRichards/playse-constants 
Use charmap constants for PLAY_SE
 2020-07-15 02:53:53 -04:00
GriffinR
431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
GriffinR
7d5ad8f7b4 Use charmap constants for PLAY_SE 2020-06-26 02:44:07 -04:00
GriffinR
24569583e4 Document contest results 2020-06-18 17:50:13 -04:00
GriffinR
3f97763181 Document cable_club.c 2020-06-06 16:10:03 -04:00
GriffinR
7632404ba5 Document union_room_chat.c 2020-06-02 18:35:00 -04:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR
47b0d8a597
Merge branch 'master' into doc-matchcall 2019-12-10 20:43:27 -05:00
GriffinR
b7ab9cbf4c Update JP translation and fix typo 2019-12-10 19:29:23 -06:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
GriffinR
548af3c0f1 Document a bit of Match Call 2019-12-05 15:33:36 -05:00
GriffinR
f7e17ca985 Document Ranking Hall scripts 2019-11-17 08:16:28 -06:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
GriffinR
37373c1b21 Review changes for #817 2019-09-25 18:46:25 -05:00
GriffinR
275695c189 Document more script_menu, lilycove harbor 2019-09-19 17:27:34 -04:00
GriffinR
de0084ef7a Document multichoice ids 2019-09-19 00:56:51 -04:00
GriffinR
b596322ca2 Initial script_menu documentation 2019-09-18 18:57:25 -04:00
GriffinR
5d96a0cc97 minor fixes 2019-08-21 17:06:55 -05:00
GriffinR
23979c4d7d initial documentation commit 2019-08-21 17:06:55 -05:00
Slawter666
2fdc489bc0 Further documentation of party_menu.c 2019-05-15 16:55:39 -05:00
Sewef
c8ce1a0a1f Two labels from pokeruby. 2019-04-08 17:30:10 -05:00
Phlosioneer
d352999cd8 Change "navgear" to "pokenav" 2019-04-07 18:10:53 -04:00
Phlosioneer
d84d94e29a Merge branch 'master' into pokenav-decomp-again 2019-04-07 01:56:36 -04:00
Phlosioneer
bc50686158 Decomp everything onvolving UnknownSubStruct_81C81D4 
Now I can start cleaning up the fields and substructs
 2019-04-06 03:42:14 -04:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
Phlosioneer
69aec91577 Decompile move tutor stuff 
2 nonmatching.
 2019-03-08 01:56:38 -05:00
Phlosioneer
cae63cf1c7 Rename move tutor to move relearner 2019-03-04 20:56:39 -05:00
Phlosioneer
4907ce6f7f Fully document move_tutor (formerly learn_move) 2019-03-03 02:50:40 -05:00
Phlosioneer
a4aaf279ac Move more data into pokenav, name some strings 2019-02-17 23:14:14 -05:00
DizzyEggg
c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
Tetrable
50aa222aff Corrected typos 2019-01-03 01:54:55 +00:00
Diegoisawesome
0b91d2948a
Merge pull request #429 from nullableVoidPtr/master 
Various fixes and cleanups
 2018-12-08 21:44:12 -06:00
Meowsy
6babb97182 Fix typo "ggText_DexSortSmallestDescription". (#433) 
Should be "gText_DexSortSmallestDescription".
 2018-12-08 11:57:19 -06:00
nullableVoidPtr
8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
Melody
2347e36d60 document pokédex options 2018-12-05 10:10:33 -05:00
garak
73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00
garak
091b5194e7 frontier pike and pyramid data 2018-11-27 11:21:48 -05:00
nullableVoidPtr
556bdd52e1 Clean up aligned variables in src/ 2018-11-27 19:37:29 +08:00
DizzyEggg
3a9eeef844 Frontier, finish ranking hall 2018-10-28 21:11:53 +01:00
Diegoisawesome
6206acd2d2 Finish shop and fldeff_escalator 2018-10-18 12:05:02 -05:00
Diegoisawesome
7270e73fee Move strings to C 2018-07-25 01:15:36 -07:00