Commit graph

768 commits

Author SHA1 Message Date
Gabriel Ravier
2cd6692a00
Merge branch 'develop' into feature/makeFlagsMacros 2019-05-13 19:41:44 +02:00
Gabriel Ravier
81a1df6ed4
Merge branch 'develop' into feature/improveNpcAct 2019-05-13 19:41:36 +02:00
Gabriel Ravier
e9d766677e
Merge branch 'develop' into feature/improveF 2019-05-13 19:41:15 +02:00
Gabriel Ravier
843677bd7a
Merged 'develop'. 2019-05-13 19:31:15 +02:00
Gabriel Ravier
11f6bf9f16
Merge pull request #18 from Clownacy/master
Merge Clownacy/master into master
2019-05-13 19:17:40 +02:00
Gabriel Ravier
a0f4bae094
Moved and renamed flag macros
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-13 18:58:29 +02:00
Clownacy
9b82baeb02 Made MiniMap.cpp actually ASM-accurate 2019-05-13 17:50:09 +01:00
Gabriel Ravier
0651f1b910
Cleaned up NpcAct000.cpp
Also changed regex to "((//|\;)[^ \t\n]|(for|while|if|while|do|void|int|bool)\((for|while|if|while|do)\ \(.*\)\;|\(\ |\ \)|//\ [a-z]|\ \ )|break;\n[\t]*case"

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-13 18:35:35 +02:00
Clownacy
cc1df04fab Fix broken code in MyChar.cpp 2019-05-13 16:28:02 +01:00
Clownacy
9398314af6 Shut up some MSVC2003 warnings, and comment on another one
I'm not fixing that last one, since I'd rather futureproof the code in
the event the SDL2 devs update the function to use size_t.
2019-05-13 15:45:45 +01:00
Clownacy
c8630a8669 Removed the stdint.h replacement for MSVC2003 2019-05-13 15:24:34 +01:00
Clownacy
676ee004fe Removed the dependency on stdint.h
This doesn't exist in MSVC2003, and nothing in the Linux port's debug
symbols indicate Pixel used it.
2019-05-13 15:18:33 +01:00
Clownacy
a94d9a4367 Made NpcAct100.cpp ASM-accurate
See #74. Finally, I figured out what might be causing the register
differences. Considering how long this NPC's code is, it makes sense
that there might be some vestigial checks.
2019-05-13 14:23:08 +01:00
Clownacy
f04872b91b Made MyChar.cpp ASM-accurate
See #74
2019-05-13 14:17:03 +01:00
Gabriel Ravier
7f75ad6ef8
Added comment for macros 2019-05-13 14:20:39 +02:00
Gabriel Ravier
df119e69d7
Removed redundant semi-colons 2019-05-13 14:19:58 +02:00
Clownacy
d4d82d0ba8 Made MycHit.cpp ASM-accurate 2019-05-13 12:19:04 +01:00
Clownacy
3bccba6236 Made NpcHit.cpp ASM-accurate 2019-05-13 02:46:07 +01:00
Clownacy
fb87b8dd57 Made NpChar.cpp almost ASM-accurate
For some damn reason I can't replicate SetBulletObject stack frame
layout.
2019-05-12 23:47:31 +01:00
Clownacy
a711b34de7
Merge pull request #29 from GabrielRavier/addCommentsToBosses
Add comments to bosses
2019-05-12 19:56:25 +00:00
Clownacy
106f81130c
Merge pull request #30 from GabrielRavier/improveAToE
Improve files starting with A to E
2019-05-12 19:56:01 +00:00
Clownacy
e48b3897e9
Merge pull request #31 from GabrielRavier/improveGToK
Improve files starting with G to K
2019-05-12 19:54:57 +00:00
Gabriel Ravier
16140d1903 Revert bad "clip rect" changes
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-12 16:52:13 +02:00
Gabriel Ravier
36e0bcb381 Merge branch 'master' into addBetterMakefileDebugFlags 2019-05-12 16:04:26 +02:00
Gabriel Ravier
983dad37f8 Merge branch 'master' into addCommentsToBosses 2019-05-12 16:04:24 +02:00
Gabriel Ravier
9f9e319127 Merge branch 'master' into improveAToE 2019-05-12 16:04:11 +02:00
Gabriel Ravier
da07dc5ab5 Merge branch 'master' into improveGToK 2019-05-12 16:04:10 +02:00
Gabriel Ravier
22f994eee7 Merge branch 'master' into makeFlagsMacros 2019-05-12 16:04:06 +02:00
Gabriel Ravier
98c5db93f2
Merge pull request #17 from Clownacy/master
Merge Clownacy/master into master
2019-05-12 16:02:01 +02:00
Clownacy
9da92097a8 Deobfuscate some TimeCounter-related values 2019-05-11 02:22:10 +01:00
Clownacy
69a2697a0a Made MycParam.cpp ASM-accurate 2019-05-11 01:20:11 +01:00
Clownacy
f3d073affe Made Profile.cpp mostly ASM-accurate
The original code used MessageBoxA, but we haven't ported any of the
WinAPI stuff yet, so there's no hWnd available.
2019-05-10 20:40:58 +01:00
Gabriel Ravier
bf4aa6b6c0 Did some formatting and grammatical/orthographic corrections
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-10 09:46:05 +02:00
Gabriel Ravier
18ae3e6bf7 Corrected technically orthographically false comment
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-10 09:15:31 +02:00
Gabriel Ravier
b06988f2a4 Merge branch 'master' into addBetterMakefileDebugFlags 2019-05-10 08:50:46 +02:00
Gabriel Ravier
cc01791f68 Merge branch 'master' into addCommentsToBosses 2019-05-10 08:50:43 +02:00
Gabriel Ravier
6c42892d96 Merge branch 'master' into improveF 2019-05-10 08:49:32 +02:00
Gabriel Ravier
929adaabf0 Merge branch 'master' into makeFlagsMacros 2019-05-10 08:49:26 +02:00
Gabriel Ravier
38114d2fee Merge branch 'master' into improveGToK 2019-05-10 08:46:46 +02:00
Gabriel Ravier
b706209bd1 Correct some orthograph and some formatting
I hope "cliprect" isn't actually a word or something

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-10 08:46:41 +02:00
Gabriel Ravier
82dc512539
Merge pull request #16 from Clownacy/master
Merge Clownacy/master into master
2019-05-10 08:38:21 +02:00
Clownacy
25085ca6de Fix DoConfig's gamepad button mapping
It didn't match the real DoConfig at all
2019-05-09 19:21:18 +01:00
Clownacy
e4b120959c
Merge pull request #26 from Moocow9m/patch-1
Fix DoConfig read
2019-05-09 17:59:09 +00:00
Clownacy
db96e7de94 Useless #include 2019-05-09 18:46:41 +01:00
Clownacy
b5699d9760 SDL's docs specifically calls these 'scancodes' not 'scan codes' 2019-05-09 18:45:28 +01:00
Moocow9m
bb829bfc82
Fix DoConfig read
DoConfig shifts all joypad variables up by one each save. This fixes that.
2019-05-08 11:46:46 -07:00
Clownacy
9f181c1864
Merge pull request #25 from GabrielRavier/improveM
Improve files starting with M
2019-05-08 18:40:00 +00:00
Gabriel Ravier
2578302bb5 Reverted formatting change Clownacy didn't like
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 19:42:24 +02:00
Gabriel Ravier
0e5bcf26e0 Revert MapName.cpp to Shift-JIS
Also "optimised" is valid english lol

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 19:38:11 +02:00
Gabriel Ravier
c6bcbeab2f Revert "corrections" of "colour" to "color", makes style inconsistent though :(
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 18:01:15 +02:00