ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-29 05:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,359 Commits 1 Branch 0 Tags 235 MiB
13ca2271e2
Commit Graph

309 Commits

Author SHA1 Message Date
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
PikalaxALT
9317d114a9
Merge pull request #823 from GriffinRichards/constants-strconv 
Use STR_CONV constants
 2019-10-02 09:18:48 -04:00
GriffinR
5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -04:00
PikalaxALT
7b8b5b5c8c Merge branch 'master' into gflib 2019-09-27 09:11:22 -04:00
Ariel Antonitis
208e1c9689 Removed 'Summary_' prefix. 2019-09-25 20:44:17 -05:00
Ariel Antonitis
ea638b82fa Fixed typo. 2019-09-25 20:44:17 -05:00
Ariel Antonitis
4b7f096bbd Relabeled unknown functions in pokemon_summary_screen.c 2019-09-25 20:44:17 -05:00
GriffinR
85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
DizzyEggg
54ab6b43dc Merge with master 2019-03-22 10:40:31 +01:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields 
Also some general formatting fixes for constants.
 2019-03-16 12:37:04 -05:00
Phlosioneer
146c194b0c Actually change the variable name this time 2019-03-08 03:12:08 -05:00
DizzyEggg
fddb5159b4 Merge with master 2019-03-05 21:46:45 +01:00
Phlosioneer
ac7a048380 Removed PREV and NEXT macros, changed summary name 2019-03-04 00:25:07 -05:00
Phlosioneer
05199f8fc7 Fix merge issue 2019-03-03 22:27:57 -05:00
Phlosioneer
2879fe7fe0 Merge branch 'master' into summary-screen-macros 2019-03-03 16:58:54 -05:00
Phlosioneer
63e700af6c Use macros for summary windows 
Other minor changes and fixes are included
 2019-03-03 16:50:51 -05:00
Phlosioneer
e03595a10d Bugfixes from #591 2019-03-03 09:31:08 -06:00
Phlosioneer
3716da5430 Rename macro with correct name for pixel values 2019-03-02 17:25:39 -05:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01:00
Phlosioneer
b2c92ee8c5 Missed some fill values 
Must have forgotten to check FillWindowPixelRect.
 2019-02-26 22:45:39 -05:00
Phlosioneer
72bb0daccb Merge branch 'master' into main-menu-state-machine 2019-02-26 22:34:42 -05:00
DizzyEggg
b0f46c68b9 Fix PSS icons not disappearing when learning mvoe 2019-02-24 09:43:07 +01:00
Ariel Antonitis
0c47744a63 Moved ALIGNED(4) from extern to unknown struct. 2019-02-23 22:22:38 -05:00
Ariel Antonitis
42bb5dc53d Removed unused filler by aligning adjacent variables 2019-02-23 21:55:24 -05:00
Ariel Antonitis
74a3c06270 Documented/polished pokemon_summary_screen.c 
Mostly variables mislabeled as global and some formerly unknown stuff.
 2019-02-23 21:12:35 -05:00
Phlosioneer
c96f8751cd Improve window palette macros 2019-02-21 23:27:12 -05:00
Phlosioneer
d979ac3bf3 Document main_menu state machine, name window constants 
The new names for the constants (and newly named functions) give a much
better understanding of what the window system is trying to do.
 2019-02-11 00:34:50 -05:00
