Alexander Faßbender
2a4966887c
match battle partner/move functions ( #319 )
2021-07-18 16:21:37 +01:00
ThreeMustyFears
3d2798422a
Match func_8003DFA0 and func_8003E1D0 ( #316 )
...
* match func_8003DFA0 and func_8003E1D0
* update return types
* Delete func_8003DFA0.s
* Delete func_8003E1D0.s
* made requested changed to npc.c
* moved prototypes and changed return type to void
* Correcting a couple mistakes
My bad I think void should have been an EffectInstance* which I got from looking at the matching INCLUDE ASM in src/4ac90_len_3910.c and I forgot to modify src/evt/fx_api.c as it has a prototype for these functions in it
* Update fx_api.c
* further cleanup
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-07-17 23:45:08 +09:00
Ethan Roseman
1beee32dc6
Message work ( #315 )
...
* msg wip
* var name restoration
* rodata padding
* New compiler that supports .bss section attribute!
* -fno-common & cleanup
* clean
* extern bss for now
* msg work
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "8588eaae7b"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "8588eaae7b"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* msg_draw_prim_rect
* draw_message_window
* render_messages
* draw_string progress
* remove dumb file
* images, data
2021-07-17 03:27:27 +09:00
alex
fcf84633a7
Split jp map_data ( #313 )
...
* split jp mapfs
* fix us pm_map_data
* jp title_data
* oops
* avoid placing build files in assets/
* match load_hit_asset
* match load_stage_collision
* name gMapConfig and gMap
2021-07-16 20:08:22 +09:00
Ethan Roseman
f02743e1cb
Tidying and msg.c work ( #311 )
...
* undefined syms cleanup
* moving all remaining undefined funcs to dead_syms (as they're dead)
* Rename and update MessagePrintState
* msg wip
* B9D60 -> msg
* msg stuff
* .
* PR stuff
2021-07-13 22:43:14 +09:00
Ethan Roseman
03eccf598f
Misc decomp 534 ( #301 )
...
* splat disasm update
* a little
* splat jtbl robustness
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "150dcdebfd"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "150dcdebfd"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* some rodata stuff
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "21bf3a381c"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "21bf3a381c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* progress
* All area rodata migrated
* UnkDistFunc
* SwitchToPartner
* UnkNpcAIFunc23
* UnkNpcAIFunc24
* UnkNpcAIFunc25
* cleanup & symbol_addrs
* disasm update
* work on fio.c (6240)
* data 'n' tst_04 funcz
* more tst_
* misc & PlayFX3D
* two end_01 funcs
* more shtuff
* fix
* fix2
2021-07-09 00:53:00 +09:00
Ethan Roseman
41417f4d70
All area rodata migrated ( #299 )
...
* splat disasm update
* a little
* splat jtbl robustness
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "150dcdebfd"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "150dcdebfd"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* some rodata stuff
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "21bf3a381c"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "21bf3a381c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* progress
* All area rodata migrated
2021-07-03 20:22:53 +09:00
Ethan Roseman
647db26552
Mass function rename from Star Rod + a couple funcs ( #298 )
...
* .
* yaml update
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "cd690f725d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "cd690f725d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* separate main bss syms
* renames and one match
* SR symbol rename
* fix symbol_addrs
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "5fa8aa24ca"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "5fa8aa24ca"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* remove old artifacts
2021-06-30 11:27:12 +09:00
Ethan Roseman
8c690d23d1
Assorted Morsels ( #297 )
...
* bss
* 3 audios
* d5a50 stuff
* some icon funcs
* get_icon_render_pos
* PlayerLandJump
* func_80248170
* cleanup
* splat update prep
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "81c4b35b89"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "81c4b35b89"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "9b791a654a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "9b791a654a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "2cf2a5e5d8"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "2cf2a5e5d8"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* fix loop in PaperMarioNpcSprites
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "2fab217750"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "2fab217750"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* add sha1 to yaml
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "426b08200d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "426b08200d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* varTable -> union :( + player_api funcs
* 6 more
* 4 more
* 5 mo
* 1 mo
* 1 mo 2
* 5 mo
* player_jump
* 3 mo
* some 18F340
* 6 more
* 6 mo
* nm
* 1
* 1 more
* some PR feedback
* symbol addr update
* UnsetCamera0Flag1000
* SetPlayerSpriteSet2
* action 18
* encounter + a smol hammer
* git subrepo pull (merge) tools/splat
subrepo:
subdir: "tools/splat"
merged: "8cf482fe57"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "4c0a93eaed"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* 3 and cleanup
* undo yucky union
* PR comments
* get_enemy_safe
* cleanup
* move VirtualEntity
* attempt to fix doxygen
* 3, cleanup
* broken
* fixed!
* progress
* 2
* 3 and cleanup
* 6 map_api funcs
* 3 map api
* CreateNpc
* BringPartnerOut & NpcFlyTo
* npc_api complete
* update_scripts
* 4 si bois inc si_execute_next_command
* update symbol_addrs
* 2 more and cleanup
* camera struct & do_camera_type_0
* PR feedback
* small tidying
2021-06-21 13:30:57 +09:00
Ethan Roseman
e9176cb08f
Most of player_api and 18F340 ( #296 )
...
* bss
* 3 audios
* d5a50 stuff
* some icon funcs
* get_icon_render_pos
* PlayerLandJump
* func_80248170
* cleanup
* splat update prep
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "81c4b35b89"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "81c4b35b89"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "9b791a654a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "9b791a654a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "2cf2a5e5d8"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "2cf2a5e5d8"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* fix loop in PaperMarioNpcSprites
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "2fab217750"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "2fab217750"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* add sha1 to yaml
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "426b08200d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "426b08200d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* varTable -> union :( + player_api funcs
* 6 more
* 4 more
* 5 mo
* 1 mo
* 1 mo 2
* 5 mo
* player_jump
* 3 mo
* some 18F340
* 6 more
* 6 mo
* nm
* 1
* 1 more
* some PR feedback
* symbol addr update
* UnsetCamera0Flag1000
* SetPlayerSpriteSet2
* action 18
* encounter + a smol hammer
* git subrepo pull (merge) tools/splat
subrepo:
subdir: "tools/splat"
merged: "8cf482fe57"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "4c0a93eaed"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* 3 and cleanup
* undo yucky union
* PR comments
* get_enemy_safe
* cleanup
* move VirtualEntity
* attempt to fix doxygen
2021-06-16 18:52:15 +09:00
pixel-stuck
e61e67ea9b
[WIP] Work on npc.c ( #295 )
...
* formatting
* format + misc work
* lots of work on npc.c
* PR comments, asm delet + other misc fixes
* missed one
* temporarily remove cleanup step for testing
* test fix for splat
* test
* o2
* o0
* fix Yay0decompress.c bug
* debug logging
* stuff
* stuff2
* restore stuff
* more PR comments and some general cleanup
* NPC flags + improve match + misc
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-06-15 17:05:16 +09:00
Ethan Roseman
6ec6aab984
Mostly hud stuff ( #294 )
...
* bss
* 3 audios
* d5a50 stuff
* some icon funcs
* get_icon_render_pos
* PlayerLandJump
* func_80248170
* cleanup
2021-06-07 10:15:48 -04:00
Ethan Roseman
08aad50545
50% Functions Decompiled ( #292 )
...
* part 2 dun
* DivActorLevel4
* Dist3D
* SetBackgroundAlpha & FreeIcon
* update symbol_addrs
* UnkBackgroundFunc3
* anudder
* UnkFogFunc2
* Disasm most remaining data
* model stuff and renames
* update symbol_addrs
* bss
* a5dd0 data migration
* entity funcs
* render_entities
* render_shadows
* entity_get_collision_flags
* 2 map api
* 2 mo
* progress
* fix 2 non-matchings
* clean
* pause_draw_menu_label
* another
* progs
* 50% function count
* remove commented funcs
* symbol_addrs
* PR comments
2021-05-08 14:34:57 +09:00
Ethan Roseman
ad80f13149
Battle Area + Effect Data ( #289 )
...
* part 2 dun
* DivActorLevel4
* Dist3D
* SetBackgroundAlpha & FreeIcon
* update symbol_addrs
* UnkBackgroundFunc3
* anudder
* UnkFogFunc2
* Disasm most remaining data
* model stuff and renames
* update symbol_addrs
2021-05-02 04:03:42 +09:00
Ethan Roseman
b2cc576bda
Shops and Battle Areas ( #287 )
...
* fix BSS bs
* more shop stuff
* gamestatus stuff
* name and some nonmatchings
* cleanup
* clean
* battle area data
* DeadUnkFloatFuncAbs
* symz
* removing stuff
* Battle Area Deduplication
* UnkFogFunc
2021-04-30 02:38:02 +09:00
Maide
0ec2010b9b
dro and flo ( #285 )
...
* dro_01
* UnkFunc25
* UnkFunc26
* UnkFunc27
* Fixup old UnkFuncs
* a
* UnkFunc28
* UnkFunc29
* UnkFunc30
* dro_02
* UnkFunc30
* UnkFunc31
* UnkFunc33
* UnkFunc34
* UnkFunc35
* UnkFunc36
* Fix splat.yaml and remove asm
* Fixed finally
* a
* flo_00
* update func
* flo_03
* flo_07
* flo_08
* UnkFunc37 & 38
* UnkFunc39
* UnkFunc40
* a
* Some copies
* Func
* flo_09
* Fix linker alignment warnings
* flo_10 (partial)
* flo_11
* flo_12
* flo_13
* UnkFunc41
* Copy funcs
* UnkFunc42
* flo_14
* UnkFunc43
* UnkFunc44
* flo_16
* UnkFunc44
* UnkFunc45
* flo_15
* flo_17
* flo_18
* flo_19
* flo_21
* flo_22
* flo_23
* flo_24
* flo_25
* cya asm
* a
* a
* Finally OK!
* Alter scripts
* Fix food func
* PR1
* PR2
* Add tree structs to disassembly and change names
* tabs to spaces and callback &
* Fix the script too
* PR3
* Fucking newlines
2021-04-30 02:09:30 +09:00
Ethan Roseman
1c0d26e6c6
Tidying and Shops ( #282 )
...
* render_curtains
* cleanup
* more cleanup
* cleanup
* update symbol addrs
* asm update
* shop progress
* more cleanup
* update symbol_addrs
* asm cleanup
* .
* new data splits
* rename stuff
* .
* .
* PR stuff
2021-04-27 02:47:38 +09:00
alex
683d0857ff
Fix many compiler & linker warnings ( #281 )
...
* fix ld warnings
* fix NpcSettings warn
* get_screen_coords
* various
* bloop
* update INSTALL.md for versioned baseroms
2021-04-25 03:56:22 +09:00
Ethan Roseman
011a957985
Compiler's Worst Nightmare ( #278 )
...
* 25.00%
* remove __naked__ and name printContext->unk_4E8
* change rodata strings to []
* actually remove
* fix headers
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "eec8ac0cb8"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "eec8ac0cb8"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* progress
* .
* .
* some stuff
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "4e012eaad6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "imgflip"
commit: "4e012eaad6"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* :OK:
* 2 graphics funcs!
* woo
* more
* match func_802A15A0_733670 (#276 )
* .
* gfx_draw_frame, other fixes
* macros begone!
Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
2021-04-23 20:55:30 +09:00
alex
df3ef58ba1
Crystal Palace reflection include & name some segments ( #274 )
...
* src/evt section
* evt data
* entity
* update entity func names
* names
* reflection wip
* lol
* ~pra_01
* nabbed em
* match func_80240500_D4D540
* match func_802402F0_D4D330
* last pra include func git add -A
* gCurrentCamID
* reflection.inc.c for pra_01
* reflection.inc.c
* rm
* match a few in tst_11
* use npc flags
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-21 23:19:31 -04:00
Ethan Roseman
8e4df57de7
25.00% ( #268 )
...
* 25.00%
* remove __naked__ and name printContext->unk_4E8
* change rodata strings to []
2021-04-19 02:25:32 +09:00
alex
8e47263c3f
Action segments ( #259 )
...
* rm debug.i
* match phys_update_action_state
* world/action/idle.c
* ~update_npcs
* document npc_iter_nop
* fix diff.py expected/ location
* struct/naming updates
* update Npc struct via clover
* coverage
* ~world_action_idle_update
* walk, run actions
* jump
* land
* name temp anim
* size for struct
* yucky
* talk
* stuff
* all the action segments
* ~func_802B61E4_E23444
* ~func_802B6000_E287F0
* cleanup
* remove step_entity_updatecmd comment
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-17 20:16:13 +09:00
pixel-stuck
3fd09d2a7c
Decompile most of code_b72b0_len_15ed0.c ( #256 )
2021-04-13 01:07:05 +01:00
Maide
8fbdc83055
area_dgb ( #254 )
...
* area_arn/arn_02
* Signed StoryProgress enum
* arn_03
* Update scripts
* arn_04
* fix kmr
* Broken for Ethan
* Commiting before maybe breaking everything
* Fix star rod
* Add funcs
* arn_05
* arn_07
* arn_08/arn_09
* Cleanup prototypes
* arn_11/12/13
* Cleanup
* Cleanup
* Review
* Add npc flag
* Comments
* dgb_01
* dgb_02
* dgb_03
* dgb_04
* Fixup commented functions
* dgb_05
* dgb_06
* dgb_07
* dgb_08
* dgb_09
* dgb_10
* dgb_11
* dgb_12
* dgb_15
* dgb_13
* dgb_14
* dgb_16
* dgb_17
* dgb_18
* Dumb newlines
* Replacing some funcs, scared I'll break everything to commit NOW!
* More
* More
* More
* a
* b
* c
* d
* e
* f
* remove asm
* Move newlines
2021-04-09 02:42:36 +09:00
Ethan Roseman
353ab8d051
f270, world, and more ( #246 )
...
* 415D90 decomp
* code_415D90 rodata migration
* data migration, decomp
* .
* .
* .
* 4 funcs
* non-matching
* audio part 1
* audio work
* end of snd
* update_symbol_addrs
* .
* 🐔
* .
* sfx func names
* bgm
* more audio
* .
* a few audio funcs
* update section length
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "82ff308caf"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "82ff308caf"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "4e9d3cdf85"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "4e9d3cdf85"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* misc-decomp power
* sound
* 4 mo
* more changes
* .
* some f270
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "1c8ff4ec3f"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "1c8ff4ec3f"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "f0633ecdbc"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "f0633ecdbc"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix is_logo image size
* .
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "4be92a4786"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "4be92a4786"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* state_step_pause
* almost
* fixing symbol_addrs and disasm
* update symbol_addrs
* .
* fix Matrix4f usages
* .
* .
* update_symbol_addrs
* fixes
* I hate bitfields
* load_map_by_IDs
* cleanup
* state_step_logos
* more cleanup
* .
* splat
* PR comments
2021-04-02 03:00:29 +09:00
Maide
21917eb3dc
Enum all the things ( #241 )
2021-03-29 16:34:39 +09:00
Maide
a8e5d9b1d9
world/area_arn/arn_02 ( #236 )
...
* area_arn/arn_02
* Signed StoryProgress enum
2021-03-29 01:05:56 +01:00
Ethan Roseman
f46f5d16ac
Dead code data+rodata disasm ( #228 )
...
* dead code disasm
* yaml splitting
* rodata almost done
* OK
* some decomp
* DeadUnk1
Co-authored-by: Rain <rainmachus@gmail.com>
2021-03-26 10:52:37 -04:00
Ethan Roseman
4ace4bb0d9
415D90 and Audio ( #229 )
...
* 415D90 decomp
* code_415D90 rodata migration
* data migration, decomp
* .
* .
* .
* 4 funcs
* non-matching
* audio part 1
* audio work
* end of snd
* update_symbol_addrs
* .
* 🐔
* .
* sfx func names
* bgm
* more audio
* .
* a few audio funcs
2021-03-26 10:46:45 -04:00
Maide
f03f08a38f
Battle items ( #222 )
...
* a
* Dizzy Dial
* Dried shroom
* Dusty Hammer
* Egg Missile
* Electro Pop
* Fire Flower
* Food
* Fright Jar
* Hustle Drink
* Insecticide Herb
* Life Shroom
* Mushroom
* Mystery (partial)
* Pebble
* Please Come Back
* POW Block
* Repel Gel
* Shooting Star
* Sleepy Sheep
* Snowman Doll
* Stone Cap
* Stop Watch
* Strange Cake
* Strange Cake fixed
* Stone Cap broked
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "db0b6f0cba"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "db0b6f0cba"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Static all the things
* Tasty Tonic
* Thunder Bolt
* Thunder Rage
* Ultra Shroom
* Unknown Item
* Volt Shroom
Format & coverage
* Item Ids
Co-authored-by: Lavos1 <saintlouisxx@gmail.com>
2021-03-24 04:39:43 -04:00
Ethan Roseman
9e06bed2b2
Fixed gGameStatusPtr ( #220 )
...
* fixed gGameStatusPtr
* fixed non-matching
* PR comments
2021-03-22 22:25:48 -04:00
Ethan Roseman
577b3e3ebe
Misc decomp ( #215 )
...
* Misc early code decomp
* Make expected script
* fix m2ctx
* gOverrideFlags & set/unset macros
* update symbol addrs
* Cleanup and PR comments
* oops
2021-03-19 19:25:14 +09:00
Ethan Roseman
943f612050
Work on 1b40 ( #213 )
...
* rodata migration
* a5dd0 rodata migration
* e79b0 rodata migration
* more rodata migration
* more migration
* goombario rodata
* SetNpcCollision32
* removing old stuff
* oops
* UnkBackgroundFunc
* removing unnecessary files
* UnkBackgroundFunc2
* UnkStarFuncs
* .
* misc star decomp and AddHP
* oops
* AddFP
* fix offset, update symbol_addrs
* .
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "f602284b3e"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "f602284b3e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* re-disasm
* fix effect disasm
* oops
* fix lullaby
* fixing rodata
* load_engine_data
* removing undefined syms
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "3a68ae30a7"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "3a68ae30a7"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Skip exceptasm extraction
2021-03-15 22:30:09 +09:00
Ethan Roseman
a1f7a21114
Rodata migration + other goodz ( #208 )
...
* rodata migration
* a5dd0 rodata migration
* e79b0 rodata migration
* more rodata migration
* more migration
* goombario rodata
* SetNpcCollision32
* removing old stuff
* oops
* UnkBackgroundFunc
* removing unnecessary files
* UnkBackgroundFunc2
* UnkStarFuncs
* .
* misc star decomp and AddHP
* oops
* AddFP
* fix offset, update symbol_addrs
* .
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "f602284b3e"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "f602284b3e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* re-disasm
* fix effect disasm
* oops
* fix lullaby
2021-03-13 00:53:11 +09:00
Ethan Roseman
555102c17c
Misc decomp 3 ( #202 )
...
* data fixes, SoundID rename
* ?
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "36030366ce"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "36030366ce"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
2021-03-10 14:13:02 +09:00
Ethan Roseman
b7a2673672
Misc decomp and rodata migration ( #198 )
...
* misc decomp...2
* re-run disasm
* more shtuff
* rodata stuff
* more rodata stuff
* more rodata migration
* rodata stuff 🐱
* meowp
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "199d63489a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "199d63489a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "b0f5ab40a2"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "b0f5ab40a2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "4e79cc1a4e"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "4e79cc1a4e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "53370e3217"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "53370e3217"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* OK
* symbol_addrs script update
* PR comments
* fake gross match
2021-03-07 18:32:24 +00:00
alex
9e6cf181bd
Several partner-related functions ( #196 )
...
* decompile bombette and bow related functions
* decompile bombette and bow related functions
* decompile bombette and bow related functions
* decompile partner function - mainly bombette and bow
* decompile Goombario functions
* OK
* resolve my comments on #190
* rename IsPartnerImmobile funcs
* rm old asm
Co-authored-by: brotenko@gmail.com <brotenko@gmail.com>
2021-02-27 20:05:02 -05:00
Ethan Roseman
6d66d5fedb
Odds and Ends ( #189 )
...
* fixing segment
* redoing subtree
* git subrepo clone https://github.com/ethteck/splat.git tools/splat
subrepo:
subdir: "tools/splat"
merged: "99cf514297"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "99cf514297"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix symbol_addrs
* sweet victory
* reformat collision_main_lateral.s
* Lots of matches, fixed diff.py issue, improved coverage.py
* some more
* update symbol_addrs
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "c46026725a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "c46026725a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* update symbol_addrs
* fix disasm
* 2 mo
* Jenkinsfile
* PR comments
* check_input_status_menu, removing some macros
* a few funcs
* assist updates
* UnkAlphaFunc
* UnkPartnerPosFuncs
* Deleting stuff
* oopz
* dead_syms.txt, UnkNpcAIFunc14
* update symbol_addrs
* cleanup
* symbol_addrs
* cleanup
2021-02-20 23:41:30 +09:00
Ethan Roseman
ee7f09bb2b
Snibblets, Tidbits, and Morsels ( #188 )
...
* fixing segment
* redoing subtree
* git subrepo clone https://github.com/ethteck/splat.git tools/splat
subrepo:
subdir: "tools/splat"
merged: "99cf514297"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "99cf514297"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix symbol_addrs
* sweet victory
* reformat collision_main_lateral.s
* Lots of matches, fixed diff.py issue, improved coverage.py
* some more
* update symbol_addrs
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "c46026725a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "c46026725a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* update symbol_addrs
* fix disasm
* 2 mo
* Jenkinsfile
* PR comments
2021-02-18 20:54:07 +09:00
Ethan Roseman
8afd8bf1f1
Various meta work and some decomp ( #184 )
...
* some
* DeadUnkTexturePanFunc
* DeadUnkTexturePanFunc2
* move guOrthoF to os
* up
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "ae2cce951d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "ae2cce951d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Updating bin dir
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "5517f520e4"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "5517f520e4"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "fe48dc3b3a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fe48dc3b3a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* revert garbage
* :OK:
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "8c86e4b95b"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "8c86e4b95b"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* data migration
* 3
* .rodata migration and a buncha funcs
* 2 mo
* some decomp, a file boundary fix
* cleanup
* UnkNpaAIFunc13s
* Update symbol_addrs
* remove sublist
* deleted asm
* data fix
* fix data
* wtf?!
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "88ce6b44a6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "88ce6b44a6"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* symbol_addrs update
* blah
* PR comments
2021-02-16 19:32:34 +09:00
brotenko@gmail.com
44415597e5
decompile repeating move-related functions.
2021-02-14 19:07:39 +01:00
brotenko@gmail.com
e53d5b620f
Decompiled dispatch_event_partner
2021-02-12 22:31:22 +01:00
Ethan Roseman
6dcaac6f7b
Merge branch 'master' into star-rod-0-4-0
2021-02-09 11:53:48 +09:00
Ethan Roseman
8401f88fd5
undo comment
2021-02-09 10:43:04 +09:00
Ethan Roseman
bbac3d905b
match nuContRmbMgr.c
2021-02-09 03:02:14 +09:00
Ethan Roseman
398fa6c695
gfxRetrace_Callback
2021-02-09 00:53:44 +09:00
Alex Bates
e0515e1eed
name many funcs
2021-02-06 15:20:35 +00:00
Ethan Roseman
51dbb6e5d7
improve coconut
2021-02-04 20:29:44 +09:00
Ethan Roseman
78411d2270
more decomp and 🍀 symbols
2021-01-21 00:45:03 +09:00
Ethan Roseman
e2e4c86b9c
some rodata migration, decomp
2021-01-20 02:27:48 +09:00
Ethan Roseman
b8edd71cd8
42e0
2021-01-20 01:31:43 +09:00
Ethan Roseman
545a655d40
2 funcz
2021-01-17 23:40:02 +09:00
dark-samus
839b9f5508
whitespace
2021-01-16 17:15:27 -05:00
dark-samus
e2c8066302
finish data migration for code_104730
2021-01-16 15:08:08 -05:00
dark-samus
d9083c1927
fix some things
2021-01-16 09:37:13 -05:00
dark-samus
557a9db0e2
more
2021-01-15 15:35:39 -05:00
dark-samus
6f304364c6
merge master
2021-01-07 14:59:49 -05:00
Ethan Roseman
c6c8f3876c
a few more
2021-01-06 23:19:41 +09:00
Ethan Roseman
bdbe0c5e65
a few
2021-01-03 18:34:04 +09:00
Ethan Roseman
89b5336bea
6 more
2021-01-03 18:02:50 +09:00
Ethan Roseman
a0d1324d2c
UnkNpcAIFunc12
2021-01-02 16:51:14 +09:00
Ethan Roseman
1c7a19255b
Merge branch 'master' into misc-decomp
2021-01-01 10:20:39 +09:00
Ethan Roseman
c2e027729c
some more digs
2020-12-30 17:18:27 +09:00
Ethan Roseman
1dd75cd0e5
UnkBattleFunc2
2020-12-30 16:03:05 +09:00
dark-samus
cd1ff2ec13
some work
2020-12-29 14:06:06 -05:00
Mark Street
466a31fe4e
Matching code_39cb0_len_100.c
2020-12-24 23:39:47 +00:00
Ethan Roseman
696522aafe
smores
2020-12-23 15:56:34 +09:00
Ethan Roseman
594d5bd2c7
759b0 funcs
2020-12-22 23:58:31 +09:00
Ethan Roseman
fe82f4be0a
clean 2
2020-12-22 22:50:47 +09:00
Ethan Roseman
2754ed84fe
cleanup + 1 match
2020-12-22 22:24:49 +09:00
Ethan Roseman
1c52052c12
Merge branch 'master' into audio
2020-12-22 18:13:24 +09:00
Ethan Roseman
b753ff25ed
non audio :floshed:
2020-12-20 12:47:09 +09:00
Ethan Roseman
3762983408
Merge branch 'mac-support' into audio
2020-12-05 19:57:10 -05:00
Rain
498027e7a4
decomp initialize_status_menu
2020-12-04 16:36:25 -06:00
Rain
50c01dc7d1
decomp func_8003F414
2020-12-03 09:36:01 -06:00
Ethan Roseman
04eebda913
cleanup
2020-12-02 02:09:33 -05:00
Ethan Roseman
eed8dc90bf
more audio
2020-12-01 23:50:32 -05:00
Ethan Roseman
5062328c73
new file
2020-12-01 19:13:24 -05:00
Ethan Roseman
93c1cb5a4a
197F40 funcs
2020-11-27 14:38:52 -05:00
Ethan Roseman
def7b12a2d
e0b30
2020-11-27 01:14:28 -05:00
Ethan Roseman
c8448c7ec2
more 181810
2020-11-26 16:41:01 -05:00
Ethan Roseman
3df62667fb
Some of 317020
2020-11-23 14:19:13 -05:00
Ethan Roseman
8271cb5636
3251D0 OK
2020-11-23 13:48:34 -05:00
dark-samus
b2f0bdc869
a few more
2020-11-23 02:52:10 -05:00
Ethan Roseman
dcd2acf4fe
UnkNpcAIFunc11
2020-11-22 15:47:15 -05:00
Ethan Roseman
a2f84553ed
UnkNpcAIFunc8
2020-11-22 10:27:43 -05:00
dark-samus
48487dbab0
merge master
2020-11-21 02:45:11 -05:00
dark-samus
03c4960eda
some funcs in code_105f90
2020-11-21 02:40:54 -05:00
Ethan Roseman
26417ed814
UnkMusicFunc
2020-11-20 09:44:08 -05:00
dark-samus
141626664f
decompile more entity funcs, split new file
2020-11-19 03:31:22 -05:00
dark-samus
d68a3e84a6
merge master
2020-11-18 00:35:50 -05:00
dark-samus
3676d8cd6c
decomp more, delete as for matched funcs
2020-11-18 00:32:18 -05:00
Ethan Roseman
e67d69b88e
4 funcs in code_1A5830
2020-11-15 22:04:33 -05:00
Ethan Roseman
124a5170b7
more pause decomp
2020-11-12 00:18:35 -05:00
Ethan Roseman
c61554b7e9
asm update
2020-11-10 11:27:02 -05:00
Ethan Roseman
2bf9437691
PR comments
2020-11-08 18:26:29 -05:00
Ethan Roseman
f55cace9a3
more EF070
2020-11-08 16:05:39 -05:00
dark-samus
783f0a2f83
merge master
2020-11-07 19:33:16 -05:00
dark-samus
18a3e6078b
more funcs
2020-11-07 19:30:14 -05:00
Ethan Roseman
1173f4c681
:island:
2020-11-07 14:44:44 -05:00
Ethan Roseman
5ae79b7f86
Various decomp
2020-11-05 19:30:17 -05:00
Ethan Roseman
5a0dea8665
a few more kmr funcs
2020-11-02 14:53:06 -05:00
Alex Bates
0448af546c
merge master
2020-11-02 17:22:42 +00:00
Alex Bates
dd4b9ec6e5
merge master
2020-10-31 20:10:22 +00:00
Ethan Roseman
54cd46a228
Merge branch 'master' into maps
2020-10-31 11:44:54 -04:00
alex
ed62a6999b
Merge branch 'master' into audio
2020-10-31 05:57:48 +00:00
Ethan Roseman
cff33e37f4
UnkPositionFunc
2020-10-30 19:11:46 -04:00
Alex Bates
debc0016fd
use ld_addrs.h in load_world_script_api
...
Renamed from load_map_script_lib
2020-10-30 16:07:33 +00:00
Ethan Roseman
0b04520f25
1 more
2020-10-30 00:32:25 -04:00
Ethan Roseman
7717a96628
Call800EB168
2020-10-29 23:56:54 -04:00
Ethan Roseman
f94c542a9d
Set80151310_0
2020-10-29 22:15:51 -04:00
Ethan Roseman
7376b736d0
a couple
2020-10-29 12:08:00 -04:00
Alex Bates
d9d6595581
make set_music_track non-void
...
Still matches; its return value is used in SetMusicTrack
2020-10-29 01:38:51 +00:00
Alex Bates
322932c295
name set_music_track arg3
2020-10-29 01:36:53 +00:00
Alex Bates
9eef0b0273
match set_music_track
...
rewrite flag as NOT
clean up set_music_track temps
2020-10-29 01:34:00 +00:00
Ethan Roseman
9a10bd2677
start_script_in_group
2020-10-28 15:06:49 -04:00
Ethan Roseman
90e7a9acab
Assorted functions
2020-10-28 02:42:14 -04:00
Ethan Roseman
eb41485a0a
New C file split, many functions decompiled
2020-10-26 19:10:32 -04:00
Ethan Roseman
099c159535
a few more map funcs
2020-10-25 22:37:22 -04:00
Ethan Roseman
97f1f96662
SomeItemEntityFunc
2020-10-25 21:12:01 -04:00
Ethan Roseman
5c049a9f22
SomeMatrixOperations bogo
2020-10-21 21:39:50 -04:00
Ethan Roseman
6bfd58db59
Merge branch 'master' into cornucopia
2020-10-20 18:00:16 -04:00
alex
607dba0c58
Merge branch 'master' into misc-improvements
2020-10-20 18:51:56 +01:00
Ethan Roseman
dbd8e0b1ee
Merge branch 'misc-improvements' into cornucopia
2020-10-20 12:44:50 -04:00
Alex Bates
23f8d8ee35
add structs/macros for matching map data
2020-10-20 04:11:07 +01:00
Ethan Roseman
dfd9de4765
Beginning SpawnSunEffect
2020-10-19 19:48:16 -04:00
Ethan Roseman
b71a05cd97
world_goombaria
2020-10-18 20:04:18 -04:00
Ethan Roseman
37856b1b54
⭐
2020-10-18 19:27:14 -04:00
Ethan Roseman
890fd346e9
🌠
2020-10-16 23:47:10 -04:00
Ethan Roseman
46f1d49601
Splitting remaining files
2020-10-14 23:49:49 -04:00
dark-samus
0c37f227a1
last one
2020-10-12 23:18:02 -04:00
dark-samus
733b591d5f
merge master
2020-10-12 22:16:00 -04:00
dark-samus
430ff41bc6
lots of stuff
2020-10-12 21:28:01 -04:00
Ethan Roseman
011231df41
Many more functions decomped
2020-10-08 15:03:58 -04:00
Ethan Roseman
2f67a08a29
ASM round 2 + many decomped funcs
2020-10-06 15:16:17 -04:00
Ethan Roseman
5794cdf6fc
Some more
2020-10-03 16:04:49 -04:00
dark-samus
c79f950a04
big merg
2020-09-28 16:59:36 -04:00
Ethan Roseman
82b3662064
2 more
2020-09-27 13:57:40 -04:00
Ethan Roseman
36c5bde376
more goods
2020-09-26 21:02:29 -04:00
Ethan Roseman
bbca99bd94
ASM macro fix, decomp of many
2020-09-25 17:18:09 -04:00
Ethan Roseman
a9e5d79531
more
2020-09-21 23:10:53 -04:00
Ethan Roseman
a1d39c1c1e
Sounds and flags
2020-09-21 20:56:17 -04:00
Ethan Roseman
b3d87e9347
formatting
2020-09-19 11:17:53 -04:00
Ethan Roseman
4e6a401484
byte/flag stuff
2020-09-19 11:16:02 -04:00
dark-samus
bb5d337778
big update
2020-09-18 16:57:52 -04:00
dark-samus
94e77f99d1
lots of changes
2020-09-18 16:07:15 -04:00
Ethan Roseman
7f6b34c29b
Some more SI funcs
2020-09-17 21:28:34 -04:00
Ethan Roseman
290a7426a5
Various funcs
2020-09-06 11:53:48 -04:00
Ethan Roseman
c92a46ae0d
PR comments, Makefile change
2020-09-02 14:20:29 -04:00
Ethan Roseman
11e3e9b35e
tiny change
2020-09-02 12:51:45 -04:00
Ethan Roseman
ee8d55d6a2
PR fixes and a couple more
2020-09-02 12:37:33 -04:00
Ethan Roseman
90d2ddf2f6
Finished code_6000.c
2020-09-01 21:45:06 -04:00
Ethan Roseman
74a46100c1
2 more
2020-08-26 18:54:55 -04:00
Ethan Roseman
b9c67f8f7e
Merge remote-tracking branch 'origin/master' into si
2020-08-23 20:34:29 -04:00
Ethan Roseman
87b421e8a0
Some more si functions
2020-08-21 23:04:10 -04:00
Jdog
177a9f0fe6
Several more Camera functions & struct changes
2020-08-21 08:04:57 -07:00
Jdog
17d513eeba
Added function prototype for set_npc_yaw. Match NpcJump0, NpcJump1, GetNpcYaw, SetNpcYaw
2020-08-18 17:31:39 -07: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
Alex Bates
66d6883188
update get_variable, get_npc signatures
2020-08-15 19:49:26 +01:00
Alex Bates
946680f312
match most functions in f8f60
2020-08-15 15:32:48 +01:00
Alex Bates
cbc5f2fe40
match AwaitPlayerApproach, IsPlayerWithin, AwaitPlayerLeave, GetDist2D
2020-08-15 13:00:13 +01: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
97d6f772ee
Merge master into lerp
2020-08-15 04:13:54 +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
dark-samus
62827e8823
actually fix assembler bug, make sure it compiles.
2020-08-14 22:24:08 -04:00
Alex Bates
dae676c8af
match UpdateLerp
2020-08-15 01:49:33 +01:00
Ethan Roseman
7e0880dfdd
Work on script interpreter
2020-08-14 11:18:05 -04:00
dark-samus
84ecb71d07
add fairly close to matching is_ability_active commented
2020-08-14 00:20:11 -04:00
Ethan Roseman
0782fa07a3
Refactoring stuff
2020-08-12 21:56:23 -04:00