falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
530 Commits 7 Branches 0 Tags 278 MiB
Commit Graph

200 Commits

Author SHA1 Message Date
Jdog cd11b621c3 Modifed Npc struct w/ new float value. Match SetNpcAnimation, GetNpcAnimation, func_802CE1C (sets a float value in Npc struct) 2020-08-18 14:29:25 -07:00
Jdog b88d8f7afc Match SetNpcScale, SetNpcJumpScale 2020-08-18 14:12:26 -07:00
Jdog e8d377eda0 ...And include comment 2020-08-18 13:47:06 -07:00
Jdog d5bc60ffc9 Move todo variable declaration into if block for SetNpcCollisionSize 2020-08-18 13:46:15 -07:00
Jdog d5438113de Match SetNpcCollisionSize (Note: includes TODO) 2020-08-18 13:44:19 -07:00
Ethan Roseman 5507d9f196
Merge pull request #29 from nanaian/match-floats 
match commented functions which use floats
 2020-08-18 15:43:05 -04:00
Jdog 3a410419a8 Match SetNpcSpeed 2020-08-18 12:38:25 -07:00
Ethan Roseman 5f04055355 Newline 2020-08-18 12:43:55 -04:00
Ethan Roseman 00306ce572
Merge pull request #17 from Rainchus/master 
ebd0 matched functions
 2020-08-18 12:43:25 -04:00
Alex Bates 25eda26d0b
1024.f -> 1024.0f 2020-08-18 10:30:36 +01:00
Alex Bates 2db3e8066c
match functions which use floats 
Now that float compilation is fixed, we can uncomment these!
 2020-08-18 10:28:13 +01:00
Alex Bates 7498c2dc1c
require directory as string in INCLUDE_ASM macro 2020-08-17 22:10:44 +01:00
Alex Bates 82effcaf8e
remove temp comment 2020-08-17 18:27:37 +01:00
Alex Bates cd74f41fc0
Merge master into assert 2020-08-17 18:16:13 +01:00
Alex Bates 1a36566cdc
add ASSERT macro 2020-08-17 13:09:19 +01:00
Alex Bates 9f50926f9b
match si_handle_switch, si_handle_switch_const 2020-08-17 13:07:33 +01:00
Alex Bates 95e6bddaf8
use StaticX for static table entry structs 
Change prompted by Clover.
 2020-08-16 15:19:33 +01:00
