Ethan Roseman
d31e0b8936
Engine cod ( #738 )
...
* a couplez
* func & data cleaning
* sig
* move data and fix nonmatching
* Finish 17D6A0
* Don't use backticks in progress.py
* func_8025995C and clean
* 2 sprite funcs and cleanup
* 3 sprite funcs
* gather_magic_main
* 3 sprite funcs
* more sprite work and cleanup
* sprite funcs
* more clean
* UnkFloatFunc005
* warnings
* cleaning and os stuff
* 2 more funcs + warnings
* yaml work, move map data metadata to separate yml file
* apply_transform_to_children
* cleaningz
* PR comment
2022-07-08 21:57:08 +09:00
Mr-Wiseguy
ea64a774fc
Cleaned up and documented gfx_draw_background, changed vscode config to use gcc-x86 to avoid intellisense truncation warnings for pointers ( #739 )
2022-07-03 15:42:28 +09:00
Ethan Roseman
ec0ae12540
Partner, map, engine funcs ( #736 )
...
* phys_should_player_be_sliding
* functions from brotenko
* UnkTrigFunc001
* trd_05
* IsPartnerXXX funcs
* nok funcs
2022-06-26 11:21:38 +01:00
Ethan Roseman
0785fc6f93
Tiny funcs & cleanup & entity ( #735 )
...
* baby funcs for ethy
* progress on pause_stats_draw_contents
* a5dd0 work + cleanup
* almost create_entity
* cleanup
* some funcz
* btl_show_message_popup (thanks Unnunu\!)
* more
* more cleen
* PR comments
2022-06-17 18:21:13 +09:00
JaThePlayer
d1fb0597af
More functions, some from Brotenko ( #734 )
...
* More functions, some from Brotenko
* Matched the unmatched
2022-06-17 15:14:21 +09:00
Ethan Roseman
e39f5874f6
Overlay 2 bss reorg ( #733 )
...
* cleanup + almost done with _use_partner_ability
* _use_partner_ability and bss bonanza
* gCameras fix
* cleanup
* cleanup
2022-06-14 01:34:22 +09:00
Ethan Roseman
bae34c46ed
Upgrade to splat 0.9.0 ( #730 )
...
* changes for splat 0.9.0
* wip
* git subrepo pull --branch=develop --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "2ff7357501"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "develop"
commit: "2ff7357501"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* OK
* big_snowflakes gfx data
* Jenkins?
* cleanup
* debuff effect gfx data
* fix
* more effect gfx data
* dlabel
* git subrepo pull --branch=experiment --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "1365775e09"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "experiment"
commit: "1365775e09"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* .
* git subrepo pull --branch=experiment --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "6bd9fe1c4e"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "experiment"
commit: "6bd9fe1c4e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* flower splash/trail gfx
* throw_spiny gfx
* disable_x and butterflies gfx data
* draw_coin_sparkles
* Warnings, cleanup
* cleanin
* attempt at test_item_player_collision
* more gfx + cleanup
* more effect gfx
* func_8002D160
* update update_symbol_addrs and symbol_addrs
* git subrepo pull --branch=develop --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "4914dc9029"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "develop"
commit: "4914dc9029"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --branch=master --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "aa71299594"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "aa71299594"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix
* fix regression
* Add rabbitizer to requirements
* warnings
* symbol_addrs fixes
2022-06-13 00:33:32 +09:00
Unnunu
763b320bfb
b_area_omo2 ( #729 )
2022-06-12 15:44:36 +01:00
HailSanta
a335b73d0a
misc-functions ( #728 )
...
* misc stuff
* ShowEmote
* finish fx_api + replacing sound enum values
* load_path_data
* requested fixes
* vertex data extracted
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-06-11 03:06:12 +09:00
HailSanta
611a083ae9
hud-script-disasm ( #726 )
...
* pause hud scripts
* script name prefixes
* missing sparkle script item entity fields
* revert incorrect hypothesis
* global hud scripts + sparkle script macros
* remove tabs
* hs_op_15
* split battle images
* battle hud scripts
* fix warnings
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-06-10 04:03:11 +09:00
Unnunu
accf5a60f6
Animations ( #727 )
...
* decomp 5 animator functions
* animation script disasm
* cleaning up
* improvements in animation disasm
* TODO
2022-06-09 22:49:57 +09:00
Unnunu
76187e5c3b
3 more battle maps ( #724 )
...
* area_pra2
* finish
* sound enum
* renamed enum member
* fixed alignment
* area_pra3
* area_sam
* area_sam2
2022-06-06 21:34:45 +09:00
Ethan Roseman
341ed0040f
some assorted cleanup / commenting of stuff ( #722 )
2022-06-01 03:39:46 +09:00
Unnunu
b4ee2f8a75
intro_state, evt and decoration tables ( #718 )
...
* matched appendGfx_intro_logos
* create 38F00.c
* 3 evt functions
* wip
* match func_80259AAC
* match 8 decoration funcs
* fix warnings
* fix merge issue
* cleaning up
* renamed data file
* PR suggestion
2022-05-29 00:15:51 +09:00
Ethan Roseman
c0694d26f1
House cleaning ( #719 )
...
* various cleanup
* further cleanup
* some cleanup + matches
* clean
2022-05-28 20:13:30 +09:00
Ethan Roseman
021592d219
Misc decomp 70 ( #716 )
...
* aura_appendGfx
* 3 more action commands
* fire_shell
* hammer, hurricane
* spiny_surge
* data stuff, cleanup, whirlwind
* warnings
* water_block data and func
* water_block
* effect stuff cleanup
* big_snowflakes effect
* data cleanup, fpr abi regs
* 2 battle item funcs + data
* 2 mo
* shooting_star func
* 3 16F740 funcs
* btl_state_update_end_battle
* map funcs
* more dedupe
* cleanin
* draw_entity_model_C/D
* effect butterflies, btl state funcs
* it is done
* it is done
* PR comments, some cleanup
2022-05-27 22:03:19 +09:00
HailSanta
1e91e60cb6
rest of 5B320 ( #713 )
...
* rest of 5B320
* whitespace
* fix warnings
* split 5B320.c with includes
* ICON_anim_heart_piece_palette
* requested changes
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-05-21 13:56:54 +09:00
HailSanta
5b7f18a2ca
start chest inc + misc cleanup ( #711 )
...
* start chest inc + misc cleanup
* popups
* 5b320 OK
* finish HudScript retyping
* item hud scripts
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-05-18 16:53:28 +09:00
Unnunu
52b9d1b11c
battle camera ( #710 )
...
* match func_80248DE4
* BattleCam_TargetActor
* renamed functions
* Update src/16F740.c
Co-authored-by: alex <16batesa@gmail.com>
Co-authored-by: alex <16batesa@gmail.com>
2022-05-16 15:18:18 -04:00
Ethan Roseman
179998098c
Misc decomp 53 ( #703 )
...
* some btl_state work
* msg_draw_speech_bubble
* cleaners
* btl_state_stuff
* btl_state_update_next_enemy wip
* btl_state stuff
* disable_x fx + cleanup
* wip
* fxstuff
* path funcs & cleanup
* clean
* model_api funcs
* two action commands
* action_cmd progress
* UnkFunc001
* air raid func
* cleanup, data migration, goodies
* remove data file
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "a847090eac"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "a847090eac"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix build
* more cleanup
* clean
* PR comments
2022-05-05 23:08:16 +09:00
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
Unnunu
d33a2407df
Audio stuff ( #696 )
2022-04-18 16:38:47 +01:00
HailSanta
cfe089af10
monty mole AI + various enums ( #694 )
...
* 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
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-04-18 00:36:37 +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
alex
5718fa67fa
Merge old alex branches ( #691 )
...
* D_80283D98
* add tools/migrate_data_to_c.py
* add .byte support
* jic
* update count_power_plus
2022-04-12 20:23:49 +09:00
HailSanta
8d730c5c50
isolated chuck quizmo ( #685 )
...
* toad house
* push blocks
* requested cleanup
* quizmo 1
* dro_01, dro_02, hos_03, jan_02
* quizmo jan_03
* kmr_02 quizmo
* quizmo area_mac
* quizmo functions aggregated
* remove functions no longer needed
* cleanup
* cleanclean
* quizmo started data
* quizmo data half done
* nearly done
* fix mislabeled data in dgb_01
* fix QuizRequirement struct
* isolate give item code
* deconflict varstash data name with varTable fields
* misc quizmo cleanup
* quizmo done
* fix file with invalid symbols
* PR comments
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-12 15:01:58 +09:00
Ethan Roseman
d6ac1a490b
Map De-doop ( #688 )
...
* various
warningz
* map stuff
* UnkPhysicsFunc
* UnkModelMatrixFunc
* UnkModelMatrixFunc2
* UnkAtan2Func
* UnkGooberFuncs
* GetPeachDisguise
2022-04-12 03:32:54 +09:00
Ethan Roseman
3a28a3f505
Physics ( #682 )
...
* various
* collision_main_lateral
* phys_adjust_cam_on_landing
* phys_main_collision_below
* 77480.c dun
* 7fd10 funcs
* 7bb60 funcs
* warningz
* map stuff
* PR comments
2022-04-11 15:34:35 +09:00
HailSanta
5f47e1291f
Santas-workshop -- toad houses and push blocks ( #681 )
...
* toad house
* push blocks
* requested cleanup
* clean
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-10 17:37:13 +09:00
HailSanta
42355f53c2
Santas Super Blocks ( #677 )
...
* misc msg etc
* super blocks 1
* super blocks 2
* super block dedupe
* super blocks x
* super block isolated
* one dead super block func left
* dead maps fixed
* remove unnecessary funcs
* merged includes for pipes
* pipe data and EVT_GROUP enum
* fixed dead
* fix warnings
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <eroseman@basistech.com>
2022-04-08 15:10:12 -04:00
Ethan Roseman
4555d9fab5
StashVars ( #679 )
...
* beginnings
* more
* done
* cleanup
* remove sublist.txt
2022-04-08 14:25:49 -04:00
HailSanta
2d26e6dc95
merged texture pan includes ( #675 )
...
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-04-07 16:41:39 +09:00
Ethan Roseman
02d678b543
Npc funcs, fio.c, and others ( #674 )
...
* filemenu_choose_name_handle_input
* filemenu_choose_name_init
* filemenu_main_handle_input
* update symbol_addrs
* filemenu_draw_contents_copy_arrow
* cleanup
* dusting
* npc funcs
* fio.c finished
* Cleanup
* warnings
* Cleanup + SaveDataHeader struct
* re-add decl
2022-04-05 21:53:40 +09:00
HailSanta
b7f7e4c96d
Santas workshop (matched area_mgm) ( #673 )
...
* mgm_01 start
* strange issue
* blah
* rodata fix
* done with mgm_01 + misc cleanup
* almost done mgm
* minor issues with last 3 functions
* match help
* mgm code done
* proper msg pal usage
* fix warnings
* fix more warnings
* ive been warned
* requests
* area_kgr
* battle cam symbol names
* msg cleanup work
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-05 18:52:06 +09:00
Ethan Roseman
d0a7655779
Various dompin ( #672 )
...
* partner funcs
* land.c
* filemenu_update
* 190A10.c
* hammer.c dun
* prog rock
* various funcs
* moving
* update_item_entities
* filemenu_yesno_handle_input
* cleanin
* sweeping
* PR comments
2022-03-30 21:07:13 +09:00
Unnunu
9e0aab9e6d
camera functions and zone collision data ( #671 )
...
* match 3 functions
* match 4 camera functions
* fixes
* camSettings type enum
* PR suggestions
2022-03-28 18:29:47 +09:00
HailSanta
7dbd1770ec
Santas workshop ( #670 )
...
* initial name changes
* hud_element function names
* missing player data fields
* entity cleanup
* missed a few things + starting action states
* some world partner cleanup
* idle/walk/hammer + peach cooking stuff
* clean
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-03-26 20:47:10 +09:00
Unnunu
086ab5bf24
match some libultra ( #667 )
...
* decomp 8 functions
* 3 ai funcs
* 6 more funcs
* decomp 6 funcs
* decomp 21 funcs
* cleaning up
* fix
* reverted changes in os_pfs.h
2022-03-21 15:47:44 +09: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
33254f23be
Map func dedupe & fire breath effect ( #661 )
...
* find_duplicates improvements, closer on a func
* UnkFunc54
* UnkFunc55
* UnkFunc56
* fire_breath
* name stuff
* warnings
* cleanup
* .
2022-03-14 02:33:10 +09:00
Unnunu
b922ddd6f3
hud_element.c ( #660 )
...
* ALT_clear_hud_element_cache
* clear_hud_element_cache
* match 3 funcs
* hud_element_update
* draw_rect_hud_element
* func_801413F8
* HudElementFlags
* flag names
* some improvements
* fix warnings
* debuffIcon TODO
* PR suggestions
2022-03-12 18:49:32 +09:00
Ethan Roseman
55a849a50a
De-duplicate more UnkNpcAIMainFunc occurrences ( #659 )
2022-03-10 19:11:34 +09:00
Ethan Roseman
9cd911765d
File menu & more ( #658 )
2022-03-10 09:55:38 +00:00
Unnunu
546152b69e
match windows.c and migrate data for draw_box ( #646 )
...
* match 9 functions
* draw_box data
* fix warnings
* fix
* fix warnings again
* PR suggestions
* replace int literals with enum values
* two more ints replaced
2022-02-13 17:19:59 +09:00
Ethan Roseman
3a578399fb
calc_item_damage_enemy and some others ( #641 )
...
* SFX funcs, configure fix
* the actual rename (oops)
* 3 sprite funcs
* 2 funcz
* calc_item_damage_enemy and cleanup, others
* cleanup
* Warnings
* clean fx_api
* match npc_raycast_general and name npc_collision.c
* PR comment
2022-02-09 03:33:05 +09:00
Unnunu
650d52d16a
Pause menu ( #642 )
...
* start data migration
* decomp 12 functions
* make initial bss
* pause_tutorial_draw_contents
* pause_init
* decomp 3 functions
* decomp pause_tabs
* pause_badges_draw_contents
* pause_items
* pause_partners
* pause_spirits
* pause_map
* pause_gfx and pause_styles
* fixing warnings
* fixed all warnings
* bss
* rename bss fields
* make static from bss
* renaming global vars
* finish
* small fix
* PR suggestions
2022-02-09 03:24:51 +09:00
JoshDuMan
348d12c4e3
Match some more Libultra ( #639 )
2022-02-08 14:05:20 +00:00
JoshDuMan
e1766601f8
Match 50 functions in Libultra ( #636 )
...
* Fix script disasm
* Stuff
* Work on libultra
* More Libultra Work
* My Libultra work for now
* Fix all OS warnings
* fix gitignore
2022-01-31 20:40:55 +09:00
Ethan Roseman
96e85f4da1
SFX funcs, configure fix ( #635 )
...
* SFX funcs, configure fix
* the actual rename (oops)
2022-01-31 19:10:02 +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