DizzyEggg
aa33a61e58 Merge branch 'master' into battle_engine_v2 2019-02-07 21:17:30 +01:00
Marcus Huderle
4785a07acd Document battle factory functions 2019-02-07 12:58:09 -06:00
Slawter666
fa352cfda3 Some more labelling 2019-02-04 14:35:49 +00:00
Slawter666
3d79aeb9da More documentation 2019-02-04 12:44:09 +00:00
Slawter666
804e955c8d Label some more functions 2019-02-04 11:38:44 +00:00
Slawter666
031fd66393 Label some summary screen functions 2019-02-02 22:14:04 +00:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00
Diegoisawesome
af2c39860d Rename non-mapsec constants 2019-01-08 13:40:11 -06:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +01:00
Diegoisawesome
d004ce065c Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-31 02:30:30 -06:00
PALPATlNE
061b879561 Documentation for pokemon_summary_screens.c 2018-12-29 11:45:06 -06:00
DizzyEggg
517573eb4b Update with master 2018-12-26 17:46:51 +01:00
DizzyEggg
7f6f6c33ab Fix BgAttributes 2018-12-26 13:05:02 +01:00
Diegoisawesome
d8948a5cda Merge remote-tracking branch 'pret/master' into trade 2018-12-25 15:03:13 -06:00
melthelesbian
2dd706ca54 use max mon moves constant where able (#480) 
* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
 2018-12-25 11:50:15 -06:00
DizzyEggg
442b1826a2 asm party and fldeff clean-up 2018-12-24 21:59:05 +01:00
DizzyEggg
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
DizzyEggg
9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
DizzyEggg
ef55bdac89 Merge branch 'master' into battle_engine_v2 2018-12-22 23:57:42 +01:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
golem galvanize
085e793460 one line cleanup in summary_screen 2018-12-19 19:55:51 -05:00
Diegoisawesome
bd7c251859 Fix compressed palette alignment 2018-12-18 20:15:59 -06:00
golem galvanize
8781d969ff finish party_menu 2018-12-18 05:38:08 -05:00
DizzyEggg
9ffd0c7382 3.5 asm left 2018-12-17 23:00:08 +01:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
DizzyEggg
c2d8876174 Document PSS functions 2018-12-10 21:36:52 +01:00
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01: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
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
 2018-12-06 09:44:08 +08:00
DizzyEggg
10671a4f32 Fix split icons - hm cant forget 2018-11-23 23:16:48 +01:00
DizzyEggg
bb9dbc0c6d Merge with master 2018-11-14 22:50:27 +01:00
Diegoisawesome
9f50ba1ce3 Fix incorrect compressed types, part 2 2018-11-07 12:35:31 -06:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
DizzyEggg
0bb51037d7 Finish frontier util 2018-11-01 21:31:10 +01:00
DizzyEggg
7de1c4bd14 Make frontier util compile 2018-10-30 22:17:03 +01:00
DizzyEggg
b252bd0292 Window priority to window bg 2018-10-27 00:53:07 +02:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
DizzyEggg
d20189234e Shyly begin move animations 2018-09-10 17:11:16 +02:00
DizzyEggg
ae24f7de41
Merge pull request #11 from LOuroboros/patch-5 
Update pokemon_summary_screen.c
 2018-09-10 14:51:42 +02:00
DizzyEggg
c6c8b7b0fd Merge branch 'master' into battle_engine_v2 2018-09-10 14:49:24 +02:00
Slawter666
1ba17e1666 Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data 2018-09-09 15:51:13 +01:00
DizzyEggg
2f59df03ab Standartize AddTextPrinterParametrized functions, 2018-09-08 23:38:30 +02:00
LOuroboros
c74d38c7b8
Update pokemon_summary_screen.c 
Added Fairy Type related code.
 2018-09-08 05:31:26 -03:00
Slawter666
f45c9e75db Format templates in item_menu.c 2018-09-02 14:49:29 +01:00
Slawter666
ef4695a72c Minor labelling 2018-09-02 13:47:12 +01:00
DizzyEggg
f9af3bec9b merge with master 2018-09-02 00:07:19 +02:00
DizzyEggg
ce949ba705 document move type variables in pss 2018-09-01 18:31:53 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
0bfe894566 Merge with master 2018-08-16 22:53:01 +02:00
Diegoisawesome
e7da514382 Finish documenting and cleaning up summary_screen 
Also fix remaining nonmatchings
 2018-08-15 15:58:41 -07:00
Diegoisawesome
ac3f4fd994 Continue documentation and cleanup of pokemon_summary_screen 2018-08-15 11:51:47 -07:00
Diegoisawesome
0bc975bf57 Document and cleanup pokemon_summary_screen 2018-08-15 01:44:20 -07:00
Diegoisawesome
332a8bcb1d Extract rodata for unk_pokedex_area_screen_helper 2018-08-14 22:37:59 -07:00
Diegoisawesome
a07d69d7c2 Finish pokemon_summary_screen 2018-08-14 22:00:35 -07:00
DizzyEggg
0b22ad4ab5 make contest effect build 2018-08-15 00:01:43 +02:00
DizzyEggg
cc145a45f7 merge with master 2018-08-12 22:37:28 +02:00
Diegoisawesome
9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 12:55:21 -07:00
Diegoisawesome
2dd5fc23d4 Prepare learn_move for merge 2018-08-12 12:54:07 -07:00
DizzyEggg
957dcd01b3 merge with master 2018-08-12 12:11:35 +02:00
DizzyEggg
df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
DizzyEggg
537ebd36ac Merge contests with master 2018-08-11 19:04:28 +02:00
DizzyEggg
320120d529 Merge with master 2018-08-03 00:20:34 +02:00
DizzyEggg
0663c142b7 Add split icons 2018-07-29 19:54:23 +02:00
DizzyEggg
4080c6f831 Decompile a few pokemon summary screen functions 2018-07-28 23:26:19 +02:00
Diegoisawesome
156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07:00
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
Diegoisawesome
23b050a99e Update naked attribute and ASM_DIRECT to NAKED macro 2018-05-11 17:24:32 -05:00
PikalaxALT
4488bbe9e6 Merge branch 'master' into contest 2018-05-11 09:25:26 -04:00
PikalaxALT
c15b50ac68 through prints_contest_move_description 2018-05-11 08:44:21 -04:00
Diegoisawesome
4e2886db81 Use song constants 2018-05-11 00:33:32 -05:00
PikalaxALT
7fdebe0d15 through sub_80DAE0C 2018-05-10 17:54:30 -04:00
DizzyEggg
25c669e36b decompile item 2018-04-29 13:36:26 +02:00
KDSKardabox
ac7d69eb6e Done requested changes 2018-04-12 22:36:07 +05:30
KDSKardabox
b74b576418 Fix 2 non-matchings 2018-03-29 10:43:49 +05:30
DizzyEggg
18d8c9382a
Use EGG_HATCH_LEVEL define 2018-03-06 13:29:10 +01:00
DizzyEggg
1972303792 type and ability names to C 2018-02-26 14:29:17 +01:00
DizzyEggg
919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
Diegoisawesome
a4787bc06a
Merge pull request #207 from DizzyEggg/decompile_pokemon_123 
Decompile and clean pokemon files
 2018-02-11 22:13:15 -06:00
PikalaxALT
ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05:00
DizzyEggg
2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
DizzyEggg
bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01:00
DizzyEggg
caf9af321d get rid of unnecessary externs 2018-02-08 00:00:25 +01:00
Diegoisawesome
18abda9dca Finish menu.s and eliminate TextColor 2018-02-06 20:37:54 -06:00
PikalaxALT
d52f52fa73 Merge branch 'master' into link 2018-02-03 09:42:19 -05:00
Diegoisawesome
10037ac0e1 Fix spelling of 'Parametrized' to 'Parameterized' 2018-01-24 01:03:20 -06:00
PikalaxALT
d4e8c20f84 Merge branch 'master' into link 2018-01-21 23:20:13 -05:00
PikalaxALT
d35cf06854 nonmatching sub_801120C 2018-01-21 18:25:23 -05:00
Devin
35cc20c9aa Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms 2018-01-21 15:22:05 -05:00
Devin
c408110319 Fix file permissions. 2018-01-19 15:06:49 -05:00
DizzyEggg
a6072ae293 decompile option menu 2018-01-16 18:59:06 +01:00
Diegoisawesome
3241b1405f Add symbols to music_player_table 
Also rename gMPlay structs to gMPlayInfo
 2018-01-09 21:30:54 -06:00
ProjectRevoTPP
03a2a3b81b fourteenth wave of graphics.s dumps 2017-12-28 17:15:37 -05:00
ProjectRevoTPP
0af942e0b8 twelfth wave of graphics.s dumps 2017-12-26 01:39:01 -05:00
DizzyEggg
f4ab21ee67 Merge branch 'master' into decompile_use_pokeblock 2017-12-16 11:42:59 +01:00
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
DizzyEggg
bb1ae5f857 Merge branch 'master' into decompile_use_pokeblock 2017-12-09 21:24:47 +01:00
DizzyEggg
6561b62986 start pokeblock feed 2017-12-09 21:23:40 +01:00
camthesaxman
19fbf024ff fix merge conflicts 2017-12-05 12:42:30 -06:00
camthesaxman
caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
DizzyEggg
ce6e97fa0b sprite data fields to array 2017-12-02 21:44:50 +01:00
PikalaxALT
ef18d3b8ec Decompile asm/unk_text_util.s 2017-11-23 11:23:05 -05:00
DizzyEggg
a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
camthesaxman
5ea2f463d7 also fix ambiguous MON_DATA_SPD_EV and MON_DATA_SPD2 constants 2017-10-26 13:47:14 -05:00
camthesaxman
1bb931245b use SPEED instead of SPD in mon data constants 2017-10-23 20:43:26 -05:00
U-User-PC\User
2082c0491b more bool8 stuff 2017-10-22 21:00:08 -04:00
U-User-PC\User
72dcfeddd7 all done(I hope) 2017-10-22 15:12:48 -04:00
U-User-PC\User
52d368a29a all done 2017-10-22 15:01:34 -04:00
U-User-PC\User
fd464a546c updating 2017-10-21 14:11:32 -04:00
U-User-PC\User
77ef72f782 updating 2017-10-20 16:31:12 -04:00
U-User-PC\User
2a60aefed6 updating 2017-10-20 16:28:38 -04:00
U-User-PC\User
c63acde250 updating 2017-10-20 16:18:29 -04:00
U-User-PC\User
7a515ea1f9 fixed 2017-10-18 20:05:26 -04:00
U-User-PC\User
79a947ed16 git made me 2017-10-18 19:52:33 -04:00
U-User-PC\User
11f9a27640 decompiled up to sub_81C3D54 2017-10-18 19:25:08 -04:00
U-User-PC\User
f6f81f34b1 decompiled up to sub_81C228C 2017-10-09 16:49:14 -04:00
U-User-PC\User
f438734192 fixing merge conflicts 2017-10-09 13:32:57 -04:00
U-User-PC\User
d361f7030a decompiled up to sub_81C20F0 2017-10-09 13:17:13 -04:00
U-User-PC\User
ddc2e96825 egg pls save me 2017-10-04 13:27:50 -04:00
U-User-PC\User
0a88d1042a decompiled up to sub_81C13B0 2017-10-03 15:42:28 -04:00
U-User-PC\User
40eb03542b decompiled up to sub_81C1040 2017-09-23 20:23:55 -04:00
U-User-PC\User
3d16b884b9 updated branch with fix 2017-09-22 18:28:18 -04:00
U-User-PC\User
ee277bff16 decompiled up to sub_81C0A50 2017-09-22 15:17:59 -04:00
U-User-PC\User
70e0a357be why are these functions bullying me 2017-09-20 21:25:48 -04:00
U-User-PC\User
c2f1e2fe53 decompiled up to sub_81C0510 2017-09-20 15:07:24 -04:00