HailSanta
aee5626e5b
world AI ( #701 )
...
* monty mole AI pt 1
* monty mole AI #2
* enum values for evt priority and flags
* enemy ai flags
* done monty mole + partner enums
* removed union for partner action state
* missed parter action states + cam move flags + entity collision bit
* basic ai
* piranha plant stuff
* attack ahead
* consistent hitbox names
* idk
* organized piranha plant
* delete matches
* start fuzzy
* naming
* bzzap pt 1
* bzzap 2
* bzzap names done
* rename bzzap to flyingAI
* complete flying names
* done for today
* file reorganizing
* world AI
* starting clubba dedupe
* suggested changes
* bullet bills
* sentinel start
* dedupe sentinel complete
* sentinel AI done
* melee ai organization
* piranha plant dedupe
* resolved some bad dead syms
* patrol start
* patrol AI almost done
* enough
* more ai work
* clean up clubba ai enum
* dedupe all clubbae
* started cleft extraction
* ready to dedupe cleft
* dedupe one cleft
* iwa_04
* iwa_01
* iwa_02
* ai state file reorganization
* enemy anim enum
* extracted shy guy
* dedupe shy guy ai
* shy guy patrol ai
* done shy guy ai dedupe
* added NON_MATCHING wrap
* ai etc
* more dead ai
* most dead ai merged with living
* lakitu etc
* paratroopas
* fix warnings
* fix other warning
* ParatroopaAI
* lakituAI parameter fix
* dead_flo_13 debug strings
* misc map matches
* flying magikoopa start
* name npc field
* lungeAI renamed to tackleAI
* magikoopa ai foothold
* extrated one magikoopa
* starting clubba dedupe
* addressed PR comments
* consolidated magikoopa helper funcs
* misc map stuff
* flying magikoopa dedupe
* zipline funcs
* delete matched
* grind out another 0.05%
* started letter delivery dedupe
* more delivery dedupe
* special delivery
* rest of letter delivery
* slight delivery reorg
* delivery func names
* cleft doc start
* name enemy field
* more renamins
* unk_28.f
* changed field names to facilitate renaming
* done cleft cleanup
* hopping ai
* cleanup some ai
* name field + patrol reorg
* filled out NpcAISettings fields
* assembling ai includes
* elimated state files
* remove X32 for alertOffsetDist
* removed other NpcAISettings union
* new NpcAISettings for UnkAI_4
* stationary AI cleanup
* smalls
* 0 new warnings
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-29 13:32:16 +09:00
HailSanta
0ef8c71bdb
combining various AI and item check imports ( #692 )
...
* aggregating AI includes
* workin on AI funcs
* fix
* misc
* ongoing lock dedupe
* item choices
* so many item choices
* dead item choices
* deleted matches
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-15 12:28:49 +09:00
Ethan Roseman
4555d9fab5
StashVars ( #679 )
...
* beginnings
* more
* done
* cleanup
* remove sublist.txt
2022-04-08 14:25:49 -04:00
Ethan Roseman
3ff0057674
Match-a-palooza (75% functions, 60% bytes) ( #666 )
...
* aura_update
* CompareFloats
* UnkBufferFunc
* SetPlayerStatusPosYaw
* SetNpcPosYaw
* IsAOrBPressed
* UnkEnemyPosFunc
* UnkNpcAIFunc47
* UnkFunc57
* UnkFunc58
* UnkFunc59
* delete unneded data
* UnkFunc60
* UnkFunc61
* UnkNpcAIFunc48
* UnkNpcAIFunc49
* UnkNpcAIMainFunc7
* lee func
* cleanup
* UnkFunc62
* UnkNpcAIMainFunc8
* SixFloatsFunc
* UnkNpcAIMainFunc9 part 1
* UnkNpcAIMainFunc9 part 2
* UnkNpcAIMainFunc10
* warnings
2022-03-20 19:12:30 +09:00
Ethan Roseman
55a849a50a
De-duplicate more UnkNpcAIMainFunc occurrences ( #659 )
2022-03-10 19:11:34 +09:00
Ethan Roseman
9fa9639575
The Great Effect Naming ( #632 )
...
* name big_smoke_puff
* 0-5
* 6 -> land
* more effect stuff
* flower effects
* name fix
* cloud_puff
* flower splash
* cloud_trail
* 2 more
* more
* a bunch more
* -2F
* more
* the rest
* cleanup and the rest
* PR stuffs
2022-01-25 01:58:33 +09:00
Alexander Faßbender
4ef25a394d
Decompile and dedupe dead funcs ( #621 )
...
* decompile several dead functions and dedupe some alive counterparts
* .
* dedupe UnkNpcAIFunc46
* resolve issues
* Fix warnings
* .
* PR comments
* clean
* anim IDs
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-21 14:54:46 +09:00
Unnunu
5f05525446
match raycast functions ( #620 )
...
* npc_raycast_down
* npc_raycast_down_ahead
* npc_raycast_down_sides
* npc_raycast_up
* npc_raycast_up_corner
* npc_raycast_up_corners
* npc_test_move_complex_with_slipping
* player_raycast_down
* player_raycast_up_corners
* decomp 3 funcs
* player_test_move_without_slipping
* player_test_move_with_slipping
* match player_test_move_with_slipping
* clean up code
* fix param names
* remove space
Co-authored-by: Alex Bates <hi@imalex.xyz>
Co-authored-by: Alex Bates <hi@imalex.xyz>
2022-01-15 03:09:45 +09:00
Lightning
1c64f15db1
Make a 224 functions show up in the elf ( #530 )
...
* Make a 224 functions show up in the elf
* fix up appendGfx_model (as an example)
* Changed all L labels to .L for local jump tables. Did not change global jump tables found in /data/ as .L is for local only
* Decompile even more misc battle map funcs (#531 )
* decompile misc battle map funcs
* fix warnings
* Decompile misc battle map funcs (#528 )
* .
* .
* resolve issues
* Update fx_api.c
* Update fx_api.c
* Make a 224 functions show up in the elf
* fix up appendGfx_model (as an example)
* Changed all L labels to .L for local jump tables. Did not change global jump tables found in /data/ as .L is for local only
* Fix merge issue
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
2021-11-16 16:19:38 +09:00
Alexander Faßbender
fbc901ac49
decompile several map and battle-map related functions ( #504 )
...
* decompile several map and battle-map related functions
* remove unnecessary folder
* resolve issue
* .
* .
* Update 52B6A0.c
* Update 6DBDA0.c
2021-10-29 20:14:51 +02:00
Alexander Faßbender
205103bf2e
Decompile dead functions ( #432 )
...
* decompile several dead functions
* .
* resolve issues and deduplicate StarSpiritEffect structs
* .
* resolve the requested change
2021-09-26 16:52:25 -04:00
Alexander Faßbender
bcc20df00b
Replace get_variable with evt_get_variable in .s files ( #410 )
...
* rename every function that is part of evt_funcs.h to have the evtt_ prefix.
* remove old .s files
* fix symbol_addrs error
* add evt_ 'prefix' to the dead functions in dead-h
* fix issue with .s files missing the evt_ prefix
2021-08-29 20:05:08 +02:00
Alexander Faßbender
b198250cde
Rename every function that is a part of evt_funcs.h to have the evt_ prefix ( #408 )
...
* rename every function that is part of evt_funcs.h to have the evtt_ prefix.
* remove old .s files
* fix symbol_addrs error
* add evt_ 'prefix' to the dead functions in dead-h
2021-08-29 18:51:56 +02:00
Ethan Roseman
c7a7567d68
FX data/funcs, camera funcs, state funcs ( #364 )
...
* fx table work
* fx data
* blah
* render_effects_UI
* split out effects.c
* battle state menu functions
* render_frame
* clean
* clean
* 4 camera funcs
* state_step_end_battle & symbol names
* state_file_select done
* 111f0 done
* .
* PR comments
2021-08-17 03:14:58 +09:00
Ethan Roseman
8feea763c4
NPC AI funcs ( #351 )
...
* UnkNpcAIFunc26
* UnkNpcAIFunc27
* UnkNpcAIFunc28/29
* update symbol addrs
2021-08-01 21:06:57 +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
425dc5df56
Lots of area func deduplication ( #300 )
...
* 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
2021-07-04 17:09:40 +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
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
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
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
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
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
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
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
Ethan Roseman
ab79244991
JP rom beginnings ( #197 )
...
* data, splat fixes
* fix .gitrepo?
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "fb8315b319"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fb8315b319"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* audio updates (thanks Clover)
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "c56195a9c5"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "c56195a9c5"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* work on jp rom
* remove comment
* fix duplicate asm labels
* git subrepo pull (merge) tools/splat
subrepo:
subdir: "tools/splat"
merged: "db51ae16c2"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "db51ae16c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix configure and delete grub
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "97e51bdf21"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "97e51bdf21"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* file split, moving things into os
* header
2021-03-04 18:00:56 +09:00
alex
a4e1c2f522
Add versioning ( #187 )
...
* fix vscode cpp extension messing with files.associations
* move stuff
* it builds!
* symlink papermario.us.z64
* ci: put baserom in right place
* add jp
* fix splat dir
* ignore starrod dump
* .s deps
* update jenkins
* add dsl back
* configure.py versions
* wups
* fine ethan
* fix paths
* configure: default to only the version(s) with existing baseroms
* fix coverage
* fix progress.py
* progress.py verisoning
* remove format.sh from CONTRIBUTING
* update CONTRIBUTING
* fix first_diff
* diff.py: use ver/current/
* update splat.yaml
* trying to fix subrepo
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "06a737f02d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "06a737f02d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* configure fix
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "41786effd3"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "41786effd3"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-02-22 18:21:23 +09:00
