d9735049eb
Merge branch 'main' into nullptr
2025-08-11 02:11:49 -05:00
3e5df3a4de
chore: replace true and false ( #1241 )
...
Co-authored-by: Ethan <ethteck@gmail.com>
2025-07-25 13:44:11 +01:00
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
81875cffb3
Fix variable names related to fleeing battles being logically inverted ( #1219 )
2024-11-09 12:41:16 +09:00
ee3bffb249
effects and action command cleanup ( #1213 )
2024-10-23 14:44:44 +09:00
63b0e737ee
npc-enemy-flags ( #1212 )
2024-10-07 23:15:38 -04:00
5929e49b72
isBattle refactor ( #1211 )
2024-10-01 11:50:46 +09:00
e342a33a20
star rod dx upstreaming ( #1177 )
...
* so far
* leftover
* first batch
* part zwei
* item name changes
* misspelling
* comments
* THE
* fix pal
* muurgle
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2024-03-06 02:32:00 -05: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
54e7bb973c
all sounds named ( #1120 )
...
* 128 left
* all sounds done
* most battle flags
* battle message states
* status bar and shop cleanup
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-22 08:39:20 -04:00
ce4ab34def
battle/actor flags and more ( #1119 )
...
* battle documentation
* mostly startup stuff
* battle file names
* minor reorg
* actor rendering
* few extras
* file renames and camera unks
* py fix
* fio cleanup
* sounds progress
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-14 15:43:12 -04:00
308af519a5
sounds halfway named ( #1110 )
...
* first few
* more
* more sounds
* for now
* visually separate remaining sounds
* checkpoint
* star power refactor
* standard name
* fix
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-13 06:08:33 +09:00
b9cc73472b
Standard names for struct fields ( #1103 )
...
* position -> pos
* rotation -> rot
* velocity -> vel
* distance -> dist
* current -> cur
* current -> cur
2023-07-30 14:08:07 +09:00
edd9111b63
battle area trd 1/2/3 ( #1062 )
...
* check
* flips
* trailing ,
* koopa bros
* more koopa bros
* fake bowser
* progress
* progress
* koopa bros done
* koopa bros anims
* reverted overly specific name
* wayward stages
* areas use headers
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-23 21:57:34 +09:00
ee0bd3c304
effect flags ( #1052 )
...
* damage intensity
* standardized battle script names
* few more
* effect flags
* slight name change
* renderUI = NULL
* rm space
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-09 12:46:47 +09:00
e41923e55d
image fx ( #1015 )
...
* more fold
* fold render modes
* fold rename 1
* fold rename 2
* fold rename 3
* imgfx struct reorg
* post merge
* the rest
* extras
* forgot these
* done
* ImgFx
* ImgFX
* check
* misc cam stuff
* ws
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-20 17:15:58 +09:00
93ed912319
fold doc 1 ( #1009 )
...
* minor fold cleanup
* fold doc I
* enough
* rename
* last
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-08 02:18:12 +09:00
c1d9bbbd2a
more world partners ( #976 )
...
* wip
* hm
* update
* bow
* parakarry
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-14 17:55:49 +09:00
288bb8511f
world kooper cleanup ( #963 )
...
* kooper cleanup
* second pass
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-04 12:20:43 +09:00
e55556ddcb
enemy+npc flags ( #946 )
...
* npc flags 1
* enemy & npc flags
* removed item headers
* minor item cleanup
* coverage
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-18 17:13:07 +09:00
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
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
768e88f20d
area jan ( #937 )
...
* couple jan
* pipe includes cleanup
* jan_13 checkpoint
* Rafael checkpoint
* jan_05 ok
* jan_0X done
* fix spear guy name
* all jan ok
* jan done
* no halves
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-10 17:00:28 +09:00
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
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
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
eb7ed118a6
flags -> flag ( #909 )
...
* flagsnt
* not this one
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-12 11:09:13 +09:00
0e54cd9b30
area kmr ( #898 )
...
* kmr_02 ok
* some cleanup
* foliage EVS
* quiz cleanup
* partners
* cleanup pass ?
* kmr_02 done
* kmr_20 ok
* begin kmr_20 cleanup
* enough kmr_20
* kpa_90+
* more kpa
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-02 10:58:39 +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
cbdce77daf
area_spooky ( #894 )
...
* obk_01
* obk_02
* obk_03
* obk_06
* obk_05
* checkpoint
* chandelier documentation
* obk_04
* obk_09
* obk_07
* obk done
* tabs
* kmr_22
* kmr_11
* last thing
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-12-25 14:10:23 +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
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
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
8fd2613bd8
encounters and static npc flags ( #843 )
...
* matched update_encounters_neutral
* matched encounter funcs
* replaced NPC flags with ENEMY flags
* cleaning up
* warnings
2022-11-01 12:27:10 +00:00
46decfa258
Warning Fixies ( #826 )
...
* warnings
* morenings
* more
* morz
* mor3
* PR
2022-10-16 23:22:18 +09:00
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
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
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
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
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
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
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
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
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
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
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
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
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
341ed0040f
some assorted cleanup / commenting of stuff ( #722 )
2022-06-01 03:39:46 +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
Ponmander