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
ThreeMustyFears
80f5e18fc9
Match calc player damage enemy ( #698 )
...
* match calc_player_damage_enemy
* run coverage
* changes
Co-authored-by: ThreeMustyFears <>
2022-04-19 03:03:12 -04:00
ThreeMustyFears
41108b78b5
Match calc partner damage enemy ( #695 )
...
* match calc_partner_damage_enemy
* run coverage
* some var name changes
* remove typedef from enum
* fix warning
* remove casts
* saw a target flag in a comment
* Assert and script enums
Co-authored-by: ThreeMustyFears <>
2022-04-18 17:56:44 +09: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
ThreeMustyFears
02a6b226a4
Match a couple of Parakarry battle funcs ( #690 )
...
* match two Parakarry battle funcs
* run coverage
* cleanup
* more cleaning
* changes
* changed loops
* missed another parenthesis
Co-authored-by: ThreeMustyFears <>
2022-04-13 07:57:39 +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
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
ThreeMustyFears
9c5f34a61e
Match parakarry func ( #678 )
...
* match parakarry func
* run coverage
* fix warning
Co-authored-by: ThreeMustyFears <>
2022-04-08 14:30:01 -04:00
Ethan Roseman
29acf47328
_update_message ( #676 )
2022-04-07 16:51:21 +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
Nasina
3ecb9263d1
Decomp world/actions/land.c and func_802B61E4_E23444 ( #665 )
...
* Decompiled func_802A10A4_77F2E4
* Resolved Suggestions
* Fixed Formatting Error
* Fixed Formatting Errors
* oops
* Move playerActorState Assignment
* Matched func 802B61E4 in idle.c
* Decomped and Matched func_802B6000_E24920.s
* Decomped and Matched func_802B61C0_E24AE0
* Decomped and Matched the rest of the functions in land.c
* Cleaned up land.c
* Cleaned up matched idle.c function
* Removed Function ASM files
* Fixed most warnings
* Fixed all warnings
* Applied Suggestions
* Appliied Style Suggestions
* Fix if statement
2022-03-22 17:56:28 -04:00
Ethan Roseman
9cd911765d
File menu & more ( #658 )
2022-03-10 09:55:38 +00:00
JoshDuMan
d86d15bfd5
Match a number of functions and introduce anon unions ( #655 )
...
* Match a number of functions and introduce anon unions
* Fix warnings
* Ethan's comments
2022-02-25 00:12:33 +09:00
Ethan Roseman
48808572d9
debuff effect & 19FAF0 funcs ( #653 )
...
* debuff.c
* 19FAF0 funcs
* clean
* some API stuff
* clean
* PR
2022-02-22 01:05:36 +09:00
JaThePlayer
b427897581
Decomp RestorePreDefeatState + 2 more, add enum for RushFlags ( #651 )
...
* 3 funcs
* Rename rushesFlags to rushFlags, rename the RushFlags enum values
2022-02-20 01:46:27 +09:00
Ethan Roseman
e98ea95df4
state_title_screen & camera funcs ( #650 )
...
* state_title_screen funcz
* camz
* line
* PR comments and matches (thanks Unnunu & Wiseguy)
* enumz
* gloop
2022-02-19 23:39:34 +09: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
JoshDuMan
0f27b16f3c
Match test_item_entity_position ( #644 )
...
* Match test_item_entity_position
* Delete test_item_entity_position.s
* Add ENTITY_TYPE_2
* Update C50A0.c
* Update C50A0.c
2022-02-13 02:58:21 +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
ee0918018d
Match get_overriding_player_anim ( #631 )
2022-01-24 13:51:48 +00:00
JoshDuMan
0f67c8c425
Disassemble Various Battle Scripts ( #626 )
...
* Disassemble DGB
* Disasm omo
* Disassemble KGR
* Disassemble Battle Goompa
* Disasm Goombario
* Disasm Jan2
* Disasm JAN Battle Map
* Delete data files
* Disasm Spin Smash
* Partners Disasm
* Disasm KZN Battle Map
* Delete func
* jungle_guy
* Spear Guy
2022-01-19 20:21:19 +09:00
JoshDuMan
44dd710d54
Disassemble 3 Battle Maps ( #622 )
...
* Disassemble ISK Part 2 Battle Map
* Disassemble MIM BTL Map and fix script maps
* Delete mim
* Disasm Script
* Disassemble ARN Battle Map
* Remove files
* Remove struct
* Handle comments and merge conflicts
2022-01-17 02:22:23 +09:00
HailSanta
4e33a016eb
struct renaming and trigger/entity cleanup ( #623 )
...
* rename static structs to blueprint
* evt structs renamed
* renamed HudElementAnim to HudScript, worked on triggers
* fix Trigger/TriggerBP fields and entity cleanup
* entity data cleanup 1
* block
* blue warp pipe
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 22:28:09 +09:00
HailSanta
41c304137d
hud and item script names ( #617 )
...
* hud script names 1
* more hud elements!
* battle hud scripts
* names for some item globals
* hud elem scripts for items
* item entity names
* cleanup and missing struct in partners
* more partner cleanup
* battle stuff
* fix some warnings?
* resolve stuff
* fix symbol_addrs
* minor fixes
* splat pause_icon_table.data.s
* glabel -> dlabel
* rom addrs
* fix splat stuff
* data splits, warnings
* split more hud scripts
* added symbols for battle menu
* finished hud scripts fot 415D90
* entity documentation
* entity documentation
* more consistent name
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-15 03:54:45 +09:00
JoshDuMan
36e5315fdc
Disassemble Various Data Files ( #616 )
...
* Disassemble IWA Battle Map
* Disassemble SBK Battle Map
* Disassemble Quake Hammer
* Disassemble jump.c
* Disassemble Hammer Action Command
* Some Labelling
* Fix symbol_addrs
* Disassemble ISK Part 1 Battle Map
* Restore symbol_addrs
2022-01-13 15:26:42 +09:00
JoshDuMan
79bcd008f9
Battle Map and Move Disassembly ( #614 )
2022-01-11 02:06:43 -05:00
JoshDuMan
03c60ee7c5
Improve disasm_script.py and do some sample scripts ( #606 )
2022-01-06 11:32:57 -05:00
HailSanta
acf6b92313
more fields and name consistency ( #603 )
...
* npc fields
* npc and actor naming
* missing hit sounds + naming consistenct
* added partner syms and player spin struct
* requested changes
* organized Vec structs
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-05 20:05:49 +09:00
JoshDuMan
4657f3621b
Disassemble mac, hos, and nok Battle Maps ( #602 )
...
* voodoo magic
* Cleanup + match func_802180D0_464560
* work
* Finish mac battle map
* Add to gBattleAreas
* splat
* Disassembled hos and nok battle maps
* Match Kent C Function
* fix build
* Fix
* Work on disasm_script
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-05 20:01:44 +09:00
HailSanta
13a2f40f2a
Update GameStatus fields ( #595 )
...
* renamed a few fields in game status
* created constant for MAX_GAME_TIME
* names for rumble funcs
* suggested changes
* created sound out enum
* function naming test
* actorClass consistent name
* water block effect field
* battle_status fields
Co-authored-by: Clover <cloverhax@gmail.com>
2022-01-03 18:56:30 +09:00
JoshDuMan
5962ce37fd
Disassemble KMR 2 Battle ( #597 )
2022-01-01 08:08:04 -05:00
Rainchus
2f7a1c72af
Decomp some player render functions ( #581 )
...
* decomp appendGfx_player, fix warnings in 77480.c file
* small style fixes
* fix action state enum and make use of enum
* merge master
* decomp some mario rendering functions
* run coverage.py
* review changes
* use decimal in func arg
2021-12-29 13:09:19 +09:00
Ethan Roseman
15b6cb398c
Assorted Decomp Across The Galaxy ( #574 )
...
* popup_menu_update & other
* a bunch of 190B20
* starting load_player_actor
* load_player_actor
* blorp
* load_partner_actor
* fx_11_main
* fx_11 done
* cleanup
* fx_12
* 3 encounter_api funcs
* encounter_api done
* some 20ec0 funcs
* clean
* PR comments, warnings
* name btl_actorHomePositions
* PR comments
2021-12-28 20:43:24 +09:00
Rainchus
33457751e2
decomp appendGfx_player, fix warnings in 77480.c file ( #572 )
...
* decomp appendGfx_player, fix warnings in 77480.c file
* small style fixes
* fix action state enum and make use of enum
2021-12-27 22:00:13 -05:00
Alex Bates
585c0dc428
Name and document btl_init_menu_* funcs ( #567 )
...
* btl_init_menu_*
* https://c.tenor.com/D0mk5R5x1G8AAAAC/cat-fat-cat.gif
2021-12-24 23:21:03 +09:00
Alexander Faßbender
f82f699188
DSL Script conversion ( #562 )
...
* start converting scritps to new syntax
* convert old DSL scripts to new format
* update disasm_script and disasm more DSL scripts
* .
* .
* resolve issues
* add EVT_PTR() to GotoMap calls
2021-12-24 14:29:05 +01:00
Alexander Faßbender
dbde606a86
calc_item_damage_enemy ( #549 )
...
* setup function
* cleanup parts of calc_item_damage_enemy
* .
* .
* .
* resolve issues
* set function as NON_MATCHING
* npc flags
* resolve issues
* .
* Update include/enums.h
Co-authored-by: Alex Bates <hi@imalex.xyz>
* Update 17FEB0.c
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-21 23:12:59 +01:00