AltoXorg
c356a0e330
pal world ( #1218 )
2024-11-09 12:19:32 +09:00
z64a
b1ca4bd051
filemenu state upstreams from dx ( #1215 )
2024-10-31 09:21:15 +09:00
z64a
ee3bffb249
effects and action command cleanup ( #1213 )
2024-10-23 14:44:44 +09:00
AltoXorg
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
HailSanta
1589a30e26
API_CALLABLE + misc minor cleanup ( #1150 )
...
* leftover work
* remaining API_CALLABLE
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2024-01-16 13:56:57 +09:00
HailSanta
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
HailSanta
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
HailSanta
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
HailSanta
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
Ethan Roseman
a3cdc47fb7
Fix shiftable build
2023-08-20 17:54:36 +09:00
AltoXorg
b171712e0e
Match libultra iQue ver ( #1111 )
...
* match libultra ique pt 1
* add sgidefs.h to include/gcc
* recvmesg match + _getcount
* add elfpatch.py for those compiled with -mips3
* pt 2
* os/setthreadpri(.data) -> os/thread
* os thread matches
* os timer matches
* pt 4 (erm... 3?)
* vitbl
* os pi matches
* pt. uhmmmm, i've lost track...
* os pfs matches
* replace elfpatch.py
* pt. just forget it...
* outsource from ultralib ique branch
* .
* . 2
* final blow
* add egcs compiler to Jenkinsfile
* fix errors from CI
* minor changes as requested
2023-08-17 02:29:21 +09:00
HailSanta
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
Ethan Roseman
9f00021dbe
DMA_COPY_SEGMENT macro for straightforward DMAs of segments ( #1096 )
...
* DMA_SEGMENT macro for straightforward DMAs of segments
* PRomment
2023-07-25 03:04:21 +09:00
Ethan Roseman
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
0xfedfedfe
9457e315a8
Name is_debug_panic and fix ASSERT/PANIC macros ( #1061 )
...
* Name is_debug_panic and revamp ASSERT/PANIC macros
* Update src/is_debug.c
Co-authored-by: Alex Bates <16batesa@gmail.com>
2023-05-22 15:38:20 +01:00
HailSanta
2e926567e3
various cleanup ( #1057 )
...
* checkpoint
* battle doc
* items 2
* actor palette stuff
* minor adjustment
* the booool
* comments, flags, and todos
* oops
* chain chomp
* quick fix
* stone chomp as well
* partIDs
* hm
* status turn mod
* status_key
* status table alignments
* TURN_DONE - > INACTIVE
* idle anims alignment
* defense table alignment
* STATUS_END
* actor part IDs
* lee
* lee again
* standardizing names
* BattlePositions
* actor macros
* standardize battle and stage macros
* check
* the rest
* red/blue goomba names
* trd_part_1
* rest of trd 1
* pal fix
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-21 02:26:11 +09:00
HailSanta
7a9df943ad
various cleanup ( #1030 )
...
* 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
* misc
* btl msg
* 3 combine modes
* 3 more
* many more
* screen overlays
* stencil types
* all screen transitions
* jp build fix
* another jp fix
* iq fix
* mystery battle enum added oOoOoOoOooo
* DMG_SRC
* starting battle cam presets
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-26 00:33:17 +01:00
HailSanta
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
Ethan Roseman
3e3558a37f
appendGfx_shading_palette ( #1010 )
...
* cleanup & warnings for modern gcc
* clean
* stuff
* diff.py update
* Fix offset problem in struct
* Fix texture issue in chapter_change
* appendGfx_shading_palette
2023-04-08 23:04:45 +09:00
HailSanta
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
Marijn van der Werf
9551b16d77
Build world/area_mac/machi for PAL ( #967 )
...
* Build machi and mac_00 for PAL
* Import `segtypes.common.asm`
* PAL rest of area_mac
* fixup
* tik
* Rename gMasterGfxPos to gMainGfxPos
* kgr
* kgr
* Use s32 for casts
* PAL area_kmr
* Cleanup
* Fix defines
2023-03-12 19:08:06 -04: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
f033bbae6d
all data done ( #945 )
...
* misc fold
* omo cleanup
* projectile target offset
* missing actor part fields
* msg chars
* decimal offsets
* partIndex -> partID
* callables
* EVT_PLAY_EFFECT
* fix out of range offsets
* some renames
* battle_area -> battle/area
* renames
* battle names last
* more power
* hammer moves
* hammer directory
* all moves migrated
* moved items
* moved starpowers
* fixed jp
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-17 16:44:14 +09:00
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
713883c750
world script data ( #933 )
...
* nok_01 ok
* nok_01 cleanup
* nok_02 ok
* nok_02 cleanup pt 1
* nok_02 cleanup pt 2
* nok_02 cleanup pt 3
* map api data
* rooms api
* rooms cleanup
* rooms cleanup
* done rooms cleanup
* fix mixed up enemy/npc flags
* tabs
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-05 19:13:45 -05: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
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
Ethan Roseman
cf2099772d
10 functions ( #893 )
...
* fixins
* 2 dogs
* a few funcs + progress
* 3 more
* clean & PR comments
2022-12-21 17:15:21 +09:00
Ethan Roseman
6ea08f8257
Map funcs and update_input ( #888 )
...
* warning
* func_80240098_BBD238
* hos/kkj stuff
* update_input is deated (thanks arienain on decomp.me\!)
* 4 mo
2022-12-15 10:56:16 +09: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
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
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
c700116f41
BSS And Libultra ( #823 )
...
* BSS refactor (the Wiseguy method)
* controller.c
* ldiv.c
* motor.c
* cartrominit.c
* more libultra matching + standardization
* more libultra stuff
* more
* clean
* warnings
2022-10-16 07:24:05 +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
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
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
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
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
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
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
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
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
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
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
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
