1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-05-18 13:23:23 -07:00
Commit Graph

372 Commits

Author SHA1 Message Date
Connor Olding 5fbb56f472 update lips; use new features 2016-01-16 20:00:23 -08:00
Connor Olding 5e684e6aeb remove m64p stuff for now; it's too broken 2016-01-13 09:33:41 -08:00
Connor Olding 1acbaba58c be super strict about globals
theres still a lot of work to do\nsince most scripts just set globals explicitly\nthis is still better than implied globals though
2016-01-13 09:21:24 -08:00
Connor Olding 072e8c7a7a update lips; set up proper modules 2016-01-13 07:56:18 -08:00
Connor Olding 72bf0471ad fix headers 2016-01-12 16:14:54 -08:00
Connor Olding 6cda92f07b update readme 2016-01-12 16:12:53 -08:00
Connor Olding d0ccf16dff reorganize scripts 2016-01-12 16:05:31 -08:00
Connor Olding 1128998b96 add support for OoT 2016-01-12 08:52:51 -08:00
Connor Olding 04099adc05 sanity 2016-01-12 08:13:26 -08:00
Connor Olding a04f7a669e implement actor var selection/changing 2016-01-12 07:44:41 -08:00
Connor Olding d80d9db0b2 work on onscreen actor num/var control 2016-01-12 06:59:29 -08:00
Connor Olding c5eaf96e1a add really rough onscreen printing 2016-01-11 16:42:40 -08:00
Connor Olding ea1e055e87 use a table of versions to asms 2016-01-10 12:54:16 -08:00
Connor Olding 5b11974962 reimplement inject overflow check 2016-01-10 12:37:35 -08:00
Connor Olding 8f599e1e9f optimize basic hook for size 2016-01-10 11:58:16 -08:00
Connor Olding c3c9d632e0 skip loading scene/room actors/objects 2016-01-09 09:20:02 -08:00
Connor Olding 5eff669148 add Epona to oneshot.lua for OoT 2016-01-08 04:45:40 -08:00
Connor Olding 530c9e9126 update lips 2016-01-05 16:48:13 -08:00
Connor Olding 2e1d8b324d swap dpad up/down with left/right 2016-01-03 04:44:53 -08:00
Connor Olding 2ee3f54173 implement spawning for MM again 2016-01-03 04:36:14 -08:00
Connor Olding ccdb3b130d always spawn any missing objects 2016-01-03 04:16:22 -08:00
Connor Olding fabb1852e0 simplify format_out arguments 2016-01-02 07:21:40 -08:00
Connor Olding 05b0e8aa8f implement more branch-immediate pseudo-instructions 2016-01-02 07:14:35 -08:00
Connor Olding 02fc5395a0 implement some basic branch pseudo-instructions 2016-01-02 06:00:05 -08:00
Connor Olding c0be8f2ef2 another place 2016-01-02 04:42:17 -08:00
Connor Olding 4679ee99a6 use relative labels in more places 2016-01-02 04:26:18 -08:00
Connor Olding 5653e730aa use token index for relative labels 2016-01-02 04:23:33 -08:00
Connor Olding e4ff34e0c0 use relative labels 2016-01-02 04:07:18 -08:00
Connor Olding 4b234fc26a little tweaks 2015-12-30 02:35:58 -08:00
Connor Olding 12daa5e493 update lips 2015-12-28 22:05:00 -08:00
Connor Olding 5432a79b3c add epona glitch monitoring script 2015-12-28 22:04:39 -08:00
Connor Olding 2e42819b99 move actor iteration funcs to their own file 2015-12-28 21:48:55 -08:00
Connor Olding bc6037092e print to file 2015-12-26 23:22:15 -08:00
Connor Olding 2d9ca2fae6 update lips 2015-12-26 23:13:30 -08:00
Connor Olding 37d711dbec fix comment 2015-12-26 19:32:31 -08:00
Connor Olding 488aeb9bd0 hook debug printing in OoT debug rom 2015-12-26 19:06:50 -08:00
Connor Olding bb5c778b0f update lips 2015-12-26 19:02:33 -08:00
Connor Olding 1f88d9423a update lips 2015-12-25 17:18:47 -08:00
Connor Olding ea40b7fde7 epona storing in cheat menu 2015-12-24 16:31:30 -08:00
Connor Olding 33c876b8b2 more lips stuff i might not commit to
no pun intended
2015-12-23 20:23:58 -08:00
Connor Olding 2cbb2edf70 style change: four space indentation for instructions 2015-12-22 17:33:38 -08:00
Connor Olding 14ab1ee731 rename bomb tornado file 2015-12-22 16:08:10 -08:00
Connor Olding 6a641f6b90 add actor/object spawning to MM (J) 1.0 2015-12-22 16:04:06 -08:00
Connor Olding 9fbe275189 add object spawning to MM 2015-12-22 14:12:20 -08:00
Connor Olding fa082d3a1d misc 2015-12-22 06:37:40 -08:00
Connor Olding 108c4189ef add object spawning to OoT 2015-12-22 06:35:50 -08:00
Connor Olding 49e51cd6e7 shoehorn writing anywhere with lips 2015-12-22 04:56:40 -08:00
Connor Olding e490c712e6 use unsigned loads instead 2015-12-21 03:17:47 -08:00
Connor Olding 19518cbb8a update lips 2015-12-21 03:15:19 -08:00
Connor Olding 7edf81077a update lips 2015-12-19 10:17:53 -08:00
Connor Olding d5c7097713 base spawn asms on one file 2015-12-18 23:46:30 -08:00
Connor Olding ce1d440bfb add OoT spawning
the two asms will be partly merged once i have that ability
2015-12-18 17:05:31 -08:00
Connor Olding 4e6f6a114b refactor inject as a function 2015-12-18 15:18:08 -08:00
Connor Olding faa95f6285 improve spawning
add button hold delay and set actor variable to link's rotation
2015-12-18 14:04:44 -08:00
Connor Olding 4dd384b62e more sophisticated spawning 2015-12-18 11:57:48 -08:00
Connor Olding 080bb9340d add barebones actor spawning asm 2015-12-18 10:00:15 -08:00
Connor Olding 9a2757d16d (attempt to) abide to calling conventions
i haven't checked if i need double-word alignment
2015-12-17 22:59:32 -08:00
Connor Olding 7c35d99a9f rename main.lua to be less misleading 2015-12-17 16:08:33 -08:00
Connor Olding e65ff9bae6 use new stack instructions 2015-12-17 08:52:48 -08:00
Connor Olding 54b0a63759 update lips 2015-12-17 08:52:34 -08:00
Connor Olding 9cd9381463 fix asm length calculation 2015-12-17 07:37:06 -08:00
Connor Olding 8a666f7dfc update lips 2015-12-17 07:28:30 -08:00
Connor Olding e29199c9e0 add asm injection scripts 2015-12-16 18:04:57 -08:00
Connor Olding c142d4df33 redo headers 2015-12-16 03:19:34 -08:00
Connor Olding 9af8b79ac2 add pt 2015-12-16 02:55:20 -08:00
Connor Olding 6bb341437b describe Lua scripts 2015-12-16 02:53:31 -08:00
Connor Olding b29bad17cc disable this until i bother writing a 5.3 bit op wrapper 2015-12-11 00:45:22 -08:00
Connor Olding bafaa7a1af update for new gui.text behaviour 2015-12-11 00:44:18 -08:00
Connor Olding a957617933 useless update 2015-12-11 00:43:39 -08:00
Connor Olding c450e7b535 fix actor lister 2015-12-11 00:41:57 -08:00
Connor Olding cfd57b391b Revert "Revert "update for new readbyterange behaviour""
This reverts commit adab471173.
2015-12-11 00:38:50 -08:00
Connor Olding a087f2bff0 don't unpause the game if it wasn't already 2015-12-11 00:36:29 -08:00
Connor Olding 9ea38f25be add an observatory flag 2015-12-11 00:34:02 -08:00
Connor Olding fcbedca20f remove read-3/write-3 functions 2015-12-03 02:50:31 -08:00
Connor Olding b2817c9b5c implement m64p ROM reading and such 2015-12-03 02:06:18 -08:00
Connor Olding 90d30e218f support both bizhawk and m64p 2015-11-28 15:39:19 -08:00
Connor Olding fdbcc5d527 remove luanet crap 2015-11-27 21:37:48 -08:00
Connor Olding 44fdfdb684 basic mupen64plus support 2015-11-27 08:48:47 -08:00
Connor Olding 433a99cb43 misc monitor tweaks 2015-11-25 03:02:21 -08:00
Connor Olding 577d4a5b4f move assembler to https://github.com/notwa/lips 2015-11-22 13:40:01 -08:00
Connor Olding 7bd3e81713 ignore highest bit of .org directive
are you *really* gonna be assembling files over 2GiB?
2015-11-22 13:30:11 -08:00
Connor Olding 3cc511182a handle immediates in place of most offsets 2015-11-22 13:28:47 -08:00
Connor Olding 86ce3ea0d7 reimplement parsing; resolve defines after lexing 2015-11-22 12:30:55 -08:00
Connor Olding d808160d68 tokenize all at once (WIP) 2015-11-22 02:46:38 -08:00
Connor Olding 1b23db1a71 unfudge LI/LA a little 2015-11-22 00:24:28 -08:00
Connor Olding 5b35cc2155 use proper instruction type names 2015-11-22 00:09:54 -08:00
Connor Olding 9ec4d0f406 add reg# register aliases 2015-11-21 23:50:25 -08:00
Connor Olding cdeb4b0489 pseudo-instruction crap 2015-11-21 19:30:02 -08:00
Connor Olding f673308437 various
fix jump and branch destinations.
note: branching is no longer compatible with CajeASM.

