ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 20:47:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,027 Commits 1 Branch 0 Tags 235 MiB
060a3566e2
Commit Graph

243 Commits

Author SHA1 Message Date
Melody
ac2e4adf2d improve goto_if macros 2018-12-21 20:28:24 -05:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff 
Decompile / port fldeff_80F9BCC
 2018-12-19 22:16:59 -06:00
Melody
5e6ceeb631 update applymovement to remove magic numbers 2018-12-19 14:08:01 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
garak
e1e2132a37 sync fldeff function names with pokeruby 2018-12-09 22:24:54 -05:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
Melody
bad5323642 cleans up trainer battle scripts 
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
 2018-12-02 15:08:19 -05:00
Melody
c557ac61ae adds constants, cleans up callstd and msgbox code 
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
 2018-12-02 03:37:46 -05:00
Marcus Huderle
fb6120da5b Fixup some names 2018-11-25 15:50:54 -06:00
garak
1441ee6bc3 finish event object flags 2018-10-19 13:04:47 -04:00
garak
c27043bd3c more event flags 2018-10-18 15:28:59 -04:00
garak
d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -04:00
garak
7d88b9647f
Merge branch 'master' into event-flags 2018-10-17 12:30:45 -04:00
garak
ff97873c30 label temp flags, test replace script 2018-10-17 12:25:12 -04:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
DizzyEggg
f47ed3268c Finish documenting apprentice for now 2018-10-14 17:00:41 +02:00
DizzyEggg
7952cfeba5 document more of apprentice 2018-10-14 16:27:48 +02:00
DizzyEggg
84936b4260 Merge branch 'master' into apprentice 2018-10-14 15:07:16 +02:00
DizzyEggg
145df49063 Document more of apprentice 2018-10-14 14:35:51 +02:00
DizzyEggg
b4a42a6832 Decompile apprentice 2018-10-14 11:37:44 +02:00
Diegoisawesome
35c6938814 Port/decompile cable_club.s 2018-10-13 12:41:10 -05:00
Diegoisawesome
cb9127ccaf Revert "Rename some specials" 
This reverts commit 658f9351fe.
 2018-08-11 15:16:41 -07:00
Diegoisawesome
658f9351fe Rename some specials 2018-08-11 14:59:43 -07:00
Diegoisawesome
90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
Diegoisawesome
e92e2cb0aa Merge branch 'master' of github.com:pret/pokeemerald 2018-07-24 21:18:36 -07:00
Diegoisawesome
156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07:00
DizzyEggg
1e9143e0b2 merge union room with master 2018-07-22 13:14:58 +02:00
DizzyEggg
c9d486a5d3 make union room compile i guess 2018-07-22 12:49:49 +02:00
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
Marcus Huderle
135a11e50e Move events and scripts into map dirs 2018-06-20 19:54:21 -05:00
Marcus Huderle
acc1a5d446 Get all map constants from include/ rather than constants/ 2018-06-15 07:49:21 -05:00
Marcus Huderle
e01dd90bb3 Update applymovement actions to reflect movement action names 2018-06-13 18:19:19 -05:00
Marcus Huderle
4d13e3394a Bring all movement function names up-to-date with pokeruby 2018-06-13 17:51:26 -05:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
DizzyEggg
e95b1156d2 more progress 2018-06-03 09:37:01 +02:00
DizzyEggg
d1798d0ed9 decompile field tasks 2018-05-19 18:02:43 +02:00
PikalaxALT
fd1d75ce37 Merge branch 'master' into mauville_old_man 2018-05-07 18:18:00 -04:00
PikalaxALT
61cc1d5574 Rename symbols using Ruby as a reference 2018-05-07 18:11:20 -04:00
PikalaxALT
58200616d5
Merge branch 'master' into trader 2018-05-04 17:45:50 -04:00
Marcus Huderle
cdb5e9e314
Merge pull request #242 from DizzyEggg/decompile_battle_records 
Decompile battle records
 2018-05-03 08:42:44 -07:00
PikalaxALT
4acbcf5759 Port trader from Ruby 2018-05-01 15:19:24 -04:00
DizzyEggg
ae78786723 identify and name battle records things 2018-05-01 15:33:13 +02:00
DizzyEggg
f9a2f6c4a2 start decompiling battle records 2018-05-01 12:38:55 +02:00
DizzyEggg
fd40e93cb5 clear item, save and load save files 2018-04-29 14:21:59 +02:00
DizzyEggg
25c669e36b decompile item 2018-04-29 13:36:26 +02:00
KDSKardabox
b818924feb Decompile rotating_rate & remove debug check 2018-04-18 14:09:50 +05:30
KDSKardabox
936bb5925a Decompile dewford trend 2018-04-16 16:22:13 +05:30
Marcus Huderle
a5cd6e8ef4
Merge pull request #231 from KDSKardabox/master 
Player PC
 2018-03-28 21:45:24 -07:00
