* Many duplicate funcs, still around 41 left :P
* 19 duplicate funcs left
* Finished matching some duplicate funcs in world/area
* wipperz
* hos_01 funcs
* more funx
* 3 hos_04 funcs
* hos_04 funcs
* more hos
* tik_25 func
* mores
* progress
* clean
* mo
* meep
* PRs
Co-authored-by: Nasina7 <nasina987@gmail.com>
* EVT_PLAY_EFFECT
* area_trd data
* forgot a flag name
* fix bobomb spelling
* todo note
* fix macros
* fixed a couple more
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* initial variation support
* checkpoint
* pass 1
* second pass
* first few
* more
* change anim < 16 format
* next batch
* goomba anims
* more npcs
* safety
* success
* checkpoint
* last of dro
* a few
* checkpoint
* penguins
* conventions
* flowers A
* Flowers B
* partner animation support
* parter stuff
* id cleanup
* laki
* more laki
* laki done
* sushie
* goompa
* watt + bow
* bombette + parakarry
* goombario
* kooper
* goomba family
* spike jr troopa
* jr troopa
* world partners
* goombas
* lee
* chan
* the master
* toads
* mostly toads
* so many toads
* penguins
* nok npcs
* ch 2+3
* rest of chapters
* parade
* green mario harharhar
* battle bowser
* world bowser
* goomba king
* enough sprites for now
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* mapconfig -> mapsettings
* Map/Area -> MapConfig/AreaConfig
* old EVT names
* kmr names
* game byte names
* EVT_SAVE_FLAG names
* removed EVT_WAIT_FRAMES
* including the to_rename files in case they need to be reused
* more npc AI
* battle and stage names
* fixed enum value
* territory substruct refactor
* refactored enemy drops substruct
* refactor NpcGroupList
* adjusted NPC_GROUP for passive NPCs
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* prep for map dumping
* s p a c i n g
* advanced door + world statics
* sneaky tabs
* more world
* one more
* saved for later
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* big func
* this and that
* checkpoint
* more funcs
* enough
* formatting
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
* isk + warning patrol
* minor reorg
* effect data union
* structs sorted and dummy structs added
* effect data cleanup + some end funcs
* two more PAL_PTR*
* temp
* flower fx
* pal_inc_c
* remove tabs
* isk_05
* blur union
* more isk
* isk funcs done
* sun stuff
* delete sun_main
* sun comments
* extra stuff
* actor decorations
* isk + warning patrol
* minor reorg
* effect data union
* structs sorted and dummy structs added
* effect data cleanup + some end funcs
* two more PAL_PTR*
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* 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
* 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>
* 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 <>
* 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>
* 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>
* match 9 functions
* draw_box data
* fix warnings
* fix
* fix warnings again
* PR suggestions
* replace int literals with enum values
* two more ints replaced
* 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>
* 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>
* 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
* 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
* decomp misc funcs
* cleanup on MakeShop and initial work on ShowShopOwnerDialog
* match ShowShopOwnerDialog
* decomp misc funcs
* cleanup on MakeShop and initial work on ShowShopOwnerDialog
* match ShowShopOwnerDialog
* resolve issues
* resolve warnings
* Update src/world/script_api/7E0E80.c
Co-authored-by: Alex Bates <hi@imalex.xyz>
Co-authored-by: Alex Bates <hi@imalex.xyz>
* setup function
* cleanup parts of calc_item_damage_enemy
* init data2c
* clean up data2c.py
* .
* rename and update script to have additional functionality
* .
* decomp watt overworld functions
* fix struct that was wrongly changed
* run coverage.py
* requested changes for watt.c and decomp a function from sbk_02
* run coverage.py
* more style changes
* decomp all functions in 92A2B0.c
* run coverage.py
* use map_var instead of hex constant, other style changes
* pull sbk_02.h changes
* ...actually merge master correctly
* decomp most functions in nok_04
* decomp most of 9EDBF0.C, fix warnings in UnkFunc41.inc.c and warnings/decomp in lakilester.c
* run coverage.py
* code review changes + few extra functions
* decomp lakilester functions and fix style in other files
* decomp more laki overworld functions
* add close match for func_802BDDD8_321928
* requested changes
* more requested style changes
* style changes
* last of review changes
* another small style fix
* ...accidentally deleted the f on a float immediate
* decomp world sushie/watt files
* run coverage.py
* small style fixes
* fix 2 warnings in watt.c
* decomp kooper world functions
* requested style changes
* couple more style changes
* decomp kooper world functions
* last style changes
* decomp more kooper world functions
* match world kooper file except 2 non_equivalent
* non matching of last world bow function
* migrate data.s file to bombette.c, also decomp various overoworld partner functions
* match more overworld partner functions
* style changes
* update variable names
* some requested changes done
* add enums and other cleanup to overworld partner files
* run coverage.py
* add a space to watt file
* remove raw pointers from partner files plus other requested changes
* remove goompa raw pointer
Co-authored-by: root <root@DESKTOP-HK751F2.localdomain>
Co-authored-by: Rainchus <Rainchus@github.com>
* work on appendGfx_message
* :OK:
* indentation
* message window states
* SetEntityCullMode & some of appendGfx_model
* 9 smalls
* 2 more
* 2 mo
* update_player_actor_shadow
* EffectInstanceData rework
* some shtuff
* effect_10 dun
* wip
* wip
* wipz
* rename
* progz
* remove wip work for appendGfx_model
* PR comments
* Alex comments
* tomorrow for sure
* eventually
* update enums and functions
* match a couple of funcs
* run coverage.py
* some initial cleanup
* missed something
* requested changes
* remove space
* more changes
* aligned enum
Co-authored-by: ThreeMustyFears <>
* work on appendGfx_message
* :OK:
* indentation
* message window states
* PR comments
* ran formatter
* change some types
* debuggin
* undebuggin
Co-authored-by: Alex Bates <hi@imalex.xyz>
* prepare enums.h
* update enums.h
* add commits to enums.h
* resolve enum and flag issues with enums.h
* delete artifacts
* resolve issue with soundid enum
* :P
* setup first few parameterised flag enums
* add flags to npc.h related structs
* add flags to npc.h related structs
* create enums for several common structs
* .
* resolve issue with enum sizes
* resolve issue with enum sizes
* resolve issue with enum sizes
* parameterise entity and event related flags
* update enums.h
* add commits to enums.h
* resolve enum and flag issues with enums.h
* delete artifacts
* resolve issue with soundid enum
* :P
* setup first few parameterised flag enums
* add flags to npc.h related structs
* add flags to npc.h related structs
* create enums for several common structs
* .
* resolve issue with enum sizes
* resolve issue with enum sizes
* resolve issue with enum sizes
* parameterise entity and event related flags
* .
* Update 190B20.c
* Update enums.h
* decomp watt overworld functions
* fix struct that was wrongly changed
* run coverage.py
* requested changes for watt.c and decomp a function from sbk_02
* run coverage.py
* more style changes
* decomp all functions in 92A2B0.c
* run coverage.py
* use map_var instead of hex constant, other style changes
* pull sbk_02.h changes
* ...actually merge master correctly
* decomp most functions in nok_04
* decomp most of 9EDBF0.C, fix warnings in UnkFunc41.inc.c and warnings/decomp in lakilester.c
* run coverage.py
* code review changes + few extra functions
* decomp lakilester functions and fix style in other files
* decomp more laki overworld functions
* add close match for func_802BDDD8_321928
* requested changes
* more requested style changes
* style changes
* last of review changes
* another small style fix
* ...accidentally deleted the f on a float immediate
* what is dead may never die
* resolve issues
* fixing dead_gPartnerActionStatus2
* .
* resolve issues
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
* WIP pause_sort_item_list
* Decomp pause_draw_rect and pause_sort_item_list
The match on pause_sort_item_list is very sketchy, there's probably a much simpler way to write the function that I can't find
* Review for 135EE0
* Define gMoveTable
* pause_get_total_equipped_bp_cost
* pause_badges_draw_bp_orbs
* pause_badges_cleanup
* pause_badges_init
* pause_badges_try_remove
* pause_badges_handle_input
* pause_badges_try_equip
* WIP on pause_badges_load_badges, almost perfect match
* Full match on pause_badges_load_badges
* Review changes for pause badges
* A few more pause badge review changes, missing some spaces around add/subtract operators
* More small pause badges fixes
* Pause badges review: remove enum typedefs, add names for ranges in ItemID
* Decompile E225B0.c.
* Decompile EB5130.c.
* Fix an off-by-one error that did not affect codegen.
The struct declared in EB5130.c was missing a byte in a char array
for no good reason.
* Address ethteck's feedback for PR#434.
- Move struct8015A578 to common_structs.h.
- Add new unknown sound SOUND_UNKNOWN_17B.
- Address various nits.
* Update PR based on @nanaian's feedback.
- Change first argument of mem_clear to be a void* (matching bzero).
* update common_structs and enums
* match tweester and munchlesia
* update undefined_syms
* same function in different partners
* run coverage
* some changes
* other spaces
* attempt at deduplicating
* Revert "attempt at deduplicating"
This reverts commit 6393e85703.
Co-authored-by: ThreeMustyFears <>
* Decomp jump and most of tidal wave action commands
* More action commands
* stop_leech.c fully decomped.
* flee.c decomped
* cleanup and function name convention fixes
* slight cleanup
* Move ActionCommand enum to enums.h, style changes
* Changed some numbers to decimal
* That one missing newline
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
* Match all funcs
* Update common_structs.h
func_802B6000_E24040 was attempting to assign an f32 to a char[], so I updated these
* Added a couple of flags
* Some requested changes
I couldn't figure out how to get Kelebek1's suggestions for the suggest_player_anim_clearUnkFlag to work, but I managed to do it for sfx_play_sound_at_player
* Update enums.h
Removed unnecessary flag that I previously added
* Update functions.h
* Update 7bb60_len_41b0.c
There were some conflicting declarations so I changed them
* Delete ver/us/asm/nonmatchings/world/action/jump directory
* Update jump.c
* compile
* improve match
* improve
* ~check_block_input
* match LoadActionCommand
* cleanup
* match SetupMashMeter
* check_block_input much closer
* name action_cmd segments
* make better for great good
* improve again
* revert removing blah
* close
* improve
* match func_80268224
* match func_80268284 wrappers
* improvements
* work on func_80268938
* maide changes to check_block_input
* check_block_input :OK: - thanks Maide!
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
* 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>
* 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>
