HailSanta
4fce6037a1
misc battle cleanup ( #943 )
...
* peach NPC flags and missing ANIM_LIST_END
* ANIMS
* auto smash
* misc battle cleanup
* misc battle doc 2
* more battle
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-15 03:18:27 -05: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
b5052b5bd0
most of pra ( #924 )
...
* halfway
* five more
* mergin
* standardize foliage model lists
* alignment
* cleanup
* include reorg
* additional reorg
* more pra
* pra_19
* misc sprite
* missed sprite stuff
* enum value names
* FoldTypes
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-28 07:26:26 +09:00
HailSanta
a03510d8a6
area_omo ( #921 )
...
* omo_09
* omo_11
* part of omo
* 08/10/13
* more
* train toad rename
* hmm
* guard ai
* omo_02
* fix partner anim enum
* omo_15
* omo_12
* last omo
* pra_15
* reflections
* under 100 maps left
* cleanup floats
* horse
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-25 11:33:20 +09:00
MS-DOS1999
ebe5fbd0f6
match update_camera_mode_4/6 ( #919 )
2023-01-23 23:46:51 +00:00
Ethan Roseman
bfbb7d1f98
Twuncs ( #917 )
...
* wip
* func_80240000_D2BD30
* npc_find_standing_on_entity
* wip
* cleanup
* warning
* close
* anotha one
* spr_allocate_components
* func_80243FC4_A2E204
* func_80240B4C_B2108C
* clean
2023-01-23 00:35:43 +09:00
Ethan Roseman
0cee144b18
func_802401A0_DDC9D0 & save/load tattle flags ( #915 )
...
* func_802401A0_DDC9D0
* func_802428C8_A2CB08
* cleanup
* wip
* warning
* save/load_tattle_flags
* PR comments
* idnex
2023-01-19 10:33:52 +09:00
Unnunu
0e2d3b96d4
matched 2 functions ( #914 )
...
* matched 2 functions
* PR comment
2023-01-18 15:58:17 +09:00
HailSanta
935fd14530
misc battle cleanup III ( #911 )
...
* misc
* fix one type
* yeah
* misc
* all substates
* almost done
* renames
* comments
* a couple maps
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-15 18:22:41 +09:00
Unnunu
2f79b35772
model functions ( #910 )
...
* matched appendGfx_model
* 3 more
* fog modes
* cleaning
* fix
* fixed macro name
* FogModes enum
* extra tile enum renamed
2023-01-13 16:56:28 +09:00
HailSanta
eb7ed118a6
flags -> flag ( #909 )
...
* flagsnt
* not this one
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-12 11:09:13 +09:00
HailSanta
efa45a5668
misc battle cleanup II ( #908 )
...
* flags and fixes
* move category start
* first strike and battle messages
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-11 17:38:04 +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
Ethan Roseman
cfb36ee36e
5uncs ( #895 )
...
* 2 dogs
* pause_stats_draw_contents
* Cleanup
* is_ability_active :confetti:
* WIP
* spawn_drops
* PR
2022-12-29 14:48:27 +09:00
Unnunu
e6de400efa
Draw box ( #897 )
...
* wip
* matched draw_box
* cleaning up
* renamed file
* fixed warning
* PR comments
2022-12-29 14:08:13 +09:00
Unnunu
207f4400b6
matched 4 obk functions ( #896 )
2022-12-28 14:30:30 +00:00
Ethan Roseman
29c3ffa2e0
Misc decomp 3: Oh baby a triple ( #882 )
...
* clean
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "901241040d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "901241040d"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* splat update
* more matches after nop hack
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "715ee0ad55"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "715ee0ad55"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* Renames, match boot_idle
* one mo
* wips
* fish func
Co-authored-by: @JaThePlayer
* sushie dun
* warnings
* clean
* match a nok func
* nok_02 stuff
* nok_04 party image
* func_802BD5D8_3174F8
* LoadPartyImage & stuff
* warnings
2022-12-11 16:43:29 +09:00
Unnunu
abd49f653a
matched status_menu_draw_stat ( #880 )
...
* status_menu_draw_stat
* fix warning
2022-12-08 01:12:25 +09:00
Ethan Roseman
5b5b8c579f
95% ( #881 )
...
* fixes
* 2 nusys funcs
* warnings
* appendGfx_npc_blur
* clean
* cleanup, standardize button macro
2022-12-07 17:39:22 +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
HailSanta
703896a7f1
isk+ ( #878 )
...
* isk_01/2/3
* machi
* mac_05
* mac_04 matched
* mac_04
* mac_02 match
* mostly cookin
* mac_02 cleanup
* tayce t cleanup done
* most of isk
* almost done isk
* isk done
* mapconfig 1C
* jump to goal
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-12-06 08:29:22 +09:00
Unnunu
ff4034651c
matched func_801180E8 ( #867 )
...
* matched func_801180E8
* fixed braces and field name
2022-11-24 04:06:21 +09:00
Ethan Roseman
78c30637f2
Misc matches & cleanup ( #868 )
...
* yaml updates
* 2 funcs & cleanup
* anotha 1
* re-org
* PR & cleanup
2022-11-24 03:33:39 +09:00
HailSanta
c776b32bc6
generic_entity -> worker ( #865 )
...
* workers
* broke out worker flags
* quick fix
* player sprite sets
* enum ws
* default -> world
* fix long line
* virtual entity split and minor cleanup
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-11-21 23:12:28 -05:00
Ethan Roseman
a880543beb
ItemChoice_SaveSelected + hos funcs ( #854 )
...
* cleanup
* a bunch of ItemChoice_SaveSelected
* the last few
* a bit more
* some position -> pos
* warnings
* 2 snibblets
* 2 snibblets
* one more
* weird
* mo
* more hos_05
* hos5
* 3 mo
* comment
* cleen
2022-11-10 11:00:56 +09:00
Unnunu
b9502a1ac4
action commands ( #853 )
...
* reorg done
* warning
* PR comments
2022-11-08 22:01:42 +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
Ethan Roseman
3f08935b05
Dead cod ( #848 )
...
* 2 sams
* dead cod
* little more
* wip
* fix comments
2022-11-03 01:01:00 +09:00
Unnunu
cf4eeecc13
msg stuff ( #847 )
...
* matched several msg functions
* added images and set flags
* fix merge issue
* warning
* Update src/msg_data.c
Co-authored-by: Alex Bates <16batesa@gmail.com>
Co-authored-by: Alex Bates <16batesa@gmail.com>
2022-11-02 21:30:07 +09: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
Unnunu
76254641e5
non-world data migration ( #841 )
...
* migrated 54360
* partially migrated 1AF2D0
* level up screen
* 1AF2D0 fully migrated
* cleaned up
* matched one audio function
* fixed warning
* PR comments
2022-10-31 00:41:22 +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
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
Ethan Roseman
46decfa258
Warning Fixies ( #826 )
...
* warnings
* morenings
* more
* morz
* mor3
* PR
2022-10-16 23:22:18 +09:00
HailSanta
fab07c1c8c
area_dro ( #821 )
...
* dro work
* nok varstash dupes
* p1
* rest
* documentin
* fixes
* imports sorted
* dro_01 cleaned up
* dro done
* kmr_06
* cleanup
* mergin
* warnings
* really fix warnings
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "ebadd64f07"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "ebadd64f07"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* dead map reorg I
* dead reorg II
* dead reorg III
* dead reorg IV
* got a func
* part of area_kmr
* oops
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-10-15 12:04:53 -04:00
Unnunu
b93928a013
two background gfx functions ( #819 )
...
* matched tattle_cam_pre_render
* matched appendGfx_background_texture
* cleaning up
* fix one warning
* made ARRAY_COUNT and removed unnecessary cast
2022-10-13 10:16:49 +09:00
HailSanta
2e8a4efa30
area_mim ( #813 )
...
* area_mim
* fixes
* mim is FINISHED, you hear me? FINISHED
* slight improvement
* and this
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-10 18:02:54 -04:00
Unnunu
f918be9c7e
matched 3 npc functions ( #814 )
...
* 3 npc functions
* fixed warnings
* added padding
* code improvements
2022-10-11 06:57:21 +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
Ethan Roseman
57c0421151
Map funcs ( #811 )
...
* 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>
2022-10-09 18:09:41 +09: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
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
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
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
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
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
