Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-10-01 21:07:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,046 Commits 4 Branches 0 Tags
291f2d27d36b5c437c6c1908d5217bb954799402
Commit Graph

1046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cleverking2003
291f2d27d3 Merge pull request #184 from PikalaxALT/pikalax_work 
itemtool; replace extensions for NCGR, NCLR from narcs
 2020-06-23 22:48:39 +03:00
PikalaxALT
718adb157d mapsec constants 2020-06-23 15:33:12 -04:00
PikalaxALT
aabb240e8c Resolve (map-related?) structs in unk_02034710 2020-06-23 15:09:02 -04:00
PikalaxALT
bd5894c54f Move this Makefile comment 2020-06-23 13:44:23 -04:00
PikalaxALT
0a4315909d Use HOLD_EFFECT consts in GetArceusTypeByHeldItemEffect 2020-06-23 10:55:08 -04:00
PikalaxALT
582fefc54b Match MoveItemSlotInList 2020-06-23 10:48:28 -04:00
PikalaxALT
0d9e2c1286 More ASCII strings in module 13 2020-06-22 20:32:30 -04:00
PikalaxALT
21c7537c55 These are ASCII strings 2020-06-22 20:02:38 -04:00
PikalaxALT
b26996818d First pass autogen data labels in most other overlays 2020-06-22 19:29:15 -04:00
PikalaxALT
01c45ca2e9 Data labels in module_06 2020-06-22 16:49:11 -04:00
PikalaxALT
e68b19bef9 Rename all NARC members that are NCLR/NCGR 2020-06-22 13:46:40 -04:00
PikalaxALT
6ec8f5ace7 Hold effect constants 2020-06-22 10:43:24 -04:00
PikalaxALT
b15a8c8e74 Name some fields in itemdata struct 2020-06-22 08:56:04 -04:00
PikalaxALT
1af603cdb9 Name itemtool methods and data 2020-06-21 17:39:00 -04:00
PikalaxALT
b207354025 Most of itemtool.c; draft of that first item slot function 2020-06-21 15:04:16 -04:00
red031000
d2710751ca Merge pull request #183 from martmists/new-dockerfile 
Create docker-image.yml
 2020-06-20 22:56:18 +01:00
PikalaxALT
7903fbec80 Create docker-image.yml 2020-06-20 15:24:02 -04:00
Cleverking2003
e9e192ce20 Merge pull request #174 from RoastVeg/master 
Added Dockerfile and build script
 2020-06-20 22:02:33 +03:00
Cleverking2003
5592251a94 Merge branch 'master' into master 2020-06-20 21:57:17 +03:00
Louis Hampton
998591274b Moved Docker to contrib 2020-06-20 19:57:54 +01:00
PikalaxALT
b64e629432 Merge pull request #182 from PikalaxALT/pikalax_work 
Minor fixes
 2020-06-20 14:24:42 -04:00
Louis Hampton
3cf5ef0a66 Merge branch 'master' of https://github.com/roastveg/pokediamond 2020-06-20 19:01:00 +01:00
Louis Hampton
59f6bdfa9a Newline 2020-06-20 18:57:08 +01:00
PikalaxALT
0276df552d Make __cplusplus check explicit again for Alpine's sake 2020-06-20 13:47:29 -04:00
PikalaxALT
b7b4779502 Remove explicit __cplusplus test 2020-06-20 13:29:39 -04:00
PikalaxALT
c3ef2ae6c9 Fix String struct 2020-06-20 13:15:58 -04:00
RoastVeg
6298426d9a Merge branch 'master' into master 2020-06-20 17:57:41 +01:00
Revo
16b091058e Merge pull request #179 from PikalaxALT/pikalax_work 
msgdata
 2020-06-20 12:13:15 -04:00
PikalaxALT
ae9380cad0 Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work 2020-06-20 09:48:40 -04:00
PikalaxALT
01c4d4b185 Merge pull request #180 from Cleverking2003/master 
OS_mutex
 2020-06-20 09:47:54 -04:00
PikalaxALT
faad0fa286 unk_0201B8B8.c 2020-06-20 09:39:29 -04:00
PikalaxALT
448adae329 Fix warnings in nutdata 2020-06-20 09:23:37 -04:00
PikalaxALT
a16371f513 Merge branch 'pikalax_work' of github.com:PikalaxALT/pokediamond into pikalax_work 2020-06-20 09:19:42 -04:00
PikalaxALT
1386f29730 Name methods in msgdata.c and unk_02021934.s aka string16.s 2020-06-20 09:18:15 -04:00
Egor Ananyin
3e4a9b1e3d We don't need this 2020-06-20 11:10:42 +03:00
Egor Ananyin
9fba6d2b34 OS_mutext done! 2020-06-20 11:00:20 +03:00
Egor Ananyin
abd2d1e164 conflicts 2020-06-20 09:18:43 +03:00
Egor Ananyin
70556fc300 Begin decompiling OS_mutex 2020-06-20 09:14:40 +03:00
Revo
0c8b5417ce Merge branch 'master' into pikalax_work 2020-06-19 23:07:18 -04:00
PikalaxALT
b138e415a2 Finish msgdata.c 2020-06-19 22:26:26 -04:00
PikalaxALT
669fafdcf6 through FUN_0200A76C 2020-06-19 19:32:35 -04:00
PikalaxALT
06a7bf4c8c msgdata.c through DecryptMessageDirect 2020-06-19 16:57:44 -04:00
Cleverking2003
53ac396de4 Merge branch 'master' into master 2020-06-19 22:27:30 +03:00
Cleverking2003
12c1794860 Merge pull request #178 from red031000/master 
arm7 OS_thread
 2020-06-19 22:25:19 +03:00
red031000
e19270f9b3 arm7 OS_thread 2020-06-19 19:07:34 +01:00
Revo
1c13e2f57b Merge pull request #177 from PikalaxALT/pikalax_work 
Cleanup; nutdata
 2020-06-19 11:45:40 -04:00
PikalaxALT
b133ba8ceb Fix symbols.csv for mac 2020-06-19 11:16:40 -04:00
PikalaxALT
73d7f3cc5e Define gender ratio as floats in personal.json 2020-06-19 10:58:09 -04:00
PikalaxALT
6f0dba80ac Name growth rates in personal.json 2020-06-19 10:44:15 -04:00
PikalaxALT
83f33bf8bf Annotate NARC IDs in unk_0206E5B4.s 2020-06-19 10:37:34 -04:00