10e9021a77
use nullptr instead of NULL
...
Replaces all instances of NULL with nullptr, and adds code defining it to types.h.
C23 standardized the nullptr keyword. In general, we should prefer the standard spelling of things. C++ also uses nullptr.
NULL is defined as 0 by libultra. nullptr is (void*)0, which can cause additional (correct) warnings. We can generally fix these by typing integers as pointers correctly.
2025-06-15 17:37:48 +01:00
8d5b066b7d
`SHIFT_BSS` be gone ( #1173 )
...
* merge asm in src all versions
* main: refactor and eliminate SHIFT_BSS
* engine1 static BSS
* engine2
* folder move
* fix shift build
* cleanup msg & msg_draw
* wtf?
* un-static-ized
* .
* remove unnecess. rodata pad
* populate dangling common syms
2024-03-05 19:54:53 +09:00
c2ade571fe
model rendering doc ( #1128 )
...
* all over the place
* model roundup
* missing reset_tiles for jp/ique splat
* fix pal
* fix ique
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-11-24 13:06:58 +09:00
5f5722c850
sfx and render modes cleanup ( #1124 )
...
* misc
* map_init returns
* remaining render mode names
* fix render mode case order
* minor additions
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-11-10 14:19:40 +09:00
4ad11af535
mapfs shape data ( #1087 )
...
* script
* fix prologue printing
* added type hints for return types
* model docs
* more models
* pretty print for sprite xmls on earlier python ver
* 1x oops
* sprite xml labels
* cod cleanup
* type cleanup
* fixes, script erroring
* script fixes
* objcopy
* link, objcopy, etc
* map_shape.ld
* discard
* kpa_117 match
* move stuff into /geom
* fix some shapes
* 253
* 221
* opaque lights
* 488
* all clear
* fixies
* RDP_MATRIX macro
* more explicit property 5F
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-07-18 18:07:58 +09:00
6bb14ff8be
tex archives ( #1072 )
...
* extraction
* hmm
* eth cleanup
* tex skeleton
* building
* OK
* pal OK
* cleaned texture names
* moved tex code to separate file
* additional error checking
* proposed splits
* split a5dd0
* additional cleanup
* myoop
* wahoo
* lru
* fixules
* fixin agin
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-06-29 21:06:23 +09:00
07c314d8e7
draw popup menu ( #956 )
...
* shape misc
* new func
* popup stuff
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-25 17:30:02 +09:00
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
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
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
e4283f3ea1
area_mac ( #884 )
...
* mac_00 match
* mac_00 cleanup pass
* enough mac_00 cleanup
* mac_01 match
* cleanup pass 1
* first pass done
* more
* unkfoldfunc dedupe
* quick
* mockup
* new splat segment
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "b2d7b86185"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "b2d7b86185"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* fix custom segment
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "0f66e7552a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "0f66e7552a"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* common vtx
* victory
* checkpoint
* remove map-specific subaligns
* enough
* quick fixes
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-12-12 21:31:29 +09:00
5b5b8c579f
95% ( #881 )
...
* fixes
* 2 nusys funcs
* warnings
* appendGfx_npc_blur
* clean
* cleanup, standardize button macro
2022-12-07 17:39:22 +09:00
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
8d429c8b07
Map Funcs ( #855 )
...
* 2 mo hossz
* jan_00 2 funcs
* a jan_03
* dupes & stuff
* 2 mo
* 4 macs
* mac_01/8017D0
* cleanup + matching
* 3 obks
* wip
* clean
2022-11-12 04:34:36 +09:00
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
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
46decfa258
Warning Fixies ( #826 )
...
* warnings
* morenings
* more
* morz
* mor3
* PR
2022-10-16 23:22:18 +09:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
59050ec3e9
Effects & misc ( #458 )
...
* fx_6_appendGfx
* update_effects
* effect_6 done
* Update diff.py
* update configure for new splat
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "0efa552c5d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "0efa552c5d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* nu stuff / undefined_syms org
* Actor struct refactor to match AddActorVar (thanks Josh)
* various cleanup, matched an obfuscation func
* fx_7 work
* is_block_on_ground
* state_*
* create_entity_shadow, update asm macro to fix diff.py
* set_standard_shadow_scale
* set_npc_shadow_scale and set_peach_shadow_scale
* create_shadow_type
* revert macro.inc
* clear_model_data (thanks Josh)
* cleanup
* mdl_get_next_texture_address
* mdl_set_all_fog_mode
* load_model_textures
* fx_7_appendGfx (effect_7 done)
* fx_8_main
* fx_8_render
* fx_8_update
* func_E0010000
* func_E0010104
* effect_8 done
* effect_8 done
* warnings
* cleanup
* try to fix some warnings
* warnings + change Bowser Slug behavior
2021-10-04 00:44:16 +09:00
db578d9788
a5dd0 (model file) + filemenu decomp ( #420 )
...
* remove some warnings, improve build speed on master
* update Camera
* update_camera_zone_interp not matching but close :/
* cleanup
* configure fix
* cleanup, better gbi macros
* decomp and syms
* a couple more
* 2 more and stuff
* more naming
* 3
* syms
* mdl_get_child_count
* more stuff
* get_model_list_index_from_tree_index
* 5 more
* header org
* update_entity_shadow_position
* fog color funcs
* more color stuff
* display lists
* create_shadow_from_data
* 4 evt shtuffsh
* func_80117D00
* func_80111790
* some BSS
* entity_raycast_down
* MakeEntity and almost step_entity_commandList
* step_current_game_mode
* filemenu stuff
* lots more filemenu stuff
* cleanup
* formatting
* fixes
* 1 more
* more fixes
2021-09-22 20:17:46 +09:00
Alex Bates