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

867 Commits

Author SHA1 Message Date
PikalaxALT
27903a102b Merge branch 'master' into berry_fix_program 2017-09-20 23:18:20 -04:00
PikalaxALT
8d5250fdaa Merge branch 'master' into lilycove_lady 2017-09-20 23:02:17 -04:00
yenatch
e7f91c65d9 Merge pull request #38 from PikalaxALT/battle_dome_cards 
Battle dome cards
 2017-09-20 22:41:18 -04:00
PikalaxALT
942fbe87d4 Populate header, label as static whatever won't break things 2017-09-20 21:03:57 -04:00
PikalaxALT
d263750f19 remaining lilycove lady functions 2017-09-20 20:48:32 -04:00
PikalaxALT
45d53d9242 Merge branch 'master' into lilycove_lady 2017-09-20 20:17:31 -04:00
DizzyEggg
0c7555e237 SetMoveEffect functionally equivalent and close 2017-09-20 22:54:26 +02:00
PikalaxALT
7c8cbc6b88 SetLilycoveContestLady 2017-09-20 16:49:22 -04:00
PikalaxALT
d22a9acc63 through sub_818E490 2017-09-20 16:12:18 -04:00
U-User-PC\User
c2f1e2fe53 decompiled up to sub_81C0510 2017-09-20 15:07:24 -04:00
scnorton
fdea92edff through sub_818E3E0 2017-09-20 11:48:11 -04:00
scnorton
213fef6042 through sub_818E308 2017-09-20 11:44:20 -04:00
scnorton
8a31e58689 sub_818E298 2017-09-20 11:30:09 -04:00
scnorton
0b81c2920a sub_818E1F4 2017-09-20 10:45:00 -04:00
DizzyEggg
3919b7130b Fix merge conflicts 2017-09-20 13:12:43 +02:00
DizzyEggg
28da80e19a battle 4 up to SetMoveEffect 2017-09-20 12:56:45 +02:00
PikalaxALT
28d0fa33fe SetLilicoveQuizLady 2017-09-19 22:35:40 -04:00
PikalaxALT
73ee165ef6 sub_818DF00 2017-09-19 22:25:31 -04:00
PikalaxALT
534dd2c4b0 sub_818DD84 2017-09-19 21:47:15 -04:00
PikalaxALT
316f9f4d83 through sub_818DD14 2017-09-19 21:28:01 -04:00
PikalaxALT
f43de6e582 Merge branch 'master' into lilycove_lady 2017-09-19 21:18:34 -04:00
PikalaxALT
5fc2c964fb Merge branch 'master' into sub_81700F8 2017-09-19 21:00:24 -04:00
PikalaxALT
2c07b94e94 Merge branch 'master' into berry_fix_program 2017-09-19 20:55:05 -04:00
PikalaxALT
d4d8f876e5 Merge branch 'master' into battle_dome_cards 2017-09-19 20:54:49 -04:00
DizzyEggg
b4875d82d5 more battle 4 2017-09-20 00:28:00 +02:00
scnorton
3b3423d1a7 sub_818DC60 2017-09-19 17:07:36 -04:00
scnorton
4e8a2c6934 SetLilycoveFavourLady 2017-09-19 16:55:53 -04:00
scnorton
b26eb6713b sub_818DB20 2017-09-19 16:32:33 -04:00
scnorton
e7e1938094 Start decompilation of lilycove_lady 2017-09-19 16:17:23 -04:00
DizzyEggg
b3c788f2ca begin work on battle4, organize battle headers 2017-09-19 21:01:12 +02:00
scnorton
bff89725ec Add battle_dome_cards header to expose symbols as needed 2017-09-19 09:46:17 -04:00
DizzyEggg
148b995189 finish egg hatch, clean up headers 2017-09-19 14:27:46 +02:00
PikalaxALT
60f8369a89 Merge branch 'master' into berry_fix_program 2017-09-18 19:24:09 -04:00
PikalaxALT
ee73040717 Merge branch 'master' into field_map_obj 2017-09-18 19:21:34 -04:00
DizzyEggg
f255cbd7dc Merge branch 'master' into decomp_egg_hatch 2017-09-18 23:50:08 +02:00
DizzyEggg
2e7127284f egg hatch almost decompiled 2017-09-18 23:48:47 +02:00
scnorton
39e6bdf094 sub_81BF7E8 2017-09-18 14:04:00 -04:00
DizzyEggg
c253bf5e75 add important headers, const ptrs and egg hatch start 2017-09-18 18:36:05 +02:00
scnorton
c5dddf41f5 sub_81BF5A4 2017-09-18 11:26:45 -04:00
PikalaxALT
8604291b0f Start decomp 2017-09-18 09:23:06 -04:00
PikalaxALT
16f2e40576 Fix naming conflicts 2017-09-17 23:42:44 -04:00
PikalaxALT
380858293e Merge branch 'master' into sub_81700F8 2017-09-17 22:58:57 -04:00
scnorton
130ba76533 remove data3.h 2017-09-17 17:50:07 -04:00
scnorton
70b1ad4857 Remaining functions 2017-09-17 15:33:26 -04:00
scnorton
b54689b9a3 Another four functions 2017-09-17 14:12:32 -04:00
scnorton
71b40f50c0 Merge branch 'master' into field_map_obj 2017-09-17 13:38:33 -04:00
scnorton
4b04e92e8b Ten more functions (remaining function count is 99) 2017-09-17 13:26:17 -04:00
PikalaxALT
3356a4fb92 Failed attempt to fix InitFieldObjectStateFromTemplate, but at least we fixed the weirdness with the double MapObject structs 2017-09-17 11:39:49 -04:00
DizzyEggg
75595f9b3d decompile battle 3 2017-09-17 17:14:32 +02:00
PikalaxALT
9b4c61658a npc_set_direction_and_anim__an_proceed 2017-09-17 10:58:24 -04:00
PikalaxALT
9dc7839dd8 callers of sub_80940C4 2017-09-17 09:49:50 -04:00
DizzyEggg
c7592bc87c finish porting cam's port 2017-09-17 15:19:15 +02:00
PikalaxALT
8ee004b9b1 sub_80940C4 which may or may not be a meme 2017-09-17 08:45:24 -04:00
PikalaxALT
bf9a00250b maybe_shadow_1 which may or may not be a shadow 2017-09-17 08:38:00 -04:00
PikalaxALT
6439551e1a Another chunk of functions, including some expanded from macros 2017-09-17 08:20:42 -04:00
DizzyEggg
a9a66b06ef start porting cam's port of battle3 2017-09-17 14:10:32 +02:00
PikalaxALT
0582b5cb90 npc_obj_ministep_stop_on_arrival 2017-09-17 08:05:33 -04:00
PikalaxALT
529ccf9a96 do_go_anim 2017-09-16 23:49:31 -04:00
PikalaxALT
432924e56d npc_apply_direction 2017-09-16 23:31:43 -04:00
PikalaxALT
4e22f1e55f MapObjectExec***Anim 2017-09-16 23:11:09 -04:00
PikalaxALT
5f189fa53b state_to_direction memes 2017-09-16 23:05:53 -04:00
PikalaxALT
eb7e52d2a8 Deswiss the cheese 2017-09-16 22:44:47 -04:00
PikalaxALT
812ad017e8 sub_80930E0 2017-09-16 22:19:23 -04:00
PikalaxALT
44e590add0 sub_8093038 2017-09-16 22:15:54 -04:00
PikalaxALT
3f2c6556cb sub_8092FF0 2017-09-16 21:59:14 -04:00
PikalaxALT
f03c0dc3b4 MoveCoords 2017-09-16 21:39:29 -04:00
PikalaxALT
951acc8c31 CheckForCollisionBetweenFieldObjects 2017-09-16 21:29:04 -04:00
PikalaxALT
c982993860 IsMetatileDirectionallyImpassable 2017-09-16 21:08:44 -04:00
PikalaxALT
fedbcd7bb7 npc_block_way 2017-09-16 18:42:35 -04:00
PikalaxALT
5812bc4ebe npc_block_way__next_tile 2017-09-16 18:33:38 -04:00
PikalaxALT
ca88036ebe npc_set_running_behaviour_etc 2017-09-16 18:29:14 -04:00
PikalaxALT
34950dbd13 remaining field object step callbacks 2017-09-16 17:34:41 -04:00
Diegoisawesome
5e12833b13 Finish merge 2017-09-16 15:50:08 -05:00
PikalaxALT
12885ca371 CopyPlayer2 2017-09-16 16:40:00 -04:00
PikalaxALT
559833ccf6 Merge branch 'master' into field_map_obj 2017-09-16 15:41:54 -04:00
Cameron Hall
19d2d73c70 Merge pull request #28 from DizzyEggg/decomp_pokemon 
decompile pokemon1/2/3
 2017-09-16 14:14:50 -05:00
