Commit Graph

1012 Commits

Author SHA1 Message Date
Ethan
989598c6b7
more goods 2024-11-10 22:28:10 +09:00
icebound777
81875cffb3
Fix variable names related to fleeing battles being logically inverted (#1219) 2024-11-09 12:41:16 +09: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
b1ca4bd051
filemenu state upstreams from dx (#1215) 2024-10-31 09:21:15 +09:00
z64a
bf0741ce15
upstream window IDs from dx (#1214) 2024-10-23 20:18:00 -04: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
888b27eec8
Fix charset craziness (#1202) 2024-09-13 02:00:57 +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
3526fa4970
[JP] Action Commands, Battle Partners/Items/Moves and some more (#1195) 2024-09-01 21:14:39 +09:00
whosblumiere
db9dbbec05 rename formation_names.h to battle_names.h 2024-03-24 02:57:27 +00:00
Rainchus
ed46ab0c70
Unhardcode many for loop conditions (#1179)
* suggest possible bgm name if it is not found

* remove pointless ()

* run black

* ...run updated black

* unhardcode many for loop conditions

* fix inconsistent RGBA_BUF_SIZE naming

* requested macro changes
2024-03-07 01:03:33 +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
AltoXorg
6a2ad7e1b9
iQue appendGfx_message (#1167)
* iQue appendGfx_message

* i forgot constant name

* update progress.py

this should 100% by now :)
2024-02-06 21:32:33 +09:00
Alex Bates
fd9593a7b0
fix EVT_SETUP_CAMERA_DEFAULT (#1162) 2024-02-02 23:53:41 +09:00
Alex Bates
260b96faf9
fix doxygen not parsing API_CALLABLE (#1157) 2024-01-22 05:37:36 +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
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
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
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
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
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
AltoXorg
36f1ef2c72
huge iQue matching (#1126)
* engine1

* !

* entity/model

* maps

* level_up

* btl_states_menus

* effects

* cleanup and asm match

* battle_code

* cleanup

* msg.c near matching

* final

* fix compilation

* meaningful

* pr commento

* compiler warn eliminate

* rank <-> chapter switcheroo
2023-11-21 00:22:26 +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
HailSanta
3293216356
last actors (#1118)
* omo2

* minor fixes

* actor types extraction

* format py

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-02 09:12:53 +09:00
HailSanta
46b2f11a59
more boss actors (#1117)
* common actors

* tubba and huff

* chapter 2

* fix ruff / tuff puff names

* bloopers

* slight

* everything except omo2

* format py

* fix pal

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-09-23 01:57:29 -04:00
JoshDuMan
bde8f70e3f
Clean up game_modes.c and game_states.c (#1115) 2023-09-15 23:53:00 -04:00
HailSanta
ef440ff994
most actors (#1114)
* common actors

* tubba and huff

* chapter 2

* fix ruff / tuff puff names

* bloopers

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-09-01 03:51:10 +09:00
HailSanta
9774b26d93
actors and sounds (#1112)
* all sorts of things

* various

* more

* various

* sound space names

* more

* alternating sounds done

* check

* partial jr troopa cleanup

* jr troopas

* fixes

* extract actor levels

* actor levels done

* chan

* the master

* standard names

* named actor vars

* ACTION_RESULT enum

* fix evt names

* fix struct names

* ember

* lava bubble

* goomba bros + flipped enum

* fix other enum

* goomba king battle

* tutorial enemies

* separate lee

* half lee

* lee done

* lee + duplighost

* more actors

* stray comment

* shy guy dedupe

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-22 03:07:08 +09: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
HailSanta
38c7785bfd
CRASH (#1109)
* sounds 1

* identify looping sounds

* standardize sound names

* more sounds

* more sounds

* ow ow ow

* 2 more

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-05 14:24:23 +09:00
HailSanta
9cac66c54a
misc work (#1108)
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-03 16:38:11 +09:00
HailSanta
f445cbaf18
item data generation (#1105)
* item entities

* pt II

* item hud scripts

* world map

* remove duplicate

* py formatting

* generate hud script ID mapping

* rename jump item -> boots

* item table

* unify pt1

* unify pt2

* item enum and ranges

* fix

* disambiguate boots/hammer names

* move table as well

* remove old move table

* comments concerns etc

* py fmt

* recipe generation

* break it!

* phix it

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-08-03 12:44:30 +09:00
Rainchus
f8d6ccddc4
use enum for EnableActorBlur, EnablePlayerBlur, EnableIdleScript args (#1104)
* use enum for EnableActorBlur, EnablePlayerBlur, EnableIdleScript

* create new enum for EnablePlayerBlur
2023-08-03 12:17:33 +09:00
Ethan Roseman
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
Ethan Roseman
9fe80585a4
more segments for pal (#1095)
* evt segment for pal

* fix issue with auto on effect loads segment

* Clean up undefined_syms

* Clean up

* meowp

* Match engine4

* Remove Addr declarations

* Fix indentation

* Remove `#if` for pal main segment

---------

Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
2023-07-25 03:07:47 +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
01d88aa9ee
Effect data refactor (#1094)
* grood

* fixes
2023-07-25 02:51:48 +09:00
HailSanta
76386ce361
icons archive generation (#1091)
* OK

* broken

* fixed

* misnomer

* fix names, add other versions

* fix stray object file and warnings

* .bin.o

* incorrect asset_deps

* cleanup

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-07-23 02:20:37 +09:00
Ethan Roseman
d516801b5f
Shiftable BSS (#1092)
* Shiftable BSS

* osFlash cleanup

* Fix warning

* PRomment

* fixes

* gulp

* yummy

* more

* more

* more alignment

* oopth

* fix budges

* Several budges

* more

* more budges

* fix black screen before "today..."

* final cleanup
2023-07-22 01:53:09 +09:00