ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-19 21:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
718 Commits 1 Branch 0 Tags 235 MiB
d160ca4679
Commit Graph

513 Commits

Author SHA1 Message Date
PikalaxALT
12885ca371 CopyPlayer2 2017-09-16 16:40:00 -04:00
PikalaxALT
c6bb13939e state_to_direction memes 2017-09-16 16:10:55 -04:00
PikalaxALT
559833ccf6 Merge branch 'master' into field_map_obj 2017-09-16 15:41:54 -04:00
Diegoisawesome
5a74c0e913 Merge remote-tracking branch 'pret/master' 2017-09-16 14:24:47 -05: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
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
a082f92581 sub_8091110 2017-09-16 08:13:37 -04:00
Diegoisawesome
6ba1dc8169 Merge remote-tracking branch 'pret/master' 2017-09-16 03:21:42 -05:00
Diegoisawesome
448497dfbb Finish extracting data2.s 2017-09-16 03:21:09 -05:00
PikalaxALT
3e9e4b13ec MoveFieldObjectInNextDirectionInSequence 2017-09-15 21:39:24 -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
bf101743c2 RandomlyLookEastOrWest 2017-09-15 14:42:54 -04:00
scnorton
7440bba1b1 RandomlyLookNorthOrSouth 2017-09-15 14:36:54 -04:00
scnorton
9f6a4be9f0 BerryTree 2017-09-15 14:26:01 -04:00
PikalaxALT
9a13b1f34e FaceFixedDirection 2017-09-14 21:30:14 -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
c1c12981fe LookRandomDirections helpers 2017-09-13 21:11:59 -04:00
PikalaxALT
2895765964 LookRandomDirections 2017-09-13 20:36:58 -04:00
PikalaxALT
ddf712beac sub_808F8BC 2017-09-13 20:34:25 -04:00
PikalaxALT
c1f5183f40 Three-direction get-running-past-facing callbacks 2017-09-13 20:26:08 -04:00
PikalaxALT
6b906d95b9 Three more running-past-facing-direction callbacks 2017-09-13 20:22:38 -04:00
PikalaxALT
a04666e2d3 Running-past facing direction callbacks (North/East restricted) 2017-09-13 19:54:43 -04:00
PikalaxALT
f9de01dc86 sub_808F638 and sub_808F648 2017-09-13 19:45:59 -04:00
PikalaxALT
64ffa8f963 Merge branch 'master' into field_map_obj 2017-09-13 19:29:19 -04:00
PikalaxALT
c2e31f0618 sub_808F608 2017-09-13 19:21:05 -04:00
PikalaxALT
d72231379b FieldObjectIsTrainerAndCloseToPlayer 2017-09-13 19:13:44 -04: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
5f4c5e280c berry.s decompiled 2017-09-13 11:16:26 +02:00
Diegoisawesome
3e1c6024a7 Continue extracting from data2.s 2017-09-13 01:10:12 -05:00
scnorton
c8696f1552 npc_paltag_by_palslot 2017-09-12 17:35:08 -04: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
e5ff9e3db1 will fix later i guess 2017-09-12 10:39:17 +02:00
Diegoisawesome
a9f09ca051 Begin renaming string.s unknowns 2017-09-12 01:23:34 -05:00
Diegoisawesome
04598f0749 Rename data2 external file symbols 2017-09-12 00:00:05 -05: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
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
2b9b75a824 sub_808F1B4 2017-09-11 10:40:34 -04:00
scnorton
7c40186e35 FindFieldObjectTemplateInArrayByLocalId 2017-09-11 10:31:09 -04:00
scnorton
5ad282c82c GetFieldObjectTemplateByLocalIdAndMap 2017-09-11 10:29:00 -04:00
scnorton
bd9b81546f through FieldObjectGetBerryTreeId 2017-09-11 10:19:03 -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
scnorton
bcf844f965 sub_808F080 2017-09-10 17:47:37 -04:00
scnorton
8456991837 Functions for retrieving flag and script pointer given map object id 2017-09-10 17:11:03 -04:00
DizzyEggg
a2a66181fb decompile script.s 2017-09-10 23:05:23 +02:00
scnorton
b263dcc7cf FieldObjectSetDirection 2017-09-10 17:04:37 -04:00
scnorton
69a1ff984d obj_unfreeze 2017-09-10 16:57:08 -04:00
scnorton
251360624a CopySprite 2017-09-10 16:53:08 -04:00
scnorton
a89da3ae31 Functions operating on the camera object 2017-09-10 16:36:19 -04:00
scnorton
4dfae8b9e4 FindCameraObject 2017-09-10 16:32:26 -04: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
5a5ea8c740 UpdateFieldObjectsForCameraUpdate 2017-09-10 15:56:03 -04:00
scnorton
d8e2238086 FieldObjectDoesZCoordMatch 2017-09-10 15:54:41 -04:00
scnorton
79b19a36b8 UpdateFieldObjectCoordsForCameraUpdate 2017-09-10 15:35:21 -04:00
scnorton
5bb5886774 npc_coords_shift_still 2017-09-10 15:14:46 -04:00
scnorton
1ed1fbab1c sub_808EBA8 2017-09-10 15:12:48 -04:00
Diegoisawesome
a1368c545d Merge remote-tracking branch 'pret/master' 2017-09-09 20:54:41 -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
019935fb73 npc_coords_set 2017-09-08 21:28:22 -04:00
PikalaxALT
70e982d1fa npc_coords_shift 2017-09-08 21:27:02 -04:00
PikalaxALT
43c3b9fdff unref_sub_808EAC4 2017-09-08 21:25:20 -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
scnorton
07b1668623 pal_patch_for_npc_range 2017-09-08 17:21:58 -04:00
scnorton
e6e0dc80f6 pal_patch_for_npc 2017-09-08 17:17:03 -04:00
DizzyEggg
5eff1d5bdb label gHealthBoxesIds 2017-09-08 22:27:27 +02:00
DizzyEggg
44dbf4dea0 port pokemon size record 2017-09-08 22:23:14 +02:00
scnorton
2d3ce87c4c sub_808E8F4 2017-09-08 15:27:08 -04:00
scnorton
444887ba22 sub_808E8C0 2017-09-08 15:21:32 -04: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
d3edf5642e sub_808E82C 2017-09-08 15:08:10 -04:00
scnorton
8ef5d05955 sub_808E7E4 2017-09-08 15:05:04 -04:00
scnorton
782f21f63e sub_808E78C 2017-09-08 14:58:17 -04:00
scnorton
62eca95358 sub_808E75C 2017-09-08 14:53:00 -04:00
scnorton
05685f3961 FieldObjectGetLocalIdAndMap 2017-09-08 14:40:34 -04:00
scnorton
67955bb51a npc_by_local_id_and_map_set_field_1_bit_x20 2017-09-08 14:36:58 -04:00
scnorton
511474cc15 FieldObjectHandleDynamicGraphicsId 2017-09-08 14:20:13 -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
4d01d400a8 port lottery corner 2017-09-08 18:48:55 +02:00
DizzyEggg
a55c5925a6 label gMapHeader 2017-09-08 18:31:57 +02:00
DizzyEggg
ba1c066d57 new game fully decompiled 2017-09-08 16:46:37 +02:00
Diegoisawesome
6c6ebd9268 Fix nonmatchings, stuck on CopyRectToBgTilemapBufferRect 2017-09-08 01:02:35 -05: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
113482a7cc sub_808E16C 2017-09-07 18:54:51 -04:00
PikalaxALT
44be18e1df RemoveFieldObjectIfOutsideView 2017-09-07 17:41:56 -04:00
PikalaxALT
341a4735bc RemoveFieldObjectsOutsideView 2017-09-07 16:09:59 -04:00
PikalaxALT
f128e4c4f0 SpawnFieldObjectsInView 2017-09-07 15:58:38 -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
PikalaxALT
12562aa2d4 MakeObjectTemplateFromFieldObjectTemplate 2017-09-07 14:16:30 -04:00
DizzyEggg
4a1b2967ca make lots of define files 2017-09-07 19:45:32 +02:00
DizzyEggg
8bfdc42d0e name b message functions, split battle2 2017-09-07 16:35:25 +02:00
Diegoisawesome
3f61c01afa Stuck on CopyToBgTilemapBufferRect 2017-09-06 21:59:34 -05:00
PikalaxALT
112177b57f Slight touching up of data3.s; denote boundaries of data/field_map_obj.s for future split 2017-09-06 22:46:44 -04:00
PikalaxALT
1f83a2885e Through MakeObjectTemplateFromFieldObjectGraphicsInfo 2017-09-06 22:33:11 -04:00
PikalaxALT
22c8367956 SpawnSpecialFieldObject 2017-09-06 22:00:51 -04:00
PikalaxALT
bd4b3c4c6d SpawnFieldObject 2017-09-06 21:46:53 -04: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
398186d7c4 RemoveFieldObjectInternal 2017-09-06 18:12:44 -04:00
scnorton
942400ddbf RemoveFieldObject 2017-09-06 17:55:36 -04:00
scnorton
e060123648 GetAvailableFieldObjectSlot 2017-09-06 17:25:20 -04:00
DizzyEggg
cb9b14a3e5 split lilycove_lady 2017-09-06 22:27:17 +02:00
scnorton
6448563ede unref_sub_808D77C 2017-09-06 16:14:55 -04:00
DizzyEggg
d41cc4c8d0 clean a bit more ewram.txt 2017-09-06 22:01:43 +02:00
DizzyEggg
cdd36116f2 label pokemon3.s 2017-09-06 21:48:30 +02:00
DizzyEggg
33ee3115ab add glink defines from pokeruby 2017-09-06 21:18:50 +02:00
DizzyEggg
b7d75cb615 split item effects and organize sym ewram 2017-09-06 21:11:10 +02:00
scnorton
9498dfa71c InitFieldObjectStateFromTemplate (nonmatching, same as ruby) 2017-09-06 14:25:17 -04:00
DizzyEggg
0cc4cadd2f label pokemon2 and some box stuff 2017-09-06 18:34:18 +02: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
f3f8c5ec2c sub_808D4F4 2017-09-06 09:42:10 -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
DizzyEggg
b6661e7736 name some pokemon and battle labels 2017-09-05 20:13:34 +02:00
DizzyEggg
e18241d8ec dumped a lot of strings 2017-09-05 17:04:11 +02: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
Diegoisawesome
afa3bf20c6 Continue work on bg.s 2017-09-05 01:02:31 -05:00
Diegoisawesome
ea33650dc1 Begin disassembling bg.s 2017-09-04 21:18:52 -05: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
1a9b1a45ca split battle rodata 2017-09-04 15:05:11 +02:00
DizzyEggg
0b39bfb2c2 label a bit of battle transition 2017-09-04 13:46:03 +02:00
DizzyEggg
a83501f3bc find pokemon animation and recorded 2017-09-04 13:23:40 +02:00
DizzyEggg
4bf54bfdd4 split roamer and decor inventories 2017-09-04 13:01:57 +02:00
DizzyEggg
75a94ce58e split and label 2017-09-04 12:22:04 +02:00
DizzyEggg
5afd2d5bfb begin new save.c, label lots of things 2017-09-03 22:50:17 +02:00
DizzyEggg
d09f39e971 label battle animation unknowns 2017-09-03 20:13:23 +02:00
DizzyEggg
9dedb3a8bd split more battle buffer files 2017-09-03 18:58:40 +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
d5806bfe6a label some item functions 2017-09-03 00:00:38 +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
a47face8cf split battle buffer files 2017-09-02 20:56:53 +02:00
DizzyEggg
7a831c215e decompile decompress.s 2017-09-02 19:55:39 +02:00
DizzyEggg
591837e3c3 decompile sound.s 2017-09-02 17:03:46 +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
24a1e3e544 decompile more of sprite.s 2017-09-02 12:12:09 +02:00
DizzyEggg
c146c247f2 decompile more of sprite.s 2017-09-02 01:42:44 +02:00
DizzyEggg
26bf61e06f start decompiling sprite.s 2017-09-02 00:21:11 +02:00
DizzyEggg
bc5acf7394 more splitting, move ewram sprite vars to C 2017-09-02 00:09:46 +02:00
DizzyEggg
449d546556 split some battle files 2017-09-01 23:40:13 +02:00
DizzyEggg
b614971cba find b scripting commands table, thx revo 2017-09-01 22:35:45 +02:00
DizzyEggg
cb12aaec65 git commit -m "label sprite for real this time" 
git commit -m
 2017-09-01 22:29:13 +02:00
DizzyEggg
ee7580753b rename sprite labels 2017-09-01 19:43:26 +02:00
DizzyEggg
6987dd9a21 decompile text window 2017-09-01 19:01:58 +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
camthesaxman
cbe13acff1 split out battle_3.s 2017-07-29 15:18:01 -05:00
camthesaxman
16d30072cb fix the alignment, maybe? 2017-07-28 19:53:49 -05:00
camthesaxman
b89f1431f8 stop optimizing literal pool loads 2017-07-28 19:26:59 -05:00
Diegoisawesome
b95747dc69 Begin disassembling window.s 2017-03-29 19:02:15 -05:00