KDSKardabox
|
e375606810
|
[Do not Merge] fldeff_strength.s
|
2018-02-13 21:52:33 +05:30 |
|
KDSKardabox
|
aaea65c37b
|
Merge branch 'master' of https://github.com/pret/pokeemerald
# Conflicts:
# include/strings.h
|
2018-02-13 10:02:27 +05:30 |
|
KDSKardabox
|
ae321d6e7c
|
move to strings.h
|
2018-02-13 09:32:40 +05:30 |
|
KDSKardabox
|
7b360b2e33
|
Review fixes
|
2018-02-13 09:16:38 +05:30 |
|
golem galvanize
|
4ac064bbaf
|
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
|
2018-02-12 14:00:47 -05:00 |
|
golem galvanize
|
f81c52b56e
|
more fixes
|
2018-02-12 13:59:42 -05:00 |
|
KDSKardabox
|
54922641af
|
Port smokescreen.s
|
2018-02-12 16:44:04 +05:30 |
|
KDSKardabox
|
185cf71842
|
Missing label
|
2018-02-12 16:17:57 +05:30 |
|
KDSKardabox
|
d52a54e64f
|
Updating pokedex count function labels
|
2018-02-12 16:15:51 +05:30 |
|
Diegoisawesome
|
a4787bc06a
|
Merge pull request #207 from DizzyEggg/decompile_pokemon_123
Decompile and clean pokemon files
|
2018-02-11 22:13:15 -06:00 |
|
golem galvanize
|
f2144e9932
|
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
|
2018-02-11 20:34:56 -05:00 |
|
PikalaxALT
|
ea347199a2
|
Merge branch 'master' into link
|
2018-02-11 19:22:06 -05:00 |
|
DizzyEggg
|
5e781f5b3f
|
change some constants to male and female
|
2018-02-12 00:11:10 +01:00 |
|
DizzyEggg
|
2736c0fd4a
|
add more const pokemon data, clear include
|
2018-02-11 23:46:50 +01:00 |
|
DizzyEggg
|
fd17ca59b0
|
more pokemon work
|
2018-02-11 17:35:01 +01:00 |
|
DizzyEggg
|
084ba7a7a4
|
decompile all pokemon files
|
2018-02-10 13:24:03 +01:00 |
|
DizzyEggg
|
1a1bad3129
|
decompile pokemon_item_effect
|
2018-02-09 18:46:00 +01:00 |
|
DizzyEggg
|
9e7696f25a
|
decompile pokemon1
|
2018-02-09 15:55:12 +01:00 |
|
golem galvanize
|
56e1a52823
|
Fixes
|
2018-02-08 21:00:28 -05:00 |
|
DizzyEggg
|
bce01bc518
|
battle labels merge with master
|
2018-02-09 00:43:07 +01:00 |
|
Diegoisawesome
|
387dbf48d0
|
Merge pull request #202 from DizzyEggg/move_mon_data
Move data from asm to pokemon_1.c
|
2018-02-08 14:06:57 -06:00 |
|
DizzyEggg
|
9df5e16343
|
more battle labels
|
2018-02-08 12:13:29 +01:00 |
|
DizzyEggg
|
96290f4ee3
|
pokemon and battle constants
|
2018-02-08 11:17:41 +01:00 |
|
Diegoisawesome
|
772fd47564
|
Merge branch 'master' of https://github.com/pret/pokeemerald into menu
|
2018-02-07 18:06:59 -06:00 |
|
DizzyEggg
|
a10fd5a7c4
|
create more battle constants
|
2018-02-08 00:35:13 +01:00 |
|
DizzyEggg
|
caf9af321d
|
get rid of unnecessary externs
|
2018-02-08 00:00:25 +01:00 |
|
DizzyEggg
|
1a32010f13
|
iwram common symbols to c
|
2018-02-07 23:21:51 +01:00 |
|
DizzyEggg
|
5ac6cc4860
|
move battle vars to c file
|
2018-02-07 22:53:40 +01:00 |
|
DizzyEggg
|
4b7d778a5c
|
move mon data fix conflicts
|
2018-02-07 20:17:55 +01:00 |
|
DizzyEggg
|
c5e2092e8b
|
title screen with master
|
2018-02-07 20:10:56 +01:00 |
|
Diegoisawesome
|
802b505d7b
|
Merge pull request #199 from DizzyEggg/decompile_rtc_screen
decompile rtc reset screen
|
2018-02-07 13:03:59 -06:00 |
|
Diegoisawesome
|
ccae0ee970
|
Merge pull request #198 from DizzyEggg/decompile_item_icon
decompile item icon
|
2018-02-07 12:59:40 -06:00 |
|
Diegoisawesome
|
1ae5adbb19
|
Merge pull request #196 from DizzyEggg/decompile_ray_scene
Decompile rayquaza scene
|
2018-02-07 12:59:13 -06:00 |
|
DizzyEggg
|
a61dc815b0
|
bag arrow to item count plus 1
|
2018-02-07 19:51:41 +01:00 |
|
Cameron Hall
|
13bc7a8dd2
|
Merge pull request #166 from camthesaxman/battle_refactor
rename/refactor battle code
|
2018-02-07 12:46:12 -06:00 |
|
Diegoisawesome
|
3fb2471016
|
Merge pull request #197 from DizzyEggg/decompile_berry_tag_screen
Decompile berry tag screen
|
2018-02-07 12:27:25 -06:00 |
|
DizzyEggg
|
96ab6f8353
|
match secret base func and fix struct
|
2018-02-07 13:49:33 +01:00 |
|
Diegoisawesome
|
d396a8f89c
|
Merge new_menu_helpers and menu
|
2018-02-07 00:07:42 -06:00 |
|
Diegoisawesome
|
18abda9dca
|
Finish menu.s and eliminate TextColor
|
2018-02-06 20:37:54 -06:00 |
|
camthesaxman
|
c3dc14ba66
|
more renaming
|
2018-02-06 16:09:39 -06:00 |
|
Diegoisawesome
|
97c9a4ec22
|
Skip sub_819A080
|
2018-02-06 14:35:23 -06:00 |
|
camthesaxman
|
aba388d332
|
GetBattlerSpriteId -> GetAnimBattlerSpriteId
|
2018-02-06 14:00:01 -06:00 |
|
camthesaxman
|
6a4967689e
|
more renaming
|
2018-02-06 13:48:02 -06:00 |
|
camthesaxman
|
f78fa6aabf
|
rename bank to battler
|
2018-02-05 19:46:59 -06:00 |
|
camthesaxman
|
607cba8c2e
|
Merge branch 'master' into battle_refactor
|
2018-02-05 17:38:23 -06:00 |
|
DizzyEggg
|
541fef5368
|
move wild data to C
|
2018-02-05 22:27:29 +01:00 |
|
DizzyEggg
|
ae8e89a10d
|
move some pokemon data to c
|
2018-02-05 17:39:26 +01:00 |
|
DizzyEggg
|
0c60ffe22a
|
decompile title screen
|
2018-02-04 16:11:00 +01:00 |
|
PikalaxALT
|
f39053ee30
|
common syms in window.c, because why not
|
2018-02-03 10:19:56 -05:00 |
|
PikalaxALT
|
d52f52fa73
|
Merge branch 'master' into link
|
2018-02-03 09:42:19 -05:00 |
|