Spencer Vaughn
5afce0b883
Matched effects main funcs ( #806 )
...
* hieroglyphs_main: Initial c
* hieroglyphs_update: Compiled c
* hieroglyphs_main: Matched
* huff_puff_breath_main: Matched
* smoke_burst_main: Matched
* sweat_main: Matched
* PR_806: Updated init signatures
* huff_puff_breath_main: removed unused temp
* smoke_burst_main: Updated fx struct with rgba
2022-10-07 16:31:45 +09:00
Ethan Roseman
59217b8cf8
A few battle/partner funcs ( #804 )
...
* 5 battle partner funcs
* 3 battle funcs
* rodata fix for the fish
* PR comments
2022-10-06 09:06:09 +09:00
mrshigure
b7d0ec9921
[Effects] Gfx data + stars_burst ( #803 )
...
* [Effects] Gfx data + stars_burst
* Addressed PR comments
2022-10-06 08:26:03 +09:00
Unnunu
48588557a4
flo/flo2/tik battle maps ( #805 )
...
* area_flo
* area_flo2
* area_tik
2022-10-05 19:14:18 -04:00
HailSanta
43c9a7c91d
sbk map data ( #802 )
...
* jan_00 ok
* whale cleanup
* sbk
* format cleanup
* fixes, revisions, and some trd
* stop warnings
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-06 05:11:24 +09:00
Ethan Roseman
73af4eb5a0
Tables & Chairs (sorry no chairs actually) ( #800 )
...
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "ec7bd4868e"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "ec7bd4868e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* wips
* more
* wipperz
* it workz
* mdl_make_local_vertex_copy
* sleep_bubble finished + gfx
* fire_breath gfx
* func_800F0490
* func_800EFE2C
* 8a860 funcs
* cleanup + dead cod
* dead clean
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "a1730f38ad"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "a1730f38ad"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* cleanup + splat prep
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "4e5fca24a5"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "4e5fca24a5"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* bits
* clean
* bss c -> asm
* btl_update_starpoints_display
* is_debug + cleanup
* load_script / 190B20 data
* all the symz
* clean
* cleanup + stuff
2022-10-04 23:09:23 +09:00
Unnunu
f62c83607e
omo3/pra/dig battle maps ( #799 )
...
* area_pra wip
* temp
* finish area_pra
* omo3 map
* area_dig
* cleaning up
* fixed sprite include
* removed script
2022-10-04 10:10:23 +09:00
HailSanta
cba14cc73d
end/mgm/tst maps ( #798 )
...
* mgm_00
* mgm_03
* mgm_01 OK
* several btl_kzn2
* reflection cleanup
* more maps
* ok for now
* tst_10
* area tst
* pre mgm
* mgm_02 ok
* mgm_02 cleanup
* added IDs
* end_01 almost compiles
* end_01 OK
* end_01 partially done
* end_01 almost done
* end_01 done
* end_00 OK
* credits include cleanup
* end_00 initial cleanup
* new splits 1
* done end_00 cleanup
* areas mgm, end, tst
* whale stuff
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-03 20:56:24 -04:00
Spencer Vaughn
794618569d
Match 3 effects ( #797 )
...
* func_80240BD4_EA96B4: Initial c
* func_80240BD4_EA96B4: compiles
* func_80240BD4_EA96B4: Match
* func_8024199C_ECB69C: Initial c
* func_8024199C_ECB69C: Compiled c
* func_8024199C_ECB69C: Non matching
* func_80242260_EE8810: Initial c
* func_80242260_EE8810: Compiled c
* func_80242260_EE8810: Non matching
* smoke_burst_update: Initial c
* smoke_burst_update: Compiled c
* smoke_burst_update: updated SmokeBurstFXData
* smoke_burst_update: Matched
* removed asm match
* Fixed warnings
* PR_796: Comment clean up
* PR_796: Added new line after temp declaration
* hieroglyphs_update: Initial c
* hieroglyphs_update: Compiled c
* hieroglyphs_update: Matched
* huff_puff_breath_update: Initial c
* huff_puff_breath_update: Compiled c
* huff_puff_breath_update: Matched
* hieroglyphs_update: Updated effects.h
* hieroglyphs_update: Updated effects.h
* PR_796: Clean up 3
* PR_796: Updated commented struct sizes and updated bools
* PR_796: Updated bools in EA8AE0
* sweat_update: Initial c
* sweat_update: Complied c
* sweat_update: Matched
* sweat_update: Matched clean up
* huff_puff_breath_update: Updated effects struct size
* hieroglyphs_update: Update effects struct size offset
* hieroglyphs_update: Matched clean up
* huff_puff_breath_update: Matched clean up
* PR_797: Updated struct member names
Co-authored-by: Spencer Vaughn <spencer.vaughn@dws.la>
2022-10-04 03:12:44 +09:00
Spencer Vaughn
c976e6e6fe
First effects match + 3 random functions ( #796 )
...
* func_80240BD4_EA96B4: Initial c
* func_80240BD4_EA96B4: compiles
* func_80240BD4_EA96B4: Match
* func_8024199C_ECB69C: Initial c
* func_8024199C_ECB69C: Compiled c
* func_8024199C_ECB69C: Non matching
* func_80242260_EE8810: Initial c
* func_80242260_EE8810: Compiled c
* func_80242260_EE8810: Non matching
* smoke_burst_update: Initial c
* smoke_burst_update: Compiled c
* smoke_burst_update: updated SmokeBurstFXData
* smoke_burst_update: Matched
* removed asm match
* Fixed warnings
* PR_796: Comment clean up
* PR_796: Added new line after temp declaration
* PR_796: Clean up 3
* PR_796: Updated commented struct sizes and updated bools
* PR_796: Updated bools in EA8AE0
Co-authored-by: Spencer Vaughn <spencer.vaughn@dws.la>
2022-10-03 08:05:04 +09:00
HailSanta
7b24d78503
area KZN and others ( #795 )
...
* kzn_01
* cleanup
* kzn_05
* sound name
* missed evt_ptr
* splat change
* broken :(
* pan params for other maps
* works, but not great
* some kzn funcs
* documentin
* minor
* kzn_07 funcs
* more matches
* kzn_08
* kzn_06 fixup
* kzn_01_fix
* kzn 5
* kzn_07
* surprisingly OK
* some matches
* letter choice
* refactor
* more maps
* check
* first area done!
* now with extra bonus map
* kzn23
* some camera stuff
* entrances adjustment
* kzn_22 OK
* kzn_22 cleanup
* kzn_20 ok
* kzn_20 cleanup
* kzn_18 ok
* kzn_18 cleanup
* kgr_01
* area kgr done
* kgr_02 renames
* kzn_11
* kzn_17 ok
* kzn_17 cleanup
* kzn_04 done
* kzn_03 ok
* kzn_19
* bad kzn_19
* funcs idk
* figured a thing out
* kzn_19 ok
* some matches
* kzn_19 cleanup
* all kzn funcs
* merg'd
* some kzn btl matches
* vine field renames
* kzn cleanup 1
* kzn cleanup 2
* tab patrol
* trailing space patrol
* piranha anims split
* actor type sounds
* example
* requests + remove hardcoded dma entries
* split vine image
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-30 21:44:48 -04:00
Ethan Roseman
473bfa0692
dead_sqrtf, data migration, etc ( #790 )
...
* more goods
* move dead map data to dir
* data migration / splatification
* new splat
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "d93b6550c4"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "d93b6550c4"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* splat fix
* dead_sqrtf bye bye
* fix
* Clover comments
* comment
2022-09-29 05:52:12 +09:00
Unnunu
50ab50f669
filemenu ( #791 )
...
* migrated filemenu data
* matched filemenu_get_menu_message
* matched the rest of filemenu
* cleaning up
* fix
2022-09-29 02:09:11 +09:00
mrshigure
70590f890e
[Effects] Matched 29 functions ( #789 )
...
* [Effects] Matched 29 functions
* Fixing a warning
* Addressed PR feedback
2022-09-28 03:10:05 +09:00
HailSanta
3a8ba482e4
collision stuff ( #785 )
...
* flag fixes
* enum vals
* npc flags
* ai flags
* collision stuff
* ok
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-25 05:01:49 +09:00
HailSanta
b6ab97c066
enum cleanup ( #784 )
...
* flag fixes
* enum vals
* npc flags
* ai flags
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-25 04:34:16 +09:00
Ethan Roseman
87179cdf3f
Shiftability work + splat update ( #783 )
...
* evt bss + shiftability work
* entity BSS
* more BSS
* another follows_vram
* more shift goodz
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "9af40c5265"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "9af40c5265"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
2022-09-24 11:21:54 -04:00
HailSanta
3706178f3a
sprite names ( #782 )
...
* 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>
2022-09-24 18:04:13 +09:00
mrshigure
79babd7154
Matching more effects ( #780 )
...
* Matching more effects
* Deleted matched functions
* Addressed PR comments
* PR comments and remove goto
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-21 16:09:22 +09:00
Alex Bates
1ad0f7b149
Fix 'badly punctuated parameter list in define' issues ( #777 )
...
* remove defines of old SCRIPT macro
* get rid of uses of unnamed ...
2022-09-16 08:27:35 -10:00
Alex Bates
4fa83c8ae6
Match src/battle/area_kzn2/59F420.c (petit piranha funcs) ( #774 )
...
* Match func_80218D90_59F470 (src/battle/area_kzn2/59F420.c)
* clean up
* Match func_80218D40_59F420
* name funcs
* fix warnings
* remove double newline
2022-09-16 06:45:16 -10:00
HailSanta
9ef69b66cf
needed more DEG_TO_RAD ( #773 )
...
* sneaky
* first batch
* DEG_TO_RAD
* some mac_04 funcs
* parasol done
* unk playerstatus fields
* sprite learnin
* new sprite stuff
* yay
* fix a warning
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-15 09:39:16 -10:00
mrshigure
5592b4dae2
Matching effects ( #771 )
...
* Matching effects
* Updated fx_3D_main
* Changing color values to decimal
2022-09-13 18:52:01 +09:00
HailSanta
81c2817b09
PLAYER_STATUS_FLAGS begone ( #772 )
...
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-13 15:36:06 +09:00
HailSanta
f7e39c0802
player anim + collider surface types ( #769 )
...
* player anim + collider surface types
* added default surface type
* remove unused flags and define surface mask
* revised action table
* checkpoint
* player sprite stuff
* remove currentAnim union
* more actions
* enough
* discharged
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-13 02:26:57 -04:00
HailSanta
70d3b7b3a8
msg names and more map data prep ( #768 )
...
* minor NPC fixup
* most var type renames
* rest of var names
* remove deprecated
* var types cleanup
* fixed -> float 1
* fixed -> float 2
* fixed -> float 3
* fixed -> float 4
* evt fixed removed
* localvar shorthand
* missing byte names
* missing flag names
* evt var cleanup
* local var shorthand redux
* minor cleanup
* mario anim name
* item ranges cleanup
* player anim names
* all message names
* renames for existing
* remove unused enum
* squash msg ids
* again
* all message refs replaced
* area headers
* idk
* also merged
* remove superfluous parens
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-12 01:23:47 +09:00
Ethan Roseman
0094fa6a31
Pigs and speech bubbles 🐽 💬 ( #767 )
...
* lil_oink effect
* oink map funcs
* fix build to not be big
* machi funcs
* mac func
* data migration
* draw_shop_items
* e20eb0.c funcs + data
* warnings
* PR warnings and cleanup
2022-09-11 02:04:04 +09:00
Ethan Roseman
408c49cb75
one for the books ( #765 )
...
* func_802A1518_78BB18
* btl_state_update_select_target
* wip
* btl_state_draw_select_target and WIP
* cleanup
* render_shaded_sprite and wip
* WIP/cleanup
* wip
* reset_player_status
* btl_state_update_player_move and cleanup
* func_802A2C84
* func_80242FE0 wip
* btl_state_update_normal_start and cleanup
* WIP
* btl_state_update_end_turn
* btl_state_update_enemy_striking_first
* cleanup
* cleanup & wip
* item_entity_update & cleanup
* update_item_entity_temp
* appendGfx_item_entity
* E21870
* mdl_create_mode
* cleanup
* func_802A9310_42D220
* area_flo2 battle funcs dun
* b_area_isk_part_1_ChompChainUpdate
* wip and rip
* clean
* partner_move_to_goal
* partner_get_out
* wip
* cleanup
* func_802BD1AC_31CD1C
* func_802BD754_31D2C4
* Cleanin
* fix func def
* UnkShadowFunc001
* a bunch of kpa funcs
* comment
2022-09-08 21:21:07 +09:00
HailSanta
c108f11cab
EVT mass renames ( #763 )
...
* 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>
2022-09-08 21:12:26 +09:00
mrshigure
2d68776591
Matched a couple of effects functions ( #764 )
...
* Matched a couple of effects functions
* Deleted asm files
* Addressed PR comments
2022-09-08 18:46:35 +09:00
Kevin Klions
a580f19ab8
Matched a couple random functions ( #761 )
...
* matched function rising_bubble_update
* matched function func_80240A5C_9B21EC
* matched func_802417AC_EAA28C
* fixed build, addressed PR comments
* addressed more PR comments
2022-09-07 22:19:01 +09:00
HailSanta
0df93d5b2b
prep for map dumping ( #760 )
...
* 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>
2022-09-06 11:26:53 -04:00
Kazu
c0d92f075a
Matching some kkj, kpa, pra, and osr area functions ( #758 )
...
* Matching some kkj, kpa, and osr area functions
* Include effects.h in AAC830.c
* Addressed PR comments
* Separated strings in func_80240000_AAFFF0
* Addressed PR comments continuation
* Added Bytecode args in func_80240020_AB2190
* Match func_802401A0_AB6430, func_80240000_AB92B0, func_80240050_AB9300
* Match functions that call start_rumble
* Match functions from area_pra
* Addressed PR comments
* Color hex to dec func_802401A0_AB6430
2022-09-07 00:09:50 +09:00
mrshigure
cc2d6996b8
Matching effects and some world/area_kkj functions ( #756 )
...
* Matching effects and some world/area_kkj functions
* Partially addressed PR comments
* Partially addressed PR comments
* Added EVT_FIXED_TO_FLOAT macro
2022-09-05 13:53:21 +09:00
EllipticEllipsis
1a8c131880
Match a few functions, cleanup of unmatched libultra/gcc internal stuff, some documentation in 43F0.c ( #755 )
...
* Decompile memset, strcpy, strcmp
* Rename a lot of libultra functions and files,
match int_to_string (43F0.c OK)
* Nail a few warnings
* Clean up libultra header includes somewhat
2022-09-04 22:12:30 +01:00
mrshigure
2ad8779ea7
Matched some world/area_kkj functions ( #754 )
...
* Matched some world/area_kkj functions
* Deleted matched functions
* Partially addressed comments
* Addressed comments
2022-08-31 15:33:56 +09:00
HailSanta
51d02cfbf5
actor decor stuff ( #750 )
...
* 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>
2022-08-26 19:13:57 +09:00
Ethan Roseman
7467b148d1
A few funcs ( #751 )
...
* update_item_entity_collectable
* cleanup
* snibblets and bits
* CancelablePlayerRunToGoal and PlayerRunToGoal
* nonmatch
* PR comments and peach_star_beam effect
* PR stuffs
2022-08-25 19:18:04 +09:00
Ethan Roseman
9d47d968f9
small and large boys ( #749 )
...
* func_802DE780
* EnterPlayerPostPipe
* UnkFoldFunc
* smores
* func_802403C0_800C40
* 3 mo
* filemenu_draw_char
* btl_state_update_enemy_move
* prepz
* fix func thing
* btl_state_update_partner_striking_first
* PR comments
* PR comment
* warning
2022-08-17 10:15:54 +09:00
HailSanta
d11054b41a
several actor funcs ( #748 )
...
* no sun :(
* livin in the sunshine
* misc
* small fix
* splat fix
* comments + sparkles enum
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-08-17 10:04:23 +09:00
Ethan Roseman
ded1be2b17
Effect work and rodata migration ( #747 )
...
* bombette_breaking WIP
* bombette_breaking
* migration & stuff
* spr funcs
* btl_state_update_begin_turn
* beginning effect data work
* effect rodata migration
* fix
* fixin
* breaking_junk
* args
* handle gfx
* trim yaml
* yaml cleanup
* gfx stuff
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "b681843a78"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "b681843a78"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* water_splash gfx
* move decl down
* fix warnings
2022-08-11 00:29:06 +09:00
HailSanta
f4efd09c80
isk + misc ( #746 )
...
* 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
2022-08-10 14:36:38 +01:00
HailSanta
ba183f35b5
effect organization ( #745 )
...
* 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>
2022-08-07 21:42:54 +09:00
HailSanta
1ce49b1ba9
audio odyssey ( #744 )
...
* first pass
* seq cmd args retyping
* some SEF commands
* etc
* couple more SND commands
* more functions
* checkpoint
* five more
* another one
* more funcs + cleanup
* reverted unnecessary unions
* all SEF commands done
* a bunch more
* more!
* morrrrrrre
* almost done for now
* 99%
* 100
* few names and types
* reorg
* minor chnages
* miscmiscmisc
* yet more
* another day another func
* eth wip func_8004EC68
* some sym names
* retyping sound mgr fields
* minor renames
* D_80078400
* bigger func
* retypings
* enhanced drum info
* the evil is defeated
* merged
* prelim ambient sound func names
* audio frame
* checkpoint
* renames
* learnin bout sounds
* latest
* fix snd_load_BK_to_bank
* func_80056FA4
* warnings
* cosmetics
* func_800522A8
* struct reorg
* figured some stuff out
* much more info
* fx params
* cleanin up
* revert accidental changes to jp
* more accidental jp changes reverted
* misc names
* small stuff
* migrated all audio data
* checkpoint
* header reorg begins
* audio public/private headers
* fixed headers
* fixin warnins
* oops
* 51 fixed
* formatted binary data in 30450
* workwork
* cleanup
* misc
* flip macro arg order
* more names
* audio event triggers
* various
* sfx player cleanup
* start bgm player cleanup
* names names names
* priorities
* merlow
* misc enum vals
* rocking chair
* kmr_00 funcs
* enough
* restore delete jp file
* func_80055EB4
* fix func name
* addressed comments
* demoted a couple variables from global
* couple hidden panel things
* credits mostly
* credits dedupe in progress
* jump table repair
* 'finished' end dedupe
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-08-06 21:14:04 +09:00
Unnunu
ae64b1b5cc
entities ( #741 )
...
* matched execute_render_tasks
* step_entity_command_list
* partially migrated entity data
* entity blueprints migrated
* matched create_entity
* matched entity functions
* SaveBlock
* SaveBlock and Switch
* switch model done
* matched shattering block functions
* shattering block models
* matched block funcs
* block models
* finish Block.c
* ItemBlock
* HeartBlock
* SuperBlock
* SimpleSpring
* HiddenPanel wip
* HiddenPanel
* Chest
* WoodenCrate
* BlueWarpPipe
* SignPost
* Padlock
* Boarded floor and padlocks
* BombableRock
* Tweester
* StarBoxLauncher
* wip
* ArrowSign
* BellbellPlant
* TrumpetPlant
* munchlesia wip
* Munchlesia
* UnusedBlock
* cleaning
* fix warnings
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "fd9cbc3a1"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fd9cbc3a1"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* PR suggestions
* created vtx splat segments
2022-07-17 17:38:19 +01:00
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
JaThePlayer
d65d58af35
Mystic Miscellaneous Matches ( #732 )
...
* Some random functions
* fixed a flag, oops
* classic coverage.py blunder
* Fixed the warning + style changes
* More warning fixes
* Remove the NON_EQUIVALENT wrapper
2022-06-14 00:00:53 +09:00
Unnunu
e324092e0a
entity models and some gfx functions ( #731 )
...
* decomp 7 functions
* match func_80138E54
* matched render_transition_stencil
* renames
* fix warnings
* fix two warnings
2022-06-13 02:22:06 +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
59119c0949
item entity functions and a few others ( #725 )
...
* matched 4 functions
* matched 2 item entity funcs and migrated data
* removed default case and fixed lights def
2022-06-09 00:36:32 +01: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
Rainchus
2de8e0c028
various removal of hardcoded pointers ( #721 )
...
* various removal of hardcoded pointers
* fix most warnings introduced
* fix building
* unhardcode entity pointers
* more unhardcoding of pointers
* remove 2 warnings
2022-06-01 22:56:36 -04:00
Ethan Roseman
341ed0040f
some assorted cleanup / commenting of stuff ( #722 )
2022-06-01 03:39:46 +09:00
Unnunu
d8837960b1
pra2 battle map ( #720 )
...
* area_pra2
* finish
* sound enum
* renamed enum member
* fixed alignment
2022-05-31 03:39:42 +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
Unnunu
6815d6b296
matched some battle movement functions ( #714 )
...
* match 5 functions
* move update_lerp_battle declaration
* PR suggestions
2022-05-22 16:48:09 +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
pixel-stuck
5f2aca559c
decomp damage_indicator ( #705 )
2022-05-10 11:25:50 +01: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
Kevin Klions
e85761f7ad
tik_05 functions ( #699 )
...
* matched func_802DE748, thanks stuckpixel
* revert changes made while experimenting
* matched func_8024093C_8756FC
* deleted func_802DE748 assembly
* fixed some small things
* fixed access to ptrReadPosition in func_8024093C_8756FC
* removed random whitespace
* small changes
* match
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-22 01:07:22 +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
Kevin Klions
13cc6f46e5
func_80240790_BBD930 ( #697 )
...
* matched func_80240790_BBD930
* removed unncessary variables
* deleted matched assembly function
* changes from comments
* fixed
2022-04-19 02:15:33 +09: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
Rainchus
93d8c4989b
More overworld partner functions and other various functions ( #680 )
...
* 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
* 891b0 and sprite functions
* finish lakilester world file
* run coverage.py
* remove duplication declarations
* requested changes and remove some warnings from sprite.c
* ...run coverage.py
* decomp 2 funcs in throw_spiny.c
* throw_spiny_appendGfx
* match spiny throw.c and remaining kooper overworld functions
* cleanup throw_spiny.c and decomp spin.c
* combine variable declarations in spin.c
* run coverage.py
* more spin.c cleanup
* req changes
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-12 10:59:20 +09:00
alex
2b28074f94
Add include/mapfs/ headers ( #687 )
...
* add include/mapfs/
* use model names for some battle stages
* name stage fields
* area_iwa
2022-04-12 00:03:16 +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
4555d9fab5
StashVars ( #679 )
...
* beginnings
* more
* done
* cleanup
* remove sublist.txt
2022-04-08 14:25:49 -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
Rainchus
70a0b67237
Finish lakilester overworld file ( #669 )
...
* 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
* 891b0 and sprite functions
* finish lakilester world file
* run coverage.py
* remove duplication declarations
* requested changes and remove some warnings from sprite.c
* ...run coverage.py
* requested changes for laki file and update functions.h
* remove redundant includes
2022-03-26 19:37:14 +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
bcffe508ba
btl_state_update_celebration (Thanks Unnunu!) ( #668 )
...
* btl_state_update_celebration (Thanks Unnunu\!)
* fixes
* warnings
2022-03-23 06:27:22 +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
9cd911765d
File menu & more ( #658 )
2022-03-10 09:55:38 +00:00
JaThePlayer
2d733f4097
Blast, aura, sleep_bubble, fire_flower, bombette_breaking effects ( #656 )
...
* Blast, aura, sleep_bubble, fire_flower, bombette_breaking
* run coverage.py
* Move the typedefs to effects.h
2022-02-25 22:19:53 +09: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
fb828bf8da
music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration ( #652 )
...
* music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration
* implement requested changes
* Recover.c data fixes, style changes
* The one newline lol
* f
2022-02-22 00:53:26 +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
Ethan Roseman
d02e72e78f
Item funcs & ctx fixes ( #649 )
...
* stuffs
* func_80136A08
* C50A0
* WIP
* clean
* fix context issues
* clean
2022-02-18 02:11:27 +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
348d12c4e3
Match some more Libultra ( #639 )
2022-02-08 14:05:20 +00:00
JoshDuMan
9394e1ee21
Match phys_peach_update ( #638 )
2022-02-02 17:19:52 +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
d2da25dc10
GCC 2.7.2 support ( #633 )
...
* 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
* attack_result_text
* PR stuffs
* numbaz
* Attempt to get 2.7.2 support working
* Update Jenkinsfile
* try
* fix
* fix issues
* remove KMC_ASM remnants
* NON_EQUIVALENT for the effect gfx func
* We don't need wine
2022-01-29 10:01:26 +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
JoshDuMan
ee0918018d
Match get_overriding_player_anim ( #631 )
2022-01-24 13:51:48 +00: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
JoshDuMan
3de396c043
Match 2 funcs in 77480.c ( #630 )
...
* update_player_blink
* Delete update_player_blink.s
* Delete check_for_conversation_prompt.s
* Match check_for_conversation_prompt
* Update variables.h
* Update 77480.c
* Warnings
2022-01-20 22:46:12 -05:00
Ethan Roseman
3bd5a9d91e
Goods and Services (misc decomp PR from eth number 335) ( #629 )
...
* an end func
* 2nd segment bss file added
* hud_element work
* some renaming, set_hud_element_scale
* 2 hud_element funcz
* remove more unneeded undefined_syms
* bss 3, PR comments
* fx_134
* func_80200080
* 4 funx
* fix shtuff
* a func
* create_actor
* func_80263064
* initialize_battle, some stuff, and cleanup
* clean
* NL
2022-01-20 22:08:24 +09: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
JoshDuMan
b87012a0da
Match two functions in 23680.c ( #624 )
...
* Match 2 func's
* Delete func_800496B8.s
* Delete func_800490B4.s
* unk_AC
* Change func_800490B4 type
* comments
2022-01-16 22:32:17 +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
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
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
Ethan Roseman
e60e5fccd1
BSS round 2, hud_element.c funcs ( #613 )
...
* an end func
* 2nd segment bss file added
* hud_element work
* some renaming, set_hud_element_scale
* 2 hud_element funcz
* remove more unneeded undefined_syms
* bss 3, PR comments
2022-01-11 03:25:06 +09:00
Unnunu
486dbfda39
Match status_icons ( #612 )
2022-01-10 15:55:26 +00:00
Unnunu
559007d861
Match collision functions ( #609 )
...
* match allocate_hit_tables
* load_collision
* load_hit_data
* parent_collider_to_model
* update_collider_transform
* test_up_ray_collider
* test_ray_triangle_general
* test_down_ray_triangle
* test_up_ray_triangle
* test_ray_colliders
* test_ray_zones
* test_ray_entities
* func_8005DB00
* rename everything
* follow codyng style
* fix
* PR suggestions
* remove p prefix
Co-authored-by: Sergey Zorkin <szorkins@gmail.com>
2022-01-08 19:11:20 +09:00
JoshDuMan
5d5106b39c
Work on Pointers ( #610 )
2022-01-08 14:47:52 +09:00
JoshDuMan
d684991270
Disassemble TRD Part 1 Battle Map ( #607 )
2022-01-08 14:43:11 +09:00
Alex Bates
64c0b7de02
Avoid _VA_LIST_ in EVT_CALL ( #611 )
...
Fixes a weird compile error on precomp
2022-01-07 23:01:22 +00:00
JoshDuMan
03c60ee7c5
Improve disasm_script.py and do some sample scripts ( #606 )
2022-01-06 11:32:57 -05:00
Ethan Roseman
ccd3b17322
World Decomp & Dedupe ( #604 )
...
* two new funcs
* UnkFunc53
* more cleanup & dedupe
* UnkEffect0FFuncs
* tst funcs
* anotha one
* UnkNpcAIFunc42
* UnkNpcAIFunc43
* UnkNpcAIFunc44
* UnkNpcAIFunc45
* UnkNpcAIMainFunc4
* UnkNpcAIMainFunc5
* UnkNpcAIMainFunc6
* warnings
2022-01-06 22:40:01 +09: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
JoshDuMan
55228bd3a7
Fix a few warnings ( #601 )
...
* .
* Externs
* Fix a few warnings
* __osGetCause
* Comment
* Ethan
2022-01-04 02:36:01 +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
f44eb0bb88
Disassemble KMR 3 Battle ( #600 )
...
* Work.
* D_80000000
* The rest of KMR_03
* Comments
2022-01-03 18:54:01 +09:00
JoshDuMan
5962ce37fd
Disassemble KMR 2 Battle ( #597 )
2022-01-01 08:08:04 -05:00
Ethan Roseman
5cb9183779
Effects, includes ( #589 )
...
* effect_13
* effect_14
* most of effect_15
* clean, standardize effects
* fx_16 wip
* UnkNpcAIFunc35
* includes
* UnkPosFunc2
* UnkNpcAIFunc36
* PR comments
2021-12-30 14:14:55 +09:00
JoshDuMan
bd56f6060f
Decomp Some Libultra ( #588 )
...
* Work on KMC Libultra
* libultra decomp
* fix
2021-12-29 15:14:20 -05:00
JoshDuMan
7f1c1351f2
Match actor_api.c ( #585 )
...
* Decomp 3 197F40 functions
* 2 more
* oops
* 3 more
* Match the last of actor_api.c
* comments
2021-12-29 21:22:01 +09: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
Alex Bates
d22bd18f98
Disassemble Star Power scripts ( #584 )
...
* fix diff_evt.py
* document UW/UF based on @SeekyCt's advice
* fix star_rod_idx_to_c.py
* migrate battle/star/focus data
* use N() where possible
* rm data.s
* update symbol_addrs
* refresh
* lullaby
* star storm
* chill out
* fix float problems (sad)
* smooch
* time out
* up and away
* star beam
* peach beam
* peach focus
* peach dash
* rm old data
* 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
* merge
* Introduce SPRITE_PIXEL_SCALE (#580 )
* fix func_80273444 warns
* make end of data explicit in splat.yaml
* lol
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
2021-12-29 02:11:07 +09:00
Alexander Faßbender
70c2c679a4
Introduce SPRITE_PIXEL_SCALE ( #580 )
2021-12-28 12:52:32 +00:00
JoshDuMan
69e1a012bd
Partner Script Disassembly ( #577 )
...
* frogress
* kooper data
* More Work
* Bombette, Sushi, Parakarry Scripts
* Finish wPartners work.
* Partner BSS
2021-12-28 21:44:31 +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
JoshDuMan
fe374e5fb1
Match func_802552EC ( #573 )
...
* Match func_802552EC
* Delete func_802552EC.s
* Clean-up
* actor
* Update functions.h
* oops
* Match update_actor_shadow
2021-12-27 21:55:35 -05:00
JoshDuMan
2f23f46775
Match func_802549F4 ( #571 )
...
* Match func_802549F4.
* Delete func_802549F4.s
* Match func_80254C50
* s8
* Delete func_80254C50.s
* Update functions.h
* s8 again
* Trying out github.dev
* Fix build?
* Match func_802550BC
2021-12-26 20:29:29 +09:00
Rainchus
095680b006
Duplighost battle functions ( #556 )
...
* decomp some functions in 1AC760.c
* broken data migration
* data nearly migrated, rodata in laki file is null
* fix building and laki data migration
* data migration for kpa3 WIP
* add missing data
* decomp duplighost functions and duplicates
* fix some warnings
* resolve issues
* fix warnings
Co-authored-by: Brotenko <brotenko@gmail.com>
2021-12-25 10:34:55 +09:00
Alexander Faßbender
3428ae1941
Convert DSL scripts into macro syntax ( #570 )
...
* convert half the workload of DSL scripts into macro syntax
* convert more DSL scripts to macro syntax
2021-12-25 02:09:06 +09: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
JoshDuMan
f940e6188c
Match enable_actor_blur ( #566 )
...
* Match enable_actor_blur
* Delete enable_actor_blur.s
* resolve issues
Co-authored-by: Brotenko <brotenko@gmail.com>
2021-12-24 23:09: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
JoshDuMan
6e062b19d8
Disassemble and format DGB data. ( #558 )
...
* Dissamble data.
* Fix warnings and format data
2021-12-22 23:59:52 +09: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
JoshDuMan
a5340e8dce
Fix many warnings. ( #557 )
...
* Fix many warnings.
* Fix more warnings.
* More warnings
* Some more warnings
* Last fixes and address comments
* ehtan
2021-12-21 00:59:25 +09:00
JoshDuMan
0b4d9252c1
Many func's in 20ec0_len_5040.c ( #554 )
...
* Start working matching 20ec0_len_5040.c
* Update 20ec0_len_5040.c
* Delete enable_status_1.s
* Delete enable_status_2.s
* Delete enable_status_3.s
* Delete enable_status_4.s
* Delete enable_status_icon_boost_hammer.s
* Delete enable_status_icon_boost_jump.s
* Delete enable_status_icon_boost_partner.s
* Delete enable_status_icon_danger.s
* Delete enable_status_icon_peril.s
* Delete enable_status_icon_surprise.s
* Match remove_status_ func's (#9 )
* Fix build (#10 )
* Match 6 more (#11 )
* create_status_icon_boost_hammer
* Comments
* StatusIconFlag
2021-12-17 23:09:33 -05:00
JoshDuMan
2b6323a6b2
Match check_for_interactables ( #553 )
...
* Match check_for_interactables
* Delete check_for_interactables.s
* Update enums.h
* unk_C8 -> Npc*
* Update 77480.c
* Update 77480.c
* Update 77480.c
* Update 77480.c
* Update 77480.c (#7 )
* Update functions.h
* Merge branch 'master' of https://github.com/pmret/papermario into arn
* Fix build.
* Update src/77480.c
Co-authored-by: Alex Bates <hi@imalex.xyz>
* Comments
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-17 23:04:54 -05:00
Ethan Roseman
9e1d4db698
First overlay's BSS symbols moved to C ( #551 )
...
* 2 fold funcs
* func_8013B1B0
* cleanup & naming
* more formatting
* cleanup
* progress & filemenu stuff
* 2
* func_8013CFA8
* fold_load_gfx (thanks Wiseguy)
* update_encounters_pre_battle
* 3 mdl funcs
* more model funcs
* cd180 funcs
* progrezz
* 3 cam funcs
* more
* 1 more
* eob30 progress
* sfx_play_sound_at_position & sound enum cleanup
* cleanup
* cleanup2
* PR comments
* BSS migrated to C for the first overlay
* rename
* PR comments
2021-12-16 17:33:47 +09:00
Alexander Faßbender
967427ba97
Decomp misc funcs ( #546 )
...
* 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>
2021-12-15 20:12:43 +01:00
Ethan Roseman
7230c62545
Appetizer sampler ( #547 )
...
* 2 fold funcs
* func_8013B1B0
* cleanup & naming
* more formatting
* cleanup
* progress & filemenu stuff
* 2
* func_8013CFA8
* fold_load_gfx (thanks Wiseguy)
* update_encounters_pre_battle
* 3 mdl funcs
* more model funcs
* cd180 funcs
* progrezz
* 3 cam funcs
* more
* 1 more
* eob30 progress
* sfx_play_sound_at_position & sound enum cleanup
* cleanup
* cleanup2
* PR comments
2021-12-13 18:27:28 +09:00
Alexander Faßbender
c719faf847
Create simple data "migration" script ( #548 )
...
* setup function
* cleanup parts of calc_item_damage_enemy
* init data2c
* clean up data2c.py
* .
* rename and update script to have additional functionality
* .
2021-12-12 22:53:19 +09:00
Rainchus
d9c72e432b
Match more overworld partner functions ( #541 )
...
* 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>
2021-12-06 21:25:43 +09:00
JoshDuMan
cf8f817af2
Match check_for_ispy and check_for_pulse_stone ( #544 )
...
* Match check_for_ispy
* Delete check_for_ispy.s
* Match check_for_pulse_stone
* Delete check_for_pulse_stone.s
* Update 77480.c
* Update 77480.c
* Update variables.h
* Update variables.h
2021-12-04 23:23:12 +09:00
JoshDuMan
72b2e593f6
Match func_8026EBF8, LoadFreeItemScript, and LoadItemScript ( #543 )
...
* Match func_8026EBF8
* Delete func_8026EBF8.s
* Match LoadItemScript
* Delete LoadItemScript.s
* Document more of DecorationTable
* Fix warning.
* Comments
* Comments
* Match LoadFreeItemScript
* Delete LoadFreeItemScript.s
* doublke
* Alex GOAT
Co-authored-by: Alex Bates <hi@imalex.xyz>
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-04 13:34:49 +09:00
Alexander Faßbender
d2ce4dd89e
Match all FX render functions ( #540 )
...
* match most fx_XX_render functions
* match the rest of the fx render functions
* resolve data migration issues
* resolve issues
* Update effect_117.c
2021-11-26 10:25:50 +09:00
Ethan Roseman
755c83a363
fold_* , effect_10, and other assorted decomp ( #535 )
...
* 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
2021-11-19 23:31:28 +09:00
ThreeMustyFears
7a95f21a17
Match some 16F740 funcs ( #532 )
...
* 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 <>
2021-11-17 23:43:50 +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
e9f80f2856
Decompile misc battle map funcs ( #528 )
...
* .
* .
* resolve issues
* Update fx_api.c
* Update fx_api.c
2021-11-14 21:23:07 +01:00
Alexander Faßbender
75e2c18977
Decompile even more misc battle map funcs ( #531 )
...
* decompile misc battle map funcs
* fix warnings
2021-11-14 21:16:52 +01:00
Ethan Roseman
34254d102e
appendGfx_message ( #520 )
...
* 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>
2021-11-12 21:23:43 +09:00
Lightning
90c0d29bf9
match _heap_realloc ( #524 )
...
* match _heap_realloc
* Minor code cleanup
2021-11-11 13:38:52 +09:00
Alexander Faßbender
be4bb17dee
Update flags and enums in enums.h ( #525 )
...
* 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
2021-11-11 13:30:59 +09:00
JoshDuMan
fd7acde70b
Match attack submenus ( #523 )
...
* Match func_80263914
* Match func_802634B8
* Match func_802636E4
2021-11-10 18:57:55 +00:00
Lightning
4733902ec8
Match _heap_free ( #522 )
...
* Committing _heap_free match
* More renames and fixes from PR
* Ver without goto's from Josh
* Accidently left pointers in
* More variable fixes based on calls to _heap_*
* Remove unneeded comments, fix function variable name in header
* Missing a space
* Revert to while loop
* Sneaking in an additional comment about heap_malloc_tail for clarity
* Missed whitespace
* Reduced some comments
2021-11-08 01:58:57 +09:00
JoshDuMan
97523d8af1
Match deduct_current_move_fp ( #521 )
...
* Match deduct_current_move_fp
* Delete deduct_current_move_fp.s
* Fix costFP type
* Match reset_actor_turn_info
* Delete reset_actor_turn_info.s
* Cleanup
* Address Ethan's comment
2021-11-07 18:20:08 +09:00
Lightning
95ea4223d5
Match _heap_malloc and _heap_malloc_tail ( #519 )
...
* Matched _heap_malloc and _heap_malloc_tail
* Move heap_malloc away from using s32 returns
* Remove unmatched files
* Missed a line
* Requested changes
* Add more changes from hidden convos
* Working through entries :)
* Remove extra parens left over from match work
* Removed macro per Ethan's request
* Fix a space
2021-11-06 23:10:53 -04:00
JoshDuMan
cb9e287768
Match count_power_plus ( #518 )
2021-11-05 13:54:23 +00:00
Technoman
99a81611f6
Match ModifyActorDecoration, func_8026EA7C, get_coin_drop_amount ( #516 )
...
* Match get_coin_drop_amount
* Delete get_coin_drop_amount.s
* Match func_8026EA7C
* Delete func_8026EA7C.s
* extern func_80266D6C
* Match ModifyActorDecoration
* Update DecorationTable
* Update ModifyActorDecoration
* Fixed DecorationTable
* Delete ModifyActorDecoration.s
* Update DecorationTable
* Update DecorationTable
* Fixed DecorationTable, Added DecorationUnk
* Fixed DecorationTable?
* Update func_80266dc, create_part_shadow_by_ref
* Update get_coin_drop_amount
* func_8026EA7C
Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
* Update DecorationTable
* Update get_coin_drop_amount
* Update DecorationUnk
* Update get_coin_drop_amount
* Update get_coin_drop_amount
* Update DecorationUnk
Co-authored-by: Alex Bates <hi@imalex.xyz>
Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-11-04 02:08:36 -04:00
Alex Bates
a7caa90d28
Add descriptions to all map headers ( #515 )
...
* remove bad create_actor declaraton
* maps.py
* area name
* add doc names for all maps
* rm maps.py
2021-11-01 22:22:40 +09:00
Rainchus
432e891080
Various C file decomp ( #501 )
...
* 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
2021-11-01 17:06:45 +09:00
Technoman
b4e5b9e6af
Match SummonEnemy & UseIdleAnimation ( #510 )
2021-10-31 15:39:33 +00: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
Ethan Roseman
068b8a5b08
B4580 and d0a70_len_4fe0 ( #502 )
...
* func_80133A94
* animator stuff
* add_anim_node and animator_node_update_model_transform
* a bunch more
* more
* .
* temp
* create_mesh_animator
* 2 mo
* d0a70 funcs
* more d0a70
* 2 mo
* 1 + cleanup
* 2 mo
* cleanup
* revert change to verbosity for splat
* PR comments
2021-10-30 02:57:15 +09:00
Alex Bates
af880293a3
Add sprite.h ( #503 )
...
* add sprite.h
* fix reflection warnings
2021-10-30 01:48:20 +09:00
JoshDuMan
b062511b1a
Match calc_enemy_test_target ( #499 )
...
* match calc_enemy_test_target
* Delete calc_enemy_test_target.s
* Address comments
* Fix cloudNineDodgeChance
* Update common_structs.h
2021-10-29 21:38:40 +09:00
Gota7
9ac9c6b904
Match msg_get_glyph ( #497 )
...
* Match msg_get_glyph
And fix the type definition for draw_msg, that's it really.
* PR fixes
* PR Fix
2021-10-28 21:19:44 -04:00
Alexander Faßbender
1f57f7ed09
Decompile several battle map functions ( #500 )
...
* add information about dead maps
* link the names of dead maps to their alive counterparts
* decompile several battle maps related functions
* add information about dead maps
* link the names of dead maps to their alive counterparts
* decompile several battle maps related functions
* .
* resolve issues
* .
* rename of chainchomp related structs and functions
2021-10-28 16:51:46 +02:00
Alexander Faßbender
b9bc4b8af8
Assign dead maps to alive counterparts ( #496 )
...
* add information about dead maps
* link the names of dead maps to their alive counterparts
* Update EB1170.c
* remove redundant function declaration
* resolve issues
2021-10-27 11:24:52 +02:00
Alexander Faßbender
beeb5627e6
Deduplicate various dead functions ( #494 )
...
* what is dead may never die
* resolve issues
* fixing dead_gPartnerActionStatus2
* .
* resolve issues
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-10-25 16:32:44 +02:00
Alex Bates
ae00fea170
Add new EVT macros ( #482 )
...
* add tools and new macros
* change EVT_OP enum names
* first file
* convert some files
* stuff
* EVT_PTR
* src/battle/item
* src/battle
* tool changes
* clouds.inc.c
* src/evt
* foliage.inc.c
* bitwise ops
* staticentitydata vars
* add diff_evt.py
* use evt macros in dro_01
* evt macro docs
* whoops
* fix some warnings
2021-10-25 20:44:55 +09:00