Marcus Huderle
d4c6ef7ae6
Merge pull request #227 from PikalaxALT/pokenav_match_call 
Pokenav match call
 2018-03-28 21:33:50 -07:00
Anders Løvig
5bc8ee6465 Added static modifers 2018-03-28 15:45:35 +02:00
KDSKardabox
e7cf8e5c17 Start decompile player_pc 2018-03-12 13:56:20 +05:30
PikalaxALT
df128cbfed Merge branch 'master' into pokenav_match_call 2018-03-02 21:49:09 -05:00
PikalaxALT
988be1ab86 Carve out Match Call functions 2018-02-28 22:47:50 -05:00
PikalaxALT
1616f998fc Rename some flags relevant to the conditions under which Wattson becomes available for rematch 2018-02-26 08:42:15 -05:00
PikalaxALT
f46e941f30 Name functions, variables, and that one flag constant 2018-02-26 08:23:17 -05:00
DizzyEggg
94b47c0686 decompile overworld 2018-02-14 00:58:22 +01:00
DizzyEggg
f22be4d010 more overworld work 2018-02-12 18:26:26 +01:00
DizzyEggg
9e7696f25a decompile pokemon1 2018-02-09 15:55:12 +01:00
DizzyEggg
741b8adf9a decompile mystery event menu 2018-01-30 23:23:35 +01:00
DizzyEggg
f53a39e7a2 mystery event labels 2018-01-21 19:30:01 +01:00
DizzyEggg
0bc7fb92db start decompiling mystery event script 2018-01-21 12:36:11 +01:00
golem galvanize
bce63b3694 REMOVE BASEROM 2018-01-20 22:41:02 -05:00
golem galvanize
59e1aacd26 DIEGO SEND HELP 2018-01-20 17:26:30 -05:00
Diegoisawesome
2d04eb22ab Split rom_81370FC and port function names 2017-12-28 02:09:11 -06:00
Diegoisawesome
f9a9391ff3 Split/extract/port landmark 2017-12-26 21:20:29 -06:00
Diegoisawesome
15c92318d3 Extract data from misc files 
Also split data4d.s
 2017-12-25 00:32:01 -06:00
Diegoisawesome
ca25068ae8 Extract baseroms from battle_tower 2017-12-23 16:17:31 -06:00
Diegoisawesome
4eccc06973 Finish extracting battle_frontier_2 data 2017-12-23 13:56:52 -06:00
sceptillion
3c286feec6 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs 2017-12-22 00:17:34 -08:00
sceptillion
96511dc214 use internal song names 2017-12-22 00:10:20 -08:00
Diegoisawesome
0403f6eea9 Merge remote-tracking branch 'Egg/decompile_use_pokeblock' 2017-12-21 16:19:50 -06:00
Marcus Huderle
173761a5a1 Port generic event script macros from pokeruby 2017-12-21 13:47:52 -06:00
DizzyEggg
cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
DizzyEggg
7517f6a030 fix battle setup conflicts 2017-12-17 20:26:13 +01:00
PikalaxALT
6d73bb4b57 Import function labels from Ruby 2017-12-16 10:23:05 -05:00
DizzyEggg
44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
DizzyEggg
4351676749 decompile more of pokeblock.s 2017-12-16 00:08:23 +01:00
DizzyEggg
646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
DizzyEggg
e8ecb01ab2 more work on battle setup 2017-11-29 19:54:15 +01:00
DizzyEggg
10470ef536 start working on battle setup 2017-11-28 23:02:09 +01:00
DizzyEggg
b0657350a4 berry blender fix merge conflicts 2017-11-26 19:21:51 +01:00
DizzyEggg
4e25ef10f2 wild encounter review changes 2017-11-20 16:40:02 +01:00
DizzyEggg
a3b5af17ea berry blender is done 2017-11-19 22:48:46 +01:00
DizzyEggg
3de416662b wild encounter, fix merge conflicts 2017-11-18 21:45:52 +01:00
DizzyEggg
8fd3081306 start working on berry blender 2017-11-18 16:11:34 +01:00
DizzyEggg
1b7246395d merge conflicts, review changes, daycare 2017-11-17 19:31:03 +01:00
DizzyEggg
a2a17bba92 more work on wild encounter 2017-11-17 17:50:07 +01:00
Diegoisawesome
a98c6bf210 Fix build by renaming specials 2017-11-16 09:30:04 -06:00
DizzyEggg
616edd6c3f daycare file is decompiled 2017-11-15 20:08:31 +01:00
DizzyEggg
1e79d53d2f merge daycare with master 2017-11-15 17:18:05 +01:00
Diegoisawesome
6e6e11205d Fix capitalized symbol names 2017-11-11 18:17:46 -06:00
Diegoisawesome
f497c1508b Split files from event_scripts.s 
Also move maps/scripts to scripts/maps
 2017-11-11 16:10:17 -06:00