Alex Bates 812288ca1a
add script interpreter constants 2020-08-16 07:55:51 +01:00
Alex Bates e39d02e55e
rename Script to ScriptInstance 2020-08-16 06:55:30 +01:00
Alex Bates 46c2016bf1
rename enums 2020-08-16 05:24:20 +01:00
Alex Bates 0d8814555e
rename Bytecode alias 2020-08-16 04:23:40 +01:00
Alex Bates e40b05d9c5
rename types (#20) 2020-08-16 04:19:00 +01:00
Ethan Roseman 934bd5a415
Merge pull request #18 from nanaian/f8f60 
split and match most functions at f8f60
 2020-08-15 22:37:35 -04:00
Alex Bates 1b6d31e6ee
Merge #21 into f8f60 2020-08-16 02:51:54 +01:00
Jdog 7544d4686e Add extra info to comment about file splitting issue 2020-08-15 18:51:51 -07:00
Jdog 01ecc1dd24 Added proper return types to a few script functions. Use ptrReadPos++ in places where it's not stricly necessary, but good practice. 2020-08-15 15:26:14 -07:00
Jdog 7beaf4c461 Match CloseChoice, CancelMessage, CancelMessageAndBlock. Added gCurrentPrintContext and D_802DB268 (related) 2020-08-15 14:51:44 -07:00
Jdog 98e5db0630 Match EndSpeech, ContinueSpeech, SpeakToNpc, SetMessageImages, func_802D0C94, SetMessageString. WIP SetMessageValue (issue with extra NOP) 2020-08-15 13:54:06 -07:00
Jdog 23de219c07 Match SpeakToPlayer, remove uneccessary comment, add WIP SetNpcSpeed 2020-08-15 13:11:31 -07:00
Alex Bates 66d6883188 update get_variable, get_npc signatures 2020-08-15 19:49:26 +01:00
Alex Bates 3c8f57089b remove redundancy comments 2020-08-15 19:03:29 +01:00
Alex Bates 2bd2a1c97c fix float constant 2020-08-15 19:03:29 +01:00
Jdog 7d20b29129 Match GetNpcPointer 2020-08-15 10:59:48 -07:00
Jdog 19b143fdd3 Match DeleteNpc 2020-08-15 09:57:33 -07:00
Alex Bates 25025e4c4d style: add newline at eof 2020-08-15 17:37:11 +01:00
Alex Bates 946680f312 match most functions in f8f60 2020-08-15 15:32:48 +01:00
Alex Bates 5f588bca92 match EnableStatusMenu, ShowStatusMenu 2020-08-15 13:00:51 +01:00
Alex Bates cbc5f2fe40 match AwaitPlayerApproach, IsPlayerWithin, AwaitPlayerLeave, GetDist2D 2020-08-15 13:00:13 +01:00
Rainchus 47f377eb4a ebd0 matched functions 2020-08-15 02:01:33 -05:00
Alex Bates b6f7087c82 match GetAngleToNPC and GetAngleToPlayer 2020-08-15 06:04:54 +01:00
Alex Bates 0f34468a77 match GetAngleBetweenNPCs 2020-08-15 05:55:20 +01:00
Alex Bates a25b53a8a1 name and match resolve_npc 2020-08-15 05:25:36 +01:00
Josh 541f8058e2
Merge branch 'master' into master 2020-08-14 20:37:33 -07:00
Alex Bates dd80b5a957 match RandInt 2020-08-15 04:25:48 +01:00
Alex Bates 97d6f772ee Merge master into lerp 2020-08-15 04:13:54 +01:00
Alex Bates 2a169dc34a remove redundant casts 2020-08-15 04:12:30 +01:00
Ethan Roseman 81e3edffb4
Merge pull request #13 from pixel-stuck/master 
Fix assembler bug + misc other changes
 2020-08-14 23:08:36 -04:00
Jdog 9496d860e4 Dumb mistake 2020-08-14 19:55:54 -07:00
Ethan Roseman 9a518db863 Fix hard-coded loop counter 2020-08-14 22:55:19 -04:00
Ethan Roseman 8b703053de Add TODO 2020-08-14 22:51:23 -04:00
Jdog 58b2a01a58 Remove WIP function 2020-08-14 19:51:02 -07:00
Ethan Roseman a414ce047b Merge branch 'master' into si 2020-08-14 22:50:30 -04:00
Jdog d1898f1903 Tweaks 2020-08-14 19:50:21 -07:00
dark-samus 62827e8823 actually fix assembler bug, make sure it compiles. 2020-08-14 22:24:08 -04:00
dark-samus 50f8ca824b fix bug in assembler 2020-08-14 21:54:11 -04:00
Alex Bates dae676c8af match UpdateLerp 2020-08-15 01:49:33 +01:00
Alex Bates 0d8d3e50a9 clean up MakeLerp 2020-08-15 01:17:20 +01:00
Jdog 1a4f01fe7b Fixing some issues and including removal of .s files 2020-08-14 16:31:50 -07:00
Alex Bates eb3ef759d7 Merge remote-tracking branch 'origin/master' into sr-structs 2020-08-14 23:59:42 +01:00
Alex Bates a2ab091516 Merge remote-tracking branch 'origin/sr-structs-ethan' into sr-structs 2020-08-14 23:55:03 +01:00
Alex Bates 4724a110a5 generate enums.h 2020-08-14 23:53:01 +01:00
Alex Bates 6c59c2fca7 swap bg_header raster/palette fields 2020-08-14 23:53:01 +01:00
Jdog c6058a8227 Fix so everything matches 2020-08-14 15:11:48 -07:00
Jdog 760e1351fb Working more on script-related functions 2020-08-14 15:05:05 -07:00
Ethan Roseman 6e44a205e9 OK 2020-08-14 17:53:45 -04:00
Alex Bates 5e6173f25b generate common_structs.h from star rod database 2020-08-14 21:10:34 +01:00
Ethan Roseman 6ad4581788 fix 2020-08-14 11:24:31 -04:00
Ethan Roseman 32a69b688a fix 2020-08-14 11:24:05 -04:00
Ethan Roseman 56ef80de67 Merge remote-tracking branch 'origin/master' into si 2020-08-14 11:23:15 -04:00
Ethan Roseman 7e0880dfdd Work on script interpreter 2020-08-14 11:18:05 -04:00
Ethan Roseman 1620b367ee
Merge pull request #6 from JoshW-7/master 
Added gCurrentScriptList and some more matching funcs
 2020-08-14 11:09:37 -04:00
Jdog 27407e07f8 Remove WIP function 2020-08-14 08:01:23 -07:00
Ethan Roseman 4dbaf81ed2
Merge pull request #7 from nanaian/load_map_bg 
match load_map_bg
 2020-08-14 10:58:16 -04:00
Jdog c179e51a88 Change to use ARRAY_COUNT for script list stuff 2020-08-14 07:50:44 -07:00
Jdog 73e1eff76e more refinements on script list stuff 2020-08-14 07:25:33 -07:00
Alex Bates 652d2ada46 match game_status 2020-08-14 12:47:54 +01:00
Jdog a2f9747112 Some tidying and more functions 2020-08-13 22:22:16 -07:00
Alex Bates 9eb74da229 use `char[]` type for string externs 2020-08-14 05:25:13 +01:00
dark-samus 84ecb71d07 add fairly close to matching is_ability_active commented 2020-08-14 00:20:11 -04:00
Alex Bates d041f520ab explicitly check for NULL 2020-08-14 05:15:00 +01:00
Alex Bates 78d23805e0 wip: update game_status struct 
Non-matching right now, I probably made an alignment/sizing error somewhere - proofreading would be appreciated.
 2020-08-14 05:08:55 +01:00
Ethan Roseman afc0415a2c
Merge pull request #5 from nanaian/items 
match FindItem, RemoveItem, CountFortressKeys, RemoveFortressKeys
 2020-08-13 23:28:29 -04:00
Alex Bates 86c2917cc0 match load_map_bg 
Also added three new symbols to `undefined_syms.h`. Two of these are almost certainly string literals in `load_map_bg`, but we don't have rodata capability yet so they have to be declared in a different way.
 2020-08-14 04:25:16 +01:00
Jdog 6aa628f3ac Added gCurrentScriptList and some more matching funcs 2020-08-13 19:53:38 -07:00
Alex Bates 29db02ea7d match RemoveFortressKeys 2020-08-14 03:24:21 +01:00
Alex Bates e06fbbab51 match CountFortressKeys 
Also fixed typo in the function name ('Fortess').
 2020-08-14 03:22:41 +01:00
Alex Bates f813b9ba42 add missing initialCall params 2020-08-14 03:15:33 +01:00
Alex Bates 55c38e4343 fix RemoveItem ADDU operand order 
...with evil pointer math
 2020-08-14 03:07:24 +01:00
Alex Bates 707d25f656 match RemoveItem, almost 
The generated addu instruction on the line marked with FIXME has its operands in a different order.
 2020-08-14 02:55:06 +01:00
Alex Bates 31cabbeeff match FindItem 2020-08-14 02:43:04 +01:00
Ethan Roseman 7f83b2c881
Merge pull request #4 from nanaian/battle_heap_create 
match battle_heap_create
 2020-08-13 21:23:08 -04:00
Alex Bates dfa7b096c5 match battle_heap_create 
Just flipped the condition.
 2020-08-14 01:38:16 +01:00
Jdog ef4f2e34ec blorp 2020-08-13 17:31:27 -07:00
Jdog dea08446d3 random stuff 2020-08-13 17:29:25 -07:00
Jdog 09f13acf95 Tweaks 2020-08-13 11:37:53 -07:00
Jdog ff2be1cbef Fixed some warnings 2020-08-12 22:12:32 -07:00
Jdog 56391da10c Merge remote-tracking branch 'upstream/master' 2020-08-12 22:07:53 -07:00
Ethan Roseman 7d5c31a6e6 Cleanup, starting trigger functions 2020-08-13 01:03:47 -04:00
Jdog 9b60b24cb7 removed uneccessary global vars 2020-08-12 21:10:41 -07:00
Ethan Roseman 0782fa07a3 Refactoring stuff 2020-08-12 21:56:23 -04:00