Ethan Roseman
ba42928a18
3unks the Threequel ( #955 )
...
* Fix modern gcc issue with function call arg evaluation order, shiftability issue with heap, other fixes
* cursed function byebye
* configure cleanup
* npc_do_other_npc_collision & func_80244550_A2E790
* wip
* PR comments
2023-02-24 13:02:57 +09:00
Ethan Roseman
8f974438a3
3uncs 2 ( #952 )
...
* progress
* Fix modern gcc issue with function call arg evaluation order, shiftability issue with heap, other fixes
* cursed function byebye
* configure cleanup
* Fix configure issue
* MakeShop
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
* item_entity_load
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
* closer
* PR comment
---------
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
2023-02-22 17:22:31 +09:00
HailSanta
5a5d088d83
battle cleanup ( #947 )
...
* item cleanup
* quick
* star power cleanup
* battle cleanup
* battle cleanup
* SetGroupVisibility
* more stage cleanup
* stage clean
* misc
* half of stages
* stagework
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-21 00:22:38 +09:00
Ethan Roseman
a37f30dc94
Modern gcc + shiftability work ( #942 )
...
* wip changes for modern gcc
* more
* wip
* blah
* Define explicit size for symbol
* Clean up evt_handle_exec1
* wip
* .
* fixes & VLA macro
* VLA innit
* wipz
* Fix potential UB
* meowp
* meowp2
* fixies
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "e1f0b17917"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "e1f0b17917"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* fixules
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "3ba3277e57"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "3ba3277e57"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* more shiftability + symbols work
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "02879e52a7"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "02879e52a7"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* more
* revert bss changes for now, new heaps overlay for aligning stuff to 0x1000 (not sure how necessary that is, so maybe will revert later on)
* 'fixing' jp shift build
* more
* more syms
* more progress
* more
* ididid
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "de54da38f5"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "de54da38f5"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "a27dc436a6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "a27dc436a6"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* blah
* stuff's broken, but at least it's maybe cleaner
* modern gcc back
* revert
* shifting all overlays - works so far
* progs
* another
* modern gcc flag, re-enabled all ifdef shift stuff
* fixies
* progress
* fixes, matching build
* heaps3 overlay and some symbol names
* changies
* PR comments & cleanup
2023-02-14 22:14:14 +09:00
HailSanta
8c688c82d7
all map data complete ( #941 )
...
* just 10 left
* six left
* split dead flo_19
* merged texture pan includes
* cooking
* bedroom
* study
* one left
* kkj_25 ok
* kkj_25 cleanup I
* enemy include reorg
* NO_DROPS cleanup
* revised NO_DROP
* dead_flo_19 splits
* StaticNpc -> NpcData
* removed tabs
* canonical npcdata fields ordering
* ANIM_LIST_END for ExtraAnims
* npcdata field reordering
* DISPOSE_LOCATION
* kkj_25 done
* marked unused area bytes
* adjusted function temp defines
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-14 09:46:48 +09:00
HailSanta
18befa1ec6
area sam ( #931 )
...
* sam_02
* sam_11 ok
* sam_11 done
* jan progress
* jan_03
* fix
* small
* oops
* spaceman
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-03 15:16:32 +09:00
Ethan Roseman
76438a7198
Fix typedefs for various things to be more C compliant ( #929 )
2023-02-02 02:48:25 +09:00
HailSanta
2d3a608ce7
area hos ( #928 )
...
* hos_06 ok
* hos_06
* hos_01
* hos_01
* hos_04
* hos 10/20
* hos_05 builds
* hos_05 data ok
* hos_05 ok
* hos_05 cleanup pt1
* hos_05 cleanup done
* small fix
* a couple more
* fix little thing
* finish sam_01
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-01 11:31:09 +09:00
Ethan Roseman
8b27ed01ef
3unks ( #920 )
...
* chomp_drop_appendGfx
* stars_shimmer_main & stars_shimmer_update
* clean
2023-01-24 12:33:04 +09:00
HailSanta
858eb4c19e
fix map warnings ( #916 )
...
* omo_17
* sam_06
* sam_06
* hos_02
* hos_03
* shops
* star kid name fix
* shop dialogue
* nok_11
* nok 14/15
* small fixes
* ready
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-21 17:14:46 +09:00
HailSanta
cc3a146066
battle substates cleanup I ( #906 )
...
* cleanup in progress
* celebrate done
* progress
* etc
* substate enums done
* flag fixup
* brevity
* msg name fix
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-10 15:33:09 +09:00
Unnunu
1cea652202
sprites and effects ( #900 )
...
* firework_rocket
* confetti_main
* 5 sprite funcs
* cleaning up
* minBlurAlpha
* everything is right
2023-01-04 00:57:48 +09:00
pixel-stuck
ff3835672d
water block effect matched ( #883 )
...
* more effects
* delete asm
* PR comments
* More PR comments
* fully match water block effect
* cleanup for PR
* PR comments
* define for components
2022-12-12 15:13:49 +09:00
Ethan Roseman
5b63159eaf
Effect, map decomp ( #877 )
...
* snaking_static_appendGfx, gfx migration, cleanup
* more decomp + data stuff
* fix for Light
* map funcs
* 2 obk_07
* 4 mor
* fixes
* message IDs
2022-12-06 08:53:46 +09:00
Spencer Vaughn
40c2b9be4d
snaking_static effect ( #876 )
...
* snaking_static_main: Matched
* snaking_static_update: Matched
* snaking_static: PR cleanup
2022-12-04 11:39:46 +09:00
Ethan Roseman
d2b436287f
Effect work ( #875 )
...
* quizmo_audience effect
* explosion_main
* tidying
* wip shtuff
* fixules
* partner_buff dun
* shockwave
* remove script
2022-12-04 11:05:33 +09:00
HailSanta
2561914d1a
area_tik+ ( #874 )
...
* koopa
* para troopa
* some fuzzy
* tik_05
* tik_02
* tik_01
* tik_03
* tik_03b
* tik_04
* tik_07
* tik_08
* tik_09
* tik_10/12
* tik_14
* tik_15
* tik_17/18
* more tiks
* area_tik
* mac_03
* cleanup
* oink names
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-11-30 16:39:42 +09:00
Ethan Roseman
2adca590f6
Effect work ( #872 )
...
* this effect is awful
* ice_pillar effect
* radial_shimmer done, some data migration
* snowfalls
* data & snowfall
* wip
2022-11-28 05:38:13 +09:00
pixel-stuck
0c9c8e8137
Windy leaves and water splash effects ( #870 )
...
* more effects
* delete asm
* PR comments
* More PR comments
2022-11-26 01:06:31 +09:00
pixel-stuck
f63ffa7e95
Match whirlwind effect ( #869 )
...
* match whirlwind effect
* delete asm
* PR comments
2022-11-24 23:57:29 +09:00
Unnunu
17e4bff020
star beam and few others ( #857 )
...
* peach/star beam
* 3 more
* func_802A5290 wip
* PR comments
2022-11-14 20:00:29 +09:00
Ethan Roseman
922a953691
4 effect funcs ( #851 )
...
* tattle_window
* cleanup
* music_note_appendGfx
* motion_blur_flame_update
* Gfx bin, PR comments
* undefined_syms cleanup
* undefined_syms cleanup
2022-11-06 00:31:01 +09:00
Unnunu
294602ec98
battle partners ( #852 )
...
* goompa and goombario
* kooper
* bombette
* parakarry
* watt
* sushie
* lakilester
* bow
* twink
* fix warning
* fix messed fields
* CalculateArcsinDeg
* updated splat entries
2022-11-05 16:06:28 +09:00
mrshigure
9da8f0a56a
[Effects] A few functions ( #850 )
...
* [Effects] A few functions
* Addressing PR comments
2022-11-05 09:43:44 +09:00
mrshigure
7a56814010
Some effect functions ( #846 )
2022-11-02 12:51:32 +00:00
Ethan Roseman
5a668faf5d
Cleanup + misc decomp ( #844 )
...
* hos funcs
* more hos funcs
* 4 more
* little clean
* 4 more
* find_similar_areas min, max params
* calc_partner_test_enemy
* nothing of substance
* battle_state_update_begin/end_player_turn
* fix
* warnings
* 2 omos
* 2 mo omo
* PR comments
* 3 mo omo
2022-11-01 16:41:14 +09:00
HailSanta
b656ab90b4
area_flo ( #839 )
...
* some reorg
* minor stuff
* flo_03
* flo_08
* flo_09
* flo_00
* flo_11/12
* flo_10
* flo 24/25
* flo 22/23
* flo 21
* flo_19
* flo 17/23
* flo 16
* flo 15
* flo_14
* flo_13
* area flo
* tik_06
* couple missed things
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-31 00:23:13 +09:00
mrshigure
1124ab3382
[Effects] More functions ( #838 )
2022-10-30 09:22:40 +09:00
Spencer Vaughn
f67d317d5a
more effects functions ( #836 )
...
* water_fountain: matched main
* water_fountain: Matched update
* quizmo_audience: Matched main
* star_outline: Matched main
* star_outline: Matched update
* quizmo_audience: Removed unused struct
2022-10-27 22:07:27 +09:00
Ethan Roseman
b64886fa8c
A couple map funcs ( #835 )
...
* find_similar_areas improvement
* func_sizes in find_similar_areas
* 4 funqz
* another
* clean
* sams
* more sams
* osr, pra
* omo
* some obk
* cleanup + funcz
* wip
* warnings
* more
* 3 mo
* 7 more
* render_models (thanks Unnunu\!)
* cleanup
* PR comments
2022-10-25 19:04:54 +09:00
mrshigure
ec25f51281
[Effects] Matching a couple of functions ( #834 )
...
* [Effects] Matching a couple of functions
* Addressed comments
2022-10-25 18:49:05 +09:00
mrshigure
b0afefafe0
[Effects] Matching 23 effect functions ( #831 )
...
* [Effects] Matching 23 effect functions
* Addressed PR comments
2022-10-18 19:07:21 +09:00
HailSanta
342887a94c
kmr + revisions ( #828 )
...
* kmr_07
* more kmr
* kzn cleanup 1-9
* kzn cleanup II
* arn/mgm/gv/end revision
* iwa I
* bubulb spelling
* rest of iwa
* more kmr
* enough kmr_23 for now
* quick fix
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-17 16:46:24 +09:00
Ethan Roseman
f12e57b7c4
Partner Funcs + Splupdate ( #820 )
...
* progz
* fixies
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "6c228fc53a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "6c228fc53a"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* 3
* func_80238000_703AF0
* Force upgrades of requirements in Jenkinsfile
* --amend
* main_loop finished
* PR comments
2022-10-15 07:21:50 +09:00
Spencer Vaughn
fec4a513ac
Matched effects funcs ( #818 )
...
* thunderbolt_ring: Matched update and main
* snowfall_main: Matched
* shiny_flare_main: Matched
* shiny_flare_update: Matched
* thunderbolt_ring_update: clean up
* rising_bubble_main: matched
* ring_blast: Matched main and update
* quizmo_stage: Matched main and update
* ring_blast_main: Fixed warning message
* PR_818: PR clean up
2022-10-12 21:39:03 +09:00
mrshigure
5df977a353
[Effects] Migrating data + a couple of functions ( #817 )
...
* [Effects] Migrating data + a couple of functions
* Addressed PR comments
2022-10-12 09:28:15 +09:00
Unnunu
cc6f4d9a66
all battle maps done ( #812 )
...
* make BS flags enum everywhere
* area_kpa
* fix merge conflicts
* area_kpa2
* fix merge conflicts
* area_kpa3
* area_kpa4
* matched all battle map functions and some others
* fix warnings
2022-10-10 12:26:32 +01:00
mrshigure
9a644e30d6
Effect gfx data + some light funcs ( #809 )
2022-10-08 11:07:10 +01:00
HailSanta
f96542f52a
area_trd ( #807 )
...
* 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>
2022-10-07 14:45:58 -04:00
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
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
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
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
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
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
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
