ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-29 01:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,011 Commits 1 Branch 0 Tags 235 MiB
be152fbee8
Commit Graph

53 Commits

Author SHA1 Message Date
Eduardo Quezada
51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 
# Conflicts:
#	data/battle_scripts_2.s
#	include/constants/battle_string_ids.h
#	include/constants/songs.h
#	src/battle_message.c
#	src/data/pokemon/species_info.h
 2023-03-19 20:28:56 -03:00
Eduardo Quezada
a6bd35ceab Review changes 2023-03-05 17:17:39 -03:00
Eduardo Quezada
d330ca051a Document music usage to make it easier to search for a specific track 2023-02-23 11:44:23 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2022-11-24 15:36:00 -03:00
GriffinR
004ce32da0 Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
Eduardo Quezada
503b85aa2d Generating music names for the debug menu based on their labels 2022-09-09 16:44:34 -04:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
GriffinR
6d6ff91268 Allow right single quotation mark in charmap 2022-01-16 10:29:15 -05:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
LOuroboros
7574af3558 Fixed charmap comment about the FONT text controller 2021-10-29 19:08:24 -03:00
LOuroboros
5536bce88d SIZE -> FONT 2021-10-29 18:39:31 -03:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
ee72696b53 Sync encounter musics with encounter music types 2020-08-20 21:03:24 -04:00
GriffinR
d356e35b64 Fix incorrect pike curtain SE names 2020-08-20 20:23:08 -04: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
DizzyEggg
3bdf675221 Hopefully illusion works as intended now 2020-06-28 19:45:48 +02:00
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02:00
MandL27
c3d690a380 consistency with pokefirered 2020-05-27 07:58:04 -05:00
MandL27
6964d37db6 document UNKNOWN_A special char 2020-05-27 07:58:04 -05:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
tustin2121
258784f263 Add supported but unused buttons to charmap.txt 
These buttons are supported by the game but unused by vanilla. We should include them for use by hacks.
 2019-09-08 10:44:43 -05:00
DizzyEggg
2646f3b26a Merge with master 2019-04-13 13:42:44 +02:00
Sewef
608245058b Update charmap.txt 
French is beautiful. (Lie)
 2019-04-08 17:30:10 -05:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
DizzyEggg
17e74756cb Merge with master, add defines to atk49 and statbuffchange commands 2019-03-31 15:19:25 +02:00
Marcus Huderle
519426f4e6 Decompile union_room_chat through sub_8020118 2019-03-28 20:20:52 -05:00
DizzyEggg
8e9296a42b Fix team messages 2019-03-02 12:31:07 +01:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
DizzyEggg
67384c08be Implement double wild battle functionality 2018-10-15 21:19:52 +02:00
DizzyEggg
a69af8f2f5 Merge with master 2018-09-22 00:22:13 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
DizzyEggg
0148cc8b0c merge with master, gen6 move names 2018-07-28 00:01:34 +02:00
Diegoisawesome
156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07:00
DizzyEggg
66a3c13f49 Add new Side turn effects 2018-07-21 12:56:07 +02:00
DizzyEggg
5318cc656a Add some new battlestrings. 2018-07-15 18:53:43 +02:00
Diegoisawesome
59680b2a73 Finish adding symbols to battle_anims 2018-01-14 21:04:06 -06:00
sceptillion
e675043558 phoneme constants 2017-12-22 00:14:56 -08:00
sceptillion
96511dc214 use internal song names 2017-12-22 00:10:20 -08:00
DizzyEggg
7552caaadc placeholders for battle strings are done 2017-10-07 19:59:41 +02:00
Diegoisawesome
fcc94f9722 Extract baseroms from battle_message and rename strings 2017-09-19 19:31:53 -05:00
Diegoisawesome
3e1c6024a7 Continue extracting from data2.s 2017-09-13 01:10:12 -05:00
Diegoisawesome
3a96688b12 Dump strings.txt 2017-09-11 22:01:39 -05:00
Diegoisawesome
ab189ecec5 Begin extracting baserom calls from data2.s 2017-09-11 00:40:47 -05:00
DizzyEggg
d7d1b97bb8 add battle strings codes to charmap 2017-09-07 15:10:33 +02:00