Commit Graph

873 Commits

Author SHA1 Message Date
Ponmander d9735049eb Merge branch 'main' into nullptr 2025-08-11 02:11:49 -05:00
Anna 3e5df3a4de
chore: replace true and false (#1241)
Co-authored-by: Ethan <ethteck@gmail.com>
2025-07-25 13:44:11 +01:00
Alex Bates 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
z64a bb936b7fd7
audio naming done (#1236) 2025-06-16 00:27:27 +09:00
z64a 2becd2b5a4
anims-script (#1231) 2025-05-16 12:36:10 -04:00
z64a da808bbd17
sprite fixes (#1230) 2025-03-08 23:04:41 -05:00
AltoXorg c356a0e330
pal world (#1218) 2024-11-09 12:19:32 +09:00
mrshigure 89de30009c
[JP] Finished World Areas, Pause, Dead Maps (kzn, flo) and some more (#1208) 2024-11-04 15:43:33 +09:00
z64a ee3bffb249
effects and action command cleanup (#1213) 2024-10-23 14:44:44 +09:00
z64a 63b0e737ee
npc-enemy-flags (#1212) 2024-10-07 23:15:38 -04:00
z64a 5929e49b72
isBattle refactor (#1211) 2024-10-01 11:50:46 +09:00
mrshigure 405cb281e9
[JP] World Areas (dro, isk, trd, nok, hos, kpa, osr, kkj, tst, jan, mim, obk, arn) (#1204) 2024-09-23 20:15:58 -04:00
z64a 5e2487fde2
dx camera upstreams (#1207) 2024-09-23 14:42:15 -04:00
Ethan Roseman 41e7f56f0e
More shiftability fixes (#1203) 2024-09-13 03:22:01 +09:00
Ethan Roseman 888b27eec8
Fix charset craziness (#1202) 2024-09-13 02:00:57 +09:00
Ethan Roseman 8b198cf9d2
Fix alignment for bins (#1201) 2024-09-12 16:15:01 +09:00
mrshigure 1bcc4ff623
[JP] Entities and World Areas (mac, tik, kgr, kmr, iwa, sbk) (#1199) 2024-09-12 14:46:00 +09:00
mrshigure efd86abeac
[JP] Battle Code and Battle Areas (#1198) 2024-09-05 23:28:39 +09:00
mrshigure 41685b3723
[JP] Effects, World Actions and some more (#1197) 2024-09-04 15:16:17 +01:00
mrshigure 3526fa4970
[JP] Action Commands, Battle Partners/Items/Moves and some more (#1195) 2024-09-01 21:14:39 +09:00
Ethan Roseman 7f524ee10a
Dep update & fix pip install (#1196) 2024-09-01 20:20:38 +09:00
Ethan Roseman 5f1f696bdc
Use crunch64 for compression (#1189) 2024-06-02 19:48:57 +09:00
z64a f2ef0713ff
revert texture renaming (#1185)
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2024-04-26 00:42:34 +01:00
Rainchus d35bdf466b
Add missing pause_tabs enums, fix BlueNinjaKoopa -> BlackNinjaKoopa (#1184) 2024-04-22 21:09:34 +09:00
HailSanta 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
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
Rainchus e303e2a04b
Suggest possible bgm name if it is not found (#1178)
* suggest possible bgm name if it is not found

* remove pointless ()

* run black

* ...run updated black
2024-03-05 16:01:17 +09:00
Ethan c3cf1565fa
Update splat to 0.22.0 2024-02-20 16:37:16 +09:00
Josh Diamond 562ccb68ad
rename fuzzy leech anim (#1174)
* fix pm_sprites caching

Co-authored-by: Alex Bates <alex@bates64.com>

* name fuzzy leech anim

---------

Co-authored-by: Alex Bates <alex@bates64.com>
2024-02-18 07:55:01 +00:00
Alex Bates e1176acfed
Mitigate #1170 (#1172)
* add old star rod dirs to gitignore

* remove something from mapfs to introduce bug

* fix build

See https://github.com/pmret/papermario/issues/1170

* Revert "remove something from mapfs to introduce bug"

This reverts commit 4a3927866e.
2024-02-17 06:38:54 +09:00
Alex Bates 9f0452dd0a
Fix Icons.xml not respecting asset stack (#1160)
* fix Icons.xml not respecting asset stack

* resolve xml path in icons.py rather than configure

* I think fix

---------

Co-authored-by: Ethan <ethteck@gmail.com>
2024-02-04 01:35:31 +09:00
AltoXorg 540757c7e2
ique msg (#1164) 2024-02-03 23:27:25 +09:00
Ethan 0d94b5ed7d
fix black issues 2024-02-02 15:11:32 +09:00
Alex Bates 66c781c68f fix --modern-gcc and allow overriding ld with PAPERMARIO_LD environment variable 2024-01-23 15:54:31 +00:00
Alex Bates e6bf24bf95
Support Nix package manager (#1158)
* support nix package manager

* add glibc

* use /usr/bin/env python3 shebang
2024-01-23 21:08:13 +09:00
Alex Bates 1d0c818088
Use python iconv if system iconv is broken (#1156)
* use python iconv if system iconv is broken

* black
2024-01-22 05:37:54 +09:00
Alex Bates 9574baebaf
Make EVT macros easier to read and write (#1154)
* fix rename.py

* update doxygen EVT_CALL->Call

* support passing files to rename.py

* remove EVT macro prefix and make them PascalCase

* rename PlayEffect function to PlayEffect_impl so it doesn't conflict with macro

* dead_PlayEffect_impl
2024-01-21 13:04:47 +00:00
HailSanta f1edb83213
hasBack for player sprites (#1155)
* hasBack for player sprites

* these too

* bump splat requirement

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2024-01-21 16:44:49 +09:00
Ethan Roseman f89df67fe4
Autos gawn (#1153)
* working on it

* ique brok

* Autos gawn (#1152)

* ique builds

* Yeet most `auto, .data` from ique

* us dun

---------

Co-authored-by: angie <angheloalf95@gmail.com>

* update shplort

* fix configure

* requests

---------

Co-authored-by: angie <angheloalf95@gmail.com>
2024-01-21 03:28:11 +09:00
AltoXorg bfe9a42b06
some JP decomp (#1149)
* main segment cleanup

* engine1

* engine4

* evt

* entity

* engine2 msg split

* engine2 draft

* identify all gu functions

* font_width + charset

* update msg ids

* os stuff

* msg stuffs

* msg_copy_to_print_buffer

* popup_menu_draw_menu_contents

* appendGfx_message

* cleanup

* building fixed

* Change exceptasm symbols to not be global

---------

Co-authored-by: Ethan <ethteck@gmail.com>
2024-01-16 14:13:54 +09:00
AltoXorg b2cf91c8ca
yaml-ify map metadata & iQue pm_map (#1145)
* map (draft)

* put to mapfs.yaml and other ver.

* ique map finished

* alisin ang type
2024-01-11 20:41:11 +09:00
Alex Bates 82b09bd69e
support modded NPC sprites (#1146)
* support modded NPC sprites

- improve compatibility with Star Rod SpriteSheet.xml files
  - SR's intention is to move to the decomp xml but the current release of SR emitted incompatible xml
- use npc.xml instead of npc_sprite_names.yaml to generate linker entries. this allows mods to add new sprites

* black

why does it want two spaces before line comments!?

* Doxygen (#1142)

* use doxygen
* add documenting guide based on https://github.com/zeldaret/oot/blob/main/docs/Documenting.md
* exclude stdlib readme from doxygen
* refuse to configure matching iQue on macOS (EGCS compiler is not built for macOS, so iQue won't build. We still enable iQue builds on macOS by using gcc-papermario via --non-matching.)
* use proper doxygen bug comment style
* document common EVT API funcs nicely
* add doxygen ci
* add \vars command

* s/master/main

* use Doxygen 1.10.0

* fix doxygen ci

* fix doxygen ci

* fix doxygen (final)

* fix doxygen (final real)

* Fix Doxygen CI (#1147)

* remove old doxygen ci line

* fix warns

Thanks @Ponmander for reporting this
2024-01-11 19:33:39 +09:00
Alex Bates 37f59877e5
Doxygen (#1142)
* use doxygen
* add documenting guide based on https://github.com/zeldaret/oot/blob/main/docs/Documenting.md
* exclude stdlib readme from doxygen
* refuse to configure matching iQue on macOS (EGCS compiler is not built for macOS, so iQue won't build. We still enable iQue builds on macOS by using gcc-papermario via --non-matching.)
* use proper doxygen bug comment style
* document common EVT API funcs nicely
* add doxygen ci
* add \vars command
2024-01-09 23:56:08 +00:00
Alex Bates 029de584b7
Fix INCLUDE_IMG and INCLUDE_PAL on modern GCC (#1143)
* fix INCLUDE_IMG and INCLUDE_PAL on modern GCC

* use .pushsection/.popsection

* use pushsection/popsection on modern compiler only

* add gcc-mips-linux-gnu to debian deps

* remove rogue )

* move -DMODERN_COMPILER to cflags_modern
2024-01-09 14:20:24 +09:00
Alex Bates 070a5488d0
Fix custom texture archive palettes (#1144)
* txa: fix custom palettes

* use self.warn
2024-01-09 14:17:33 +09:00
Alex Bates 6b5883f1f5
Assetify crash font (#1140)
* assetify crash font

* bump pigment64 version

* bump pigment ver

* maybe fix

* 2

* move to new img asset inclusion

---------

Co-authored-by: Ethan <ethteck@gmail.com>
2024-01-09 01:42:34 +09:00
Ethan Roseman 6da232df36
Image asset rework (#1141)
* poc

* A bit

* 19 files to go

* ique fixed this took me hours omg

* 4 more

* dead vines

* fixules

* drop .bin from needed macro
2024-01-08 01:36:59 +09:00
Ethan f152efa31c
fix / improve find_similar_areas.py 2024-01-07 12:30:26 +09:00
Alex Bates 6741e3f848
Modern GCC improvements (#1139)
* enable gcc_modern color

* add capability to compile segments with gcc_modern

* macos: install modern gcc
2024-01-07 10:40:16 +09:00
Ethan Roseman 262428c68a
Splat update (#1136)
* Remove splat from repo

* refactor scraps

* requirements update
2024-01-03 02:16:18 +09:00