PikalaxALT
052c9f0234 Fix header guards 2017-09-16 15:13:26 -04:00
PikalaxALT
18e06b480b Fix header guards 2017-09-16 15:13:06 -04:00
PikalaxALT
66fbc9753f sub_8091F94 2017-09-16 13:54:33 -04:00
PikalaxALT
ee3dc1edda Some more functions, including some swiss-cheesing that got out of hand 2017-09-16 09:43:49 -04:00
PikalaxALT
86df6d1073 Field object path movement 2017-09-16 08:44:43 -04:00
PikalaxALT
54c8580d34 rom_81700F8 2017-09-15 22:12:45 -04:00
PikalaxALT
79e8235701 AlternatelyGoInOppositeDirections 2017-09-15 21:26:56 -04:00
scnorton
1c6177f678 Rotatoes 2017-09-15 16:34:03 -04:00
scnorton
2e1ecdb877 Tridirectional spinners 2017-09-15 16:08:01 -04:00
scnorton
f6840ba7e7 RandomlyLookSouthOrEast 2017-09-15 16:00:39 -04:00
scnorton
b269048369 RandomlyLookSouthOrWest 2017-09-15 15:57:38 -04:00
scnorton
8c6367f997 RandomlyLookNorthOrEast 2017-09-15 15:53:07 -04:00
scnorton
0571056955 RandomlyLookNorthOrWest 2017-09-15 15:26:51 -04:00
scnorton
9f6a4be9f0 BerryTree 2017-09-15 14:26:01 -04:00
PikalaxALT
68c62595f5 RandomlyGoEastOrWest 2017-09-14 21:25:30 -04:00
PikalaxALT
4a1383d77b RandomlyGoNorthOrSouth 2017-09-14 21:22:14 -04:00
PikalaxALT
0ae3347e47 Rename some functions 2017-09-14 08:38:21 -04:00
PikalaxALT
64ffa8f963 Merge branch 'master' into field_map_obj 2017-09-13 19:29:19 -04:00
PikalaxALT
d72231379b FieldObjectIsTrainerAndCloseToPlayer 2017-09-13 19:13:44 -04:00
DizzyEggg
b1e90c1d50 review berry cleanings 2017-09-13 19:30:05 +02:00
DizzyEggg
c80b76e85a Merge branch 'master' into decomp_berry 2017-09-13 18:24:59 +02:00
DizzyEggg
117f8a6abd Merge branch 'master' into decomp_pokemon 2017-09-13 18:24:01 +02:00
PikalaxALT
e26501f130 Support functions for GoRandomDirections 2017-09-13 10:59:25 -04:00
scnorton
28b272bf52 NoMovement1, GoRandomDirections 2017-09-13 09:41:11 -04:00
DizzyEggg
4c16bb5ee6 decompile util.s 2017-09-13 12:58:57 +02:00
DizzyEggg
a08cd8e5a7 define number of map objects 2017-09-13 12:17:48 +02:00
DizzyEggg
5f4c5e280c berry.s decompiled 2017-09-13 11:16:26 +02:00
DizzyEggg
c9603c40d8 Merge branch 'master' into decomp_pokemon 2017-09-12 23:02:08 +02:00
PikalaxALT
9286c93c8a npc_paltag_set_load 2017-09-12 16:49:04 -04:00
PikalaxALT
c6ef344262 sub_808F254 2017-09-12 16:17:52 -04:00
DizzyEggg
8731a8caa5 one more function in pokemon1 2017-09-12 15:36:04 +02:00
DizzyEggg
0fe7030230 pokemon 3 is almost decompiled 2017-09-12 15:05:40 +02:00
DizzyEggg
6539188fa6 label and decomp some pokemon animation stuff 2017-09-12 13:05:54 +02:00
DizzyEggg
4242ede445 almost there, troubles 2017-09-12 00:01:12 +02:00
DizzyEggg
738e776630 more pokemon2 decomp 2017-09-11 22:28:36 +02:00
DizzyEggg
e69606b5cb praise cam the CHAMP man 2017-09-11 19:42:37 +02:00
DizzyEggg
8e88f2790a pokemon2 get mon data troubles 2017-09-11 18:27:54 +02:00
scnorton
9306122359 through sub_808F23C 2017-09-11 10:46:26 -04:00
scnorton
5ad282c82c GetFieldObjectTemplateByLocalIdAndMap 2017-09-11 10:29:00 -04:00
DizzyEggg
5394435520 more of pokemon3 decompiled 2017-09-11 14:42:13 +02:00
DizzyEggg
154a70e228 start pokemon3 decomp 2017-09-11 11:35:41 +02:00
DizzyEggg
48239b6598 Merge branch 'master' into decomp_script 2017-09-11 09:22:10 +02:00
DizzyEggg
a2a66181fb decompile script.s 2017-09-10 23:05:23 +02:00
scnorton
c7b1a8c3da ObjectCB_CameraObject 2017-09-10 16:13:19 -04:00
scnorton
9e0a171098 AddCameraObject 2017-09-10 16:02:20 -04:00
scnorton
79b19a36b8 UpdateFieldObjectCoordsForCameraUpdate 2017-09-10 15:35:21 -04:00
Diegoisawesome
bdb6c775d9 Remove bg.h 2017-09-09 21:48:33 -05:00
Diegoisawesome
a1368c545d Merge remote-tracking branch 'pret/master' 2017-09-09 20:54:41 -05:00
Diegoisawesome
f29fc55796 Cleanup bg.c 2017-09-09 20:52:33 -05:00
Diegoisawesome
001d1027e3 Finish bg.s, 6 nonmatching 2017-09-09 19:46:19 -05:00
DizzyEggg
10a525d5a0 decomp safari zone 2017-09-09 15:45:50 +02:00
DizzyEggg
3355389eab start coins decomp 2017-09-09 14:24:18 +02:00
PikalaxALT
ba6987b733 sub_808EB08 2017-09-08 21:35:46 -04:00
PikalaxALT
70e982d1fa npc_coords_shift 2017-09-08 21:27:02 -04:00
DizzyEggg
307278374b start money.s decomp 2017-09-09 00:45:25 +02:00
scnorton
b639ca3b15 sub_808EAB0 2017-09-08 18:12:27 -04:00
scnorton
a17a1bb27a npc_load_two_palettes__and_record 2017-09-08 18:04:23 -04:00
scnorton
dddb44e301 npc_load_two_palettes__no_record 2017-09-08 17:58:41 -04:00
scnorton
5a020a47f3 FindFieldObjectPaletteIndexByTag 2017-09-08 17:34:12 -04:00
DizzyEggg
44dbf4dea0 port pokemon size record 2017-09-08 22:23:14 +02:00
scnorton
1de5a14a35 sub_808E894 2017-09-08 15:18:03 -04:00
scnorton
db2b371e70 gpu_pal_allocator_reset__manage_upper_four 2017-09-08 15:11:29 -04:00
scnorton
67955bb51a npc_by_local_id_and_map_set_field_1_bit_x20 2017-09-08 14:36:58 -04:00
scnorton
e0b2e6cdbf GetFieldObjectGraphicsInfo 2017-09-08 14:16:44 -04:00
scnorton
823f8d6a0c get_berry_tree_graphics 2017-09-08 14:05:45 -04:00
scnorton
9b98055ecc PlayerObjectTurn 2017-09-08 13:46:21 -04:00
PikalaxALT
ddcce8c3bc FieldObjectTurn 2017-09-08 13:41:55 -04:00
DizzyEggg
8544804758 failed nonmatch attempt, better arg names given I guess 2017-09-08 18:19:20 +02:00
DizzyEggg
ba1c066d57 new game fully decompiled 2017-09-08 16:46:37 +02:00
PikalaxALT
ad99377734 unref_sub_808E504 2017-09-07 21:17:55 -04:00
PikalaxALT
a87b35f9a7 FieldObjectSetGraphicsId 2017-09-07 21:04:32 -04:00
PikalaxALT
f8e8adf82e SetPlayerAvatarFieldObjectIdAndObjectId 2017-09-07 20:04:59 -04:00
PikalaxALT
11786cc325 sub_808E38C 2017-09-07 19:45:30 -04:00
PikalaxALT
de8ef5e125 sub_808E1B8 2017-09-07 19:28:46 -04:00
PikalaxALT
341a4735bc RemoveFieldObjectsOutsideView 2017-09-07 16:09:59 -04:00
PikalaxALT
64ebd9b4fb sprite_new 2017-09-07 15:50:49 -04:00
PikalaxALT
f7742a68ae AddPseudoFieldObject 2017-09-07 14:31:23 -04:00
DizzyEggg
4a1b2967ca make lots of define files 2017-09-07 19:45:32 +02:00
shinyquagsire23
f1216076d7 Begin librfu decompilation 2017-09-07 00:55:52 -06:00
PikalaxALT
b79e3af0a8 SpawnFieldObjectInternal 2017-09-06 20:28:36 -04:00
scnorton
e0216d6045 unref_sub_808D958 2017-09-06 18:26:37 -04:00
scnorton
6448563ede unref_sub_808D77C 2017-09-06 16:14:55 -04:00
DizzyEggg
cdd36116f2 label pokemon3.s 2017-09-06 21:48:30 +02:00
scnorton
9498dfa71c InitFieldObjectStateFromTemplate (nonmatching, same as ruby) 2017-09-06 14:25:17 -04:00
DizzyEggg
c6eacc9be5 start porting pokemon1 2017-09-06 17:19:08 +02:00
scnorton
1087d1c822 GetFieldObjectIdByLocalIdAndMapInternal; rename gUnknown_02037350 to gMapObjects 2017-09-06 10:48:51 -04:00
scnorton
f15191bfc2 GetFieldObjectIdByXY 2017-09-06 09:52:31 -04:00
scnorton
ea9dabdfab TryGetFieldObjectIdByLocalIdAndMap 2017-09-06 09:49:51 -04:00
scnorton
368b0f9ee8 sub_808D450 2017-09-06 09:38:38 -04:00
scnorton
a08f11cab3 sub_808D438 2017-09-06 09:29:59 -04:00
scnorton
f677873d07 npcs_clear_ids_and_state 2017-09-06 09:25:16 -04:00
PikalaxALT
83dbdc0318 npc_clear_ids_and_state 2017-09-06 08:46:47 -04:00
PikalaxALT
63dd0ea397 Spawn source files for Field Map Obj 2017-09-06 08:35:16 -04:00
DizzyEggg
1680fc0b81 start start menu decomp 2017-09-05 13:01:24 +02:00
DizzyEggg
54b8306115 really clean up battle ai 2017-09-05 09:41:48 +02:00
DizzyEggg
2702b0ec9b decomp calc dmg and clean up battle ai 2017-09-04 21:43:13 +02:00
DizzyEggg
92892d140a begin load_save.c 2017-09-04 18:26:39 +02:00
DizzyEggg
5afd2d5bfb begin new save.c, label lots of things 2017-09-03 22:50:17 +02:00
DizzyEggg
ddf85539c1 move ram save variables to C 2017-09-03 15:39:33 +02:00
DizzyEggg
a3f602f17c begin save.s decomp, thanks revo! 2017-09-03 14:13:01 +02:00
DizzyEggg
907e281de6 decompile label more of item.s 2017-09-03 13:33:13 +02:00
DizzyEggg
50530b4666 begin decompiling item.s 2017-09-03 00:47:51 +02:00
DizzyEggg
048700fe57 decompile rtc 2017-09-02 23:28:44 +02:00
DizzyEggg
b5fea95a46 finish event data 2017-09-02 22:31:37 +02:00
DizzyEggg
a4cc67008e begin event data 2017-09-02 21:43:53 +02:00
DizzyEggg
a91ffaaa41 clean up decompress header 2017-09-02 20:08:08 +02:00
DizzyEggg
7a831c215e decompile decompress.s 2017-09-02 19:55:39 +02:00
DizzyEggg
7ecdcc5ed8 iwram and ewram vars to C 2017-09-02 17:32:34 +02:00
DizzyEggg
2089dd0f86 start labelling, decompiling sound.s 2017-09-02 16:03:53 +02:00
DizzyEggg
84240b1a5a sprite.c: move ewram, iwram, rom data 2017-09-02 13:11:19 +02:00
DizzyEggg
c146c247f2 decompile more of sprite.s 2017-09-02 01:42:44 +02:00
DizzyEggg
449d546556 split some battle files 2017-09-01 23:40:13 +02:00
DizzyEggg
0989222de3 revert fuck-up 2017-09-01 22:08:40 +02:00
DizzyEggg
ee7580753b rename sprite labels 2017-09-01 19:43:26 +02:00
DizzyEggg
1d2be3c5e8 get rid of data window 2017-09-01 17:38:28 +02:00
DizzyEggg
7daeebd3f4 decompile window.s 2017-09-01 16:53:06 +02:00
DizzyEggg
6f03356237 begin working on pokeemerald 2017-08-31 16:48:24 +02:00
YamaArashi
e0dd5ef9a7 fix build errors 2017-04-05 13:51:55 -07:00
Diegoisawesome
b95747dc69 Begin disassembling window.s 2017-03-29 19:02:15 -05:00
Diegoisawesome
0931f65fa2 Cleanup files 2017-03-27 23:38:49 -05:00
Diegoisawesome
5a8eeb353d Mostly decompile text.s 2017-03-27 19:30:49 -05:00
Diegoisawesome
1d95689766 Continue disassembling text.s 2017-03-08 14:44:44 -06:00
Diegoisawesome
20358c4c96 Begin disassembling text.s 2017-03-07 07:44:41 -06:00
ProjectRevoTPP
b2ec63d69e resolve implicit declarations and enforce warnings as errors 2017-03-05 13:27:22 -06:00
Diegoisawesome
d12fd5c5ce Merge remote-tracking branch 'refs/remotes/pret/master' 2017-03-04 23:32:12 -06:00
Diegoisawesome
56f5e8bdab Disassemble palette.s 
All but two functions match.
 2017-03-04 22:43:34 -06:00
