ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 12:37:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,485 Commits 1 Branch 0 Tags 235 MiB
91349324c6
Commit Graph

2485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diegoisawesome
57ce548020
Merge pull request #291 from DizzyEggg/patch-3 
Update battle_script_commands.c
 2018-08-11 16:24:34 -07:00
DizzyEggg
7b9a7765e0 Make learnsets easier to edit 2018-08-12 00:42:25 +02:00
Diegoisawesome
57b3393192 Fix compile error 2018-08-11 15:42:08 -07:00
Diegoisawesome
cb9127ccaf Revert "Rename some specials" 
This reverts commit 658f9351fe.
 2018-08-11 15:16:41 -07:00
DizzyEggg
9bb7a2c7a5 make move desc compile 2018-08-12 00:09:53 +02:00
DizzyEggg
df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
Diegoisawesome
658f9351fe Rename some specials 2018-08-11 14:59:43 -07:00
Diegoisawesome
b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
DizzyEggg
7f167ca9f4
Update battle_script_commands.c 2018-08-11 23:00:16 +02:00
DizzyEggg
feee4751eb
Make event data look cleaner 2018-08-11 22:54:34 +02:00
DizzyEggg
537ebd36ac Merge contests with master 2018-08-11 19:04:28 +02:00
DizzyEggg
0e0d103044 port more of slot machine 2018-08-11 18:47:56 +02:00
DizzyEggg
7961aa44ba start porting slot machine 2018-08-11 17:57:20 +02:00
garak
2fc3b7f171 change sUnknown_085A1E3C to sMapHealLocations 2018-08-11 10:28:13 -04:00
DizzyEggg
59d8d56868 merge easy chat with master 2018-08-11 14:14:51 +02:00
Diegoisawesome
1e0f3ec433 Continue decompiling field_specials 2018-08-10 14:07:23 -07:00
garak
c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Diegoisawesome
12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
Diegoisawesome
bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07:00
Diegoisawesome
90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
garak
45b730e474 copy heal_location changes from pokeruby 2018-08-07 23:05:48 -04:00
Garak
96ab357bed
Merge pull request #3 from pret/master 
syncing with source repo
 2018-08-07 22:21:10 -04:00
Diegoisawesome
85ebd76cd0 Fix fanfare constant to use define 2018-08-04 18:41:53 -07:00
Diegoisawesome
4070152b0e
Merge pull request #284 from DizzyEggg/patch-1 
Use constant in a battle script.
 2018-08-04 18:32:04 -07:00
Diegoisawesome
002016e764
Merge pull request #283 from DizzyEggg/battle_pr_again 
Battle code enums in switches
 2018-08-04 18:31:49 -07:00
DizzyEggg
3d5f512aec
Use constant in a battle script. 2018-08-03 18:07:45 +02:00
DizzyEggg
eb4d9f6fed Tabs to spaces 2018-08-03 00:24:10 +02:00
DizzyEggg
d6537c811b Battle code enums in case switches 2018-08-03 00:13:44 +02:00
Diegoisawesome
759bc2671c
Merge pull request #280 from DizzyEggg/decompile_part_mon_summary 
Decompile a few pokemon summary screen functions
 2018-08-02 08:27:05 -07:00
Diegoisawesome
722b07707c
Merge pull request #282 from DizzyEggg/stats_bits 
Add some more stat defines for battle scripts
 2018-08-02 08:11:44 -07:00
DizzyEggg
9febcd3a0a Document a bit of atk47 2018-07-29 15:51:08 +02:00
DizzyEggg
68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
Diegoisawesome
df4c20f1f8
Merge pull request #281 from einstein95/master 
Port over preproc commit from pokeruby
 2018-07-29 02:19:09 -07:00
einstein95
aeceecea3d Port over 9d96147bbf 2018-07-29 20:11:04 +12:00
DizzyEggg
4080c6f831 Decompile a few pokemon summary screen functions 2018-07-28 23:26:19 +02:00
Diegoisawesome
919e7b4387
Merge pull request #279 from Diegoisawesome/master 
Move strings to C, misc cleanup
 2018-07-25 08:10:18 -07:00
MCboy
6c365fdc94
Update field_player_avatar.c 2018-07-25 17:47:04 +04:30
MCboy
3a15012085
Update field_player_avatar.c 2018-07-25 17:28:25 +04:30
MCboy
94a5f8d529
made file better ? 2018-07-25 17:18:49 +04:30
Diegoisawesome
7270e73fee Move strings to C 2018-07-25 01:15:36 -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
Diegoisawesome
5883f867f0
Merge pull request #278 from vblm12/trainer_data 
Move some trainer data into c structs
 2018-07-24 18:58:56 -07:00
Diegoisawesome
c47aac3538
Merge pull request #260 from DizzyEggg/decompile_union_room 
Decompile part of union room
 2018-07-24 18:48:23 -07:00
MCboy
1b3d7a5bef
Update field_player_avatar.s 2018-07-24 17:04:02 +04:30
MCboy
64f40bbfee
Add field_player_avatar to rodata 2018-07-24 17:03:16 +04:30
MCboy
ed3a698b98
Update field_player_avatar.s 2018-07-24 17:01:44 +04:30
MCboy
82d88479ce
decompiled a bunch of functions 
i also made TryInterruptEventObjectSpecialAnim functionally equivalent tho its still nonmatching so i need help with that
 2018-07-24 16:59:52 +04:30
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