83 Commits

Author SHA1 Message Date
Luke Street
7d23ceeecc
Use dtk-template for ninja build (#216)
* shift-jis purge

dtk part 1

Co-Authored-By: roeming <25447777+roeming@users.noreply.github.com>
Co-Authored-By: Luke Street <549122+encounter@users.noreply.github.com>

* build versioning and static prints

Co-Authored-By: roeming <25447777+roeming@users.noreply.github.com>
Co-Authored-By: Luke Street <549122+encounter@users.noreply.github.com>

* actual dtk stuff

woop?

Co-Authored-By: roeming <25447777+roeming@users.noreply.github.com>
Co-Authored-By: Luke Street <549122+encounter@users.noreply.github.com>

* suspicious file changes

@roeming please investigate these changes

Co-Authored-By: roeming <25447777+roeming@users.noreply.github.com>

* version reconciliation

the else blocks really should be futureproofed

* minor correction of global to weak

also replace configure.py and purge linker-map.txt

* Update Makefile

* makefile and ninja silliness

* Update build.yml

* makefile test

* Update build.yml

* Update Makefile

* All fixed

* More JP string fixes

* Fix demo all_source build

* Add objdiff report, Makefile dep autodownloads, lots of cleanup & more

* Update README

* Update progress badges

* Restore old docs

* changing FILE_POS.c to FILE_POS.C

* Rename FILE_POS.c to FILE_POS.C

* fix for make

---------

Co-authored-by: EpochFlame <jupiterror@gmail.com>
Co-authored-by: roeming <25447777+roeming@users.noreply.github.com>
Co-authored-by: Luke Street <549122+encounter@users.noreply.github.com>
Co-authored-by: roeming <brother64youyou@gmail.com>
2024-08-17 00:36:56 -04:00
HeartPiece
2ce7e4b71f Link tyre.cpp 2024-05-08 18:43:11 +10:00
HeartPiece
5805593997 forty five percent
Links tamagoMushi.cpp and panModokiState.cpp + neatens up some tamagoMushiMgr stuff
2024-05-08 16:50:22 +10:00
HeartPiece
6a063cf4fc Link tamagoMushiMgr.cpp 2023-12-21 11:02:53 +11:00
HeartPiece
b6b71a8b07 Link jigumoState.cpp 2023-11-01 18:59:13 +11:00
HeartPiece
393b26f0d5 Link bomb.cpp
💣
2023-10-13 13:56:05 +11:00
EpochFlame
0a99954fc5 most sysGC asm cleaned + finish mori
morimura asm cleanup complete
2023-02-25 00:19:50 -05:00
EpochFlame
d98e1ab5a5 u64 and sysGC asm cleanup
I am the asm cleanup king!
2023-02-24 01:27:21 -05:00
EpochFlame
e889b8234a various asm cleanups
u64 literals
2023-02-23 20:50:02 -05:00
EpochFlame
e6fc9e2783 sysGC spring cleaning
first half mostly done
2023-02-22 00:07:48 -05:00
EpochFlame
a56a2f243a restructure most mori asm
only vsSelect2D and zukan2D remain
2023-02-20 23:48:39 -05:00
EpochFlame
ebae2daad6 mori asm cleanup v2 2023-02-18 23:13:22 -05:00
EpochFlame
bd64880518 mori asm part 1 and sGS fileSelect improvement 2023-02-18 16:41:06 -05:00
EpochFlame
ff6e001391 hurryUp2D cleaned 2023-02-17 23:47:43 -05:00
EpochFlame
68e2dcc42d begin mori asm fixup 2023-02-17 23:35:40 -05:00
EpochFlame
4b38081768 hurryup2d improvement? 2023-02-04 20:13:50 -05:00
HeartPiece
580a4a55e7 Link gameOver2D.cpp 2023-02-02 13:00:41 +11:00
HeartPiece
0ec6784cfa Link umiMushiState.cpp
somewhere down the line we should fix PSM::checkBoss to return a EnemyBoss soundObj probably.
2023-02-01 12:45:56 +11:00
HeartPiece
46ea2b2802 Link miulinState.cpp 2023-01-31 19:42:46 +11:00
EpochFlame
0b4509b09c link spectralid state
thanks, roeming!

Co-Authored-By: roeming <25447777+roeming@users.noreply.github.com>
2023-01-30 15:58:36 -05:00
SwareJonge
403b526a71
J3D inlines (#142)
* fix and link JFWSystem

* fix and link JKRDecomp

* fix and link JKRDvdFile

* formatting

* update names

* J3D inlines for enemyNestMgr

* Link file + update progress

Co-authored-by: intns <84647527+intns@users.noreply.github.com>
Co-authored-by: HeartPiece <deancsouthwood@gmail.com>
2023-01-25 12:03:07 +11:00
HeartPiece
0d523f2c63 more kingChappy progress
god this code is a mess
2023-01-20 00:03:38 +11:00
HeartPiece
90b1cda004 Start kingChappy.cpp
so cursed.
2023-01-19 13:38:30 +11:00
EpochFlame
4e3f9c0f0c utilize updated macros.inc from @encounter
thanks for the macros! and ty skriena for helping with regex
2023-01-14 14:26:48 -05:00
EpochFlame
3e8df9d6d3 farm.cpp progress 2022-12-04 21:02:06 -05:00
HeartPiece
37dad3b262
Link more Ogawa and Morimura files (#122)
* wip objCaveResult

* patchin' some matchin'

* link ogSE and ogBloGroup

* mrWindow near-match

* repair build error

* Link mrWindow.cpp

* mrWindow improvements

* ogBloGroup cleanup

* Link ogObjSpecialItem.cpp

* mrUtil

* more ObjCaveResult

* Link mrUtil.cpp

* Improve ogScreen AlphaMgr

* some CaveResult progress

* ogAnimTextScreen

* Link ogAnimTextScreen.cpp

* Update todos and progress

* Fix flags + minor other cleanup

Co-authored-by: PikHacker <evangrune@gmail.com>
Co-authored-by: EpochFlame <82550703+EpochFlame@users.noreply.github.com>
2022-12-04 11:02:48 +11:00
EpochFlame
8203512966 prepare files for decomp 2022-11-23 20:21:36 -05:00
EpochFlame
5768bb25a7 begin JSTFindCreature and clean some sinits
prep sinits for objdiff
2022-11-19 15:40:50 -05:00
HeartPiece
5291643272 Link plants.cpp
Thanks Altafen for the help!
2022-11-14 09:15:31 +11:00
HeartPiece
5a271a83b9 Link egg.cpp 2022-11-11 09:57:21 +11:00
HeartPiece
704461db30 TEN PERCENT
Match + link shijimiChouMgr.cpp
2022-11-10 13:23:46 +11:00
HeartPiece
94378d408a Match + link panModokiMgr.cpp 2022-11-09 20:14:50 +11:00
EpochFlame
89b71111fe purge fake global labels 2022-11-03 17:18:27 -04:00
EpochFlame
75c3292df0 reduce label emissions
linkmap goes faster now
2022-11-03 17:02:42 -04:00
HeartPiece
1df2654c36 Link Wraith and Emperor mgrs
9%!
2022-10-26 17:49:42 +11:00
HeartPiece
7e48e444d2 Link UmiMushiMgr.cpp
also fix small thing in enemyNestMgr
2022-10-26 16:36:35 +11:00
HeartPiece
f4b5502e89 Link bomb, egg, jigumo, miulin mgrs 2022-10-26 14:54:48 +11:00
HeartPiece
76e1c62e48 Link tyreMgr.cpp 2022-10-21 12:32:27 +11:00
HeartPiece
9902d5f77c Link plantsMgr.cpp
FINALLY
2022-10-20 21:45:24 +11:00
HeartPiece
dafe57b9b7 Match + link Waterwraith state file
6% !!
2022-10-16 20:56:02 +11:00
EpochFlame
383122ed28 prune matched assembly files 2022-10-15 18:39:49 -04:00
EpochFlame
9dde6e71ea various asm cleanup 2022-10-14 12:29:20 -04:00
HeartPiece
56010ff4ec
Yamashita linking dump (#78)
* Match plantsMgr.cpp

will need some help linking

* Mgr-related header fixes and pelplant re-matching

* Link enemyMgrBase.cpp

still tracking down the other issues

* Fix shift-JIS escape sequence bug in EnemyParmsBase

* Link pelplantState.cpp

* Link enemyBlendAnimatorBase.cpp

woops, accidentally linked this while hunting out errors

* Link enemyFSM.cpp

this was also done and unlinked???

* Link walkSmokeEffect.cpp

aaaaaaaaaaaaaaaaa

* Link enemyInteractBattle.cpp

AAAAAAAAAAAAAAAA

* Link updateMgr.cpp

AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Match + link BlueChappy and BlueKochappy

._.

* Match + link YellowKochappy.cpp

identical to BlueKochappy

* Match + link tyreState.cpp

4%.

* Fix plantsMgr assert by combining plant headers

* Minor formatting fixes
2022-09-21 11:56:37 -04:00
EpochFlame
ba21d5475f
match enemyNest.cpp (#64)
* match enemyNest.cpp

gottem. header nonsense to fix weak function order.

* Delete enemyNest.s

* remove unnecessary print

* update header
2022-09-16 11:35:04 +10:00
HeartPiece
e0a38e6e94
Match and link eggState.cpp (#61)
* Match and link eggState.cpp

this just needed efx stuff fixing that encounter fixed for enemyBase

* Clean up asm folder

* Fix comment
2022-09-14 23:09:33 -04:00
EpochFlame
fd3833bcfd sysGCU disassembly cleanup
cleaned up strings, floats, labels, and so on
2022-08-17 17:47:57 -04:00
EpochFlame
78dee749da miscellaneous cleanup 2022-08-16 23:56:29 -04:00
EpochFlame
c01af45d8b JSystem cleanup
all of J2D cleaned up
also challengeResult2D
2022-08-07 19:02:20 -04:00
EpochFlame
0e474b182f massive BSS refactor
fully split BSS.s
also clean up quite a few assembly files

note that J3DPacket.s and ogLifeGauge.s have had their BSS moved to J3DSys.s and ogScreen.s respectively for the sake of alignment

also, BSS inflates data% significantly due to how lcomm and comm show in the linkmap
2022-08-03 17:41:17 -04:00
NerduMiner
b6e892eeae
USA Demo 1 Building Support (#31)
* Demo Building Support

Complete the partial framework in place for building a sha1 matching demo version dol. Majority of additions are handling BaseSection object size difference between usa and usa demo.  The rest of the differences implemented are documented here: https://github.com/Minty-Meeo/Pikmin-2-Symbol-Maps/blob/master/README.md#pikmin-2-usa-v100map.

Functions in the .text section have individual copies for both versions, while data sections have ifdefs encompassing only relevant differences between versions.

* reinstate newline

y'all do realize these sda base sets are comments, right? could be good for reference, I suppose

Co-authored-by: EpochFlame <82550703+EpochFlame@users.noreply.github.com>
2022-08-02 19:41:37 -04:00