ProjectRevoTPP
689df5cff8 finish decompiling battle_ai.c (#16) 
* partially decompile battle_ai.c up to tai60_unk

* nonmatching tai60_unk

* decompile more of battle_ai.c

* formatting

* finish porting battle_ai.c

* formatting
 2017-02-03 18:34:56 -08:00
YamaArashi
e2b834d21d begin decompiling main.s 2017-02-03 16:44:06 -08:00
YamaArashi
8f9ed6e585 decompile rng 2017-02-02 16:30:30 -08:00
YamaArashi
53935efc64 mostly finish string_util.c 2017-01-14 15:17:51 -08:00
YamaArashi
1268134668 decompile string_util 2017-01-14 14:20:49 -08:00
YamaArashi
ebf4c5ca76 decompile multiboot 2017-01-13 17:46:05 -08:00
YamaArashi
452bbe41cf port siirtc from pokeruby 2016-11-02 14:06:41 -07:00
YamaArashi
dcf291abe4 name pokemon cry voicegroup 2016-11-01 20:10:09 -07:00
Diegoisawesome
69c734c9a8 Ported libmks4agb from pokeruby (#12) 
* Port agb_flash from pokeruby

* use ramscrgen

* formatting

* delete ewram_syms.txt and iwram_syms.txt

* Finish port of agb_flash

* Ported libmks4agb from pokeruby

* Reordered declarations to match pokeruby
 2016-11-01 20:03:16 -07:00
Diegoisawesome
4df1937738 Ported task.c and others from pokeruby 2016-10-31 09:43:17 -05:00
YamaArashi
8866801ef9 make it build 2016-09-03 02:20:49 -07:00
YamaArashi
bc10815b94 reorganize headers and add CpuFill macros 2016-01-08 12:49:23 -08:00
YamaArashi
b4781cdf03 gpu_regs.c 2016-01-08 01:08:16 -08:00
YamaArashi
4e95a13295 update asm 2016-01-07 23:27:40 -08:00
YamaArashi
d35478a398 move C files 2016-01-06 18:57:32 -08:00