make LUI dumb: only use 'UPPER' with LI/LA.
note: this is very incompatible with CajeASM.
add LUUI pseudo-instruction to use 'UPPER' instead of 'LOWER'.

fix SUBI/SUBIU parsing.

fix LI for values under 0x10000.

pass filename through main().
tell Lexer our filename.
don't print filename in Dumper since it's irrelevant.
2015-11-21 17:35:43 -08:00
Connor Olding 4a45b3c913 implement LI and LA 2015-11-21 15:36:54 -08:00
Connor Olding 5397085f01 various
alias ZERO register to R0.
lex decimal numbers properly.
lex octal and negative numbers.
lex directives properly.
fix byte dumping.
fix UPPER behavior...?
2015-11-21 15:04:30 -08:00
Connor Olding 39ffd10fff new dumper to support directives
the old one could still have a place,
with its simplicity and speed.
also, screw versioning.
2015-11-21 13:53:52 -08:00
Connor Olding 70827cd830 simplify size handling 2015-11-21 00:01:15 -08:00
Connor Olding 88b230d3c7 define formats in the instruction table
this greatly reduces code bloat,
and made it easier to implement a few instructions.
everything is still very untested, however.
2015-11-20 23:29:57 -08:00
Connor Olding 29de0e8d53 only specify one instruction list 2015-11-20 20:45:59 -08:00
Connor Olding 70e4d28442 add remaining fp instructions 2015-11-20 20:26:30 -08:00
Connor Olding bfcd75f5b6 add fp compare instructions 2015-11-20 19:36:52 -08:00
Connor Olding 05c3a18886 use filename in errors; fix JALR 2015-11-20 16:44:40 -08:00
Connor Olding 3b92aad4a0 set up as a proper module 2015-11-20 16:21:13 -08:00
Connor Olding cd8ea7b3d7 refactor to use classes; no hardcoded stuff 2015-11-20 15:27:22 -08:00
Connor Olding ebc9987a38 implement relative branches; fix register orders 2015-11-20 15:01:04 -08:00
Connor Olding cf413a7ab1 a little cleanup 2015-11-20 14:12:02 -08:00
Connor Olding 5822b592f1 add basic fp arithmetic 2015-11-20 14:00:02 -08:00
Connor Olding 301bfc99f8 add fpu registers and basic moves 2015-11-20 13:28:10 -08:00
Connor Olding 8407c4e016 recognize pseudo & fp instructions
i hope this is all of them.
2015-11-20 12:49:26 -08:00
Connor Olding c9671ef4b5 add semi-functional MIPS assembler 2015-11-20 11:53:09 -08:00
Connor Olding 0f59cdce5e race tweaks 2015-11-15 20:04:49 -08:00
Connor Olding 628bc7b49c add half-broken race file creator 2015-11-15 19:59:10 -08:00
Connor Olding eb73ba66b2 oot compat, basic timestop 2015-11-15 17:03:27 -08:00
Connor Olding 46280a4343 many many progress menu items
looking to replace oneshot.lua
2015-11-15 10:08:10 -08:00
Connor Olding f2839bb69c allow a single function for simple callbacks 2015-11-15 09:43:29 -08:00
Connor Olding f6d20caa4b OoT soft reset... kinda 2015-11-15 08:41:40 -08:00
Connor Olding b78b3567d0 use voidout type that works with OoT 2015-11-15 08:29:06 -08:00
Connor Olding 42493fd48c OoT "compatibility" 2015-11-15 08:05:33 -08:00
Connor Olding 8ed4aee8ce add necessary store/restore addrs for most versions 2015-11-15 07:13:57 -08:00
Connor Olding 1ccc4891be add more addresses across versions 2015-11-14 19:16:13 -08:00
Connor Olding a1babce6bb change L to Levitate to D-Up
i know it's not as catchy :c
2015-11-14 17:07:53 -08:00
Connor Olding 301acb98ea add any item any time cheat 2015-11-14 16:45:36 -08:00
Connor Olding 3f7e7a1a0d make L close menu in greedy mode 2015-11-14 16:42:50 -08:00
Connor Olding b169d1d11e implement greedy menu input handler 2015-11-14 16:30:04 -08:00
Connor Olding 2436eee982 alternate control scheme for menus 2015-11-14 14:59:37 -08:00
Connor Olding f0eac171f9 run menu handling while emu is paused 2015-11-14 13:46:04 -08:00
Connor Olding 454d59dcca typo 2015-11-14 13:25:48 -08:00
Connor Olding 20901442ba fixed soft reset 2015-11-14 11:22:41 -08:00
Connor Olding f45745d8b8 cleanup 2015-11-14 10:31:10 -08:00
Connor Olding 2bab9c7d27 use triforce transition if they aren't killed 2015-11-14 10:13:54 -08:00
Connor Olding 8792a100a5 add transition (fadein/fadeout) killer
also took out soft reset since it's broken
2015-11-14 09:20:36 -08:00
Connor Olding d7f18ed09b give days their names 2015-11-14 08:59:30 -08:00
Connor Olding bb2132a78f save scene & pos feature; serialize stored values 2015-11-14 08:57:37 -08:00
Connor Olding b392d2134f split most menus into files 2015-11-12 09:23:46 -08:00
Connor Olding 5590ffaa77 a few more known flags 2015-11-12 09:14:57 -08:00
Connor Olding 3ed1c091cd many more menus 2015-11-12 09:09:14 -08:00
Connor Olding adab471173 Revert "update for new readbyterange behaviour"
This reverts commit 71f44db82e.
2015-11-11 17:32:21 -08:00
Connor Olding 3342eb90d3 add map select (warp) menu 2015-11-10 05:59:03 -08:00
Connor Olding c082e4ee2f some deku king chamber flags 2015-10-27 17:55:12 -07:00
Connor Olding 71f44db82e update for new readbyterange behaviour 2015-10-27 17:54:52 -07:00
Connor Olding 35c853788f capitalization and such 2015-08-12 18:58:20 -07:00
Connor Olding e44eb31329 entrance names: the fixening 2015-08-12 18:36:34 -07:00
Connor Olding 0236ae8530 finish up exit dumper 2015-08-12 18:20:07 -07:00
Connor Olding 12b5e399fc fix up pirate room names 2015-08-12 17:58:14 -07:00
Connor Olding 31d4641bbe fix up entrance names a bit 2015-08-12 01:49:22 -07:00
Connor Olding 0b9d5ccb83 write dumper for all exit values 2015-08-12 01:35:56 -07:00
Connor Olding d4c612bc15 apparently this flag was set at some point 2015-08-12 01:35:10 -07:00
Connor Olding 61c71376c7 add some camera variables 2015-08-12 01:34:56 -07:00
Connor Olding 0fd6015fde lemon-scented cleanup 2015-07-23 15:23:29 -07:00
Connor Olding 727c74e6aa rough exit calculator, scene/entrance names 2015-07-22 23:00:27 -07:00
Connor Olding 7b147f9653 warn about printf truncation 2015-07-22 22:51:31 -07:00
Connor Olding c77eea55d1 addresses (active_sword -> sword_active) 2015-05-27 22:22:48 -07:00
Connor Olding 75446a692b many more MM addresses 2015-05-26 21:29:42 -07:00
Connor Olding 6dec3657a7 reverse order of messages 2015-05-26 11:02:58 -07:00