pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 00:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,666 Commits 5 Branches 0 Tags 205 MiB
56596bfe47
Commit Graph

701 Commits

Author SHA1 Message Date
Ethan Roseman
01d88aa9ee
Effect data refactor (#1094) 
* grood

* fixes
 2023-07-25 02:51:48 +09:00
Ethan Roseman
ccc8e8e46b
More autos (#1097) 
* prep

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "aab26aab63"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "aab26aab63"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* fix

* blah
 2023-07-25 00:37:23 +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
Ethan Roseman
9b765a1f25
Mopping (#1090) 
* yaml simplifications

* remove unneeded end markers after c files

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "7869ef2e51"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "7869ef2e51"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* cleanin

* effect_shims.h

* PRomment
 2023-07-19 18:01:28 +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
Rainchus
c2c5f15a2a
rename D_800A0948 to gLoadedFromFileSelect (#1080) 
* name D_800A0948 to gMapLoadFrom

* replace comparison of 0 with LOAD_FROM_MAP

* update gLoadingDemoMap to gLoadedFromFileSelect

* up jp and ique versions

* update if statement
 2023-07-15 14:26:29 +09:00
Ethan Roseman
4f77ffbc3e
more pal funcs & npc sprites improvement (#1079) 
* cod changes and fixes for npc sprites

* 6 mo

* Cleanup
 2023-07-10 14:57:27 +09:00
Ethan Roseman
4d8b61d6a0
whoooooweee that is some good ol' fashioned decomp (pal funcs) (#1076) 
* whoooooweee that is some good ol' fashioned decomp

* fixins

* PRomment

* Fixes #1075

* change ver to pal

* another

* some more

* progress.py formatting

* oopth

* Promment

* Promment2
 2023-07-03 18:35:05 +09:00
HailSanta
6bb14ff8be
tex archives (#1072) 
* extraction

* hmm

* eth cleanup

* tex skeleton

* building

* OK

* pal OK

* cleaned texture names

* moved tex code to separate file

* additional error checking

* proposed splits

* split a5dd0

* additional cleanup

* myoop

* wahoo

* lru

* fixules

* fixin agin

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2023-06-29 21:06:23 +09:00
Ethan Roseman
8837fbdf65
Player sprites & more (#1055) 
* WIP work on sprites (sprite_stuff.py)

* cleanup of various stuff

* separate compiler installation into separate script

* wipz

* more

* renames, bugfixes

* more

* very grood

* cleanin

* goods and services

* oopth

* oopth2

* Parse palette data from xml

* more work

* more wipperz

* more

* it working

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "e72a868f9f"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "e72a868f9f"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* fix symbol_addrs for new splat

* upd8s

* Use generated header, other versions, fixes

* fixes & formatting

* wip fusing npc + player extraction & cleanup

* remove npc_files

* buildin

* fix some bugs

* Cleanup, yay0s separately

* cleen

* cleanup

* Respect stack during build

* jp spritz

* dun

* fix c files

---------

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
 2023-06-26 19:27:37 +09:00
Marlon Pohl
f0a9274c01
Implemented kkj_19_5_baking_GetItemNameRaw for pal (#1066) 
* Implemented kkj_19_5_baking_GetItemNameRaw for pal

* Usage of decimals instead of hexadecimals

* Implemented mgm_01_2_npc SetMsgVars_BlocksRemaining

* Implemented mgm_02_0_header.c

* Removed .s file

I'm such an idiot for forgetting this

* removed implemented methods

* optimized decomp

* found the value for the hex number

thanks to @marijnvdwerf and @Brotenko

* Fixed args indexing

Co-authored-by: Ethan Roseman <ethteck@gmail.com>

* Added empty line after definitions

* Apply suggestions from code review

Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>

* adjusted format (fixed compiler warning)

* made review changes

* removed duplicated code

* namespaced pal_var

---------

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
 2023-06-22 09:44:51 +09:00
HailSanta
c3690e380e
battles organization (#1065) 
* sbk

* pokey

* bandit

* check

* missing part ID refs

* nok progress

* area headers

* actors moved to common

* dedupe all stages

* couple missing actors and simplified includes

* separated stages by world area

* stage cleanup I

* stage cleanup II

* done stage cleanup

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-06-05 17:16:46 +09:00
HailSanta
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
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
Lincoln-LM
f770d12db4
Document PRNG Related Functions (#1060) 
* document gfx_rand

* document global LCG

* rename func_80029994

* clarify rand_int_internal comment

* gfx_rand -> gfx_rand_int

* remove unneeded parens

* gfx_rand_int -> effect_rand_int

* gfx_prng_seed -> effect_prng_seed

* fix local variable case
 2023-05-22 15:37:25 +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
Rainchus
ec6f2ef428
fix configure.py to find correct split.py (#1048) 
* fix configure.py to find correct split.py

* name func_802667F0 to DisplayActionRating and use enum

* use enum in DisplayActionRating

* Change DisplayActionRating to show_action_rating
 2023-05-09 12:48:11 +09:00
HailSanta
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
Jacob Butler
31c98cc94c
Albino Dino sprite/animation names (#1042) 
* Look at this

* Animation ordering fix

* Animation Naming Ordering Fix 2

---------

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2023-05-02 04:55:25 +09:00
Ethan Roseman
635fa40288
title_screen_draw_copyright (iQue) (#1044) 
* title_screen_draw_copyright (iQue)

* fixies
 2023-05-02 02:51:52 +09:00
Marijn van der Werf
aa08abd4da
Dump PAL filemenu section (#1036) 
* Dump PAL filemenu section

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* Clean up numbers

* Use more constants

* Find more constants

* Clean up a bit

* eth cleanup

* Clean up

* Fix brace style

* rename new file & funcs

---------

Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2023-05-01 16:40:57 +09:00
HailSanta
94cc139227
standardized battle script names (#1043) 
* damage intensity

* standardized battle script names

* few more

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-05-01 16:22:52 +09:00
Marijn van der Werf
30aa49d4a8
Clean trailing whitespace (#1038) 
* Add missing newlines

* Remove trailing whitepace
 2023-04-29 15:28:06 +02:00
HailSanta
c8548d5002
btl cam modes (#1035) 
* some btl cam

* couple things

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-04-29 03:19:30 -04: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
Ethan Roseman
e0cfd078da
imgfx data (#1029) 2023-04-25 13:55:14 +09:00
Marijn van der Werf
44d1b29590
ui_images (#1021) 
* ui_images

* Move French assets to their own folder
 2023-04-25 02:31:19 +09:00
Marijn van der Werf
aa29eb5553
Pal pause (#1011) 
* PAL pause segment

* PAL pause_gfx_en segment

* Apply name changes

* Merge gPauseBadgesElements

* Rename ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE

* Split PAL and monolingual arrays
 2023-04-21 17:33:49 +09: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
12a30b4ee8
lol 100% (#1019) 
Co-authored-by: Rainchus <rainmachus@gmail.com>
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
 2023-04-20 04:03:42 +09:00
Ethan Roseman
dec110160c
appendGfx_animator_node (#1018) 
* appendGfx_animator_node

Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>

* find_similar_areas improvements

* oopz

---------

Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
 2023-04-18 04:51:16 +09:00
Unnunu
771113de21
npc_do_player_collision (#1017) 2023-04-16 10:21:08 +09:00
Ethan Roseman
7873b05520
draw_image_with_clipping (#1016) 
* draw_image_with_clipping

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* tiny fix

---------

Co-authored-by: Unnunu <serge_zorkin@mail.ru>
 2023-04-13 02:54:50 +09:00
Ethan Roseman
92af8493a0
func_E02000AC (#1013) 2023-04-11 03:18:49 +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
CreateSource
86cfc280d5
Changed some variable names in state_title_screen (#1003) 
* Changed some variable names in state_title_screen.c

* resolving pull request items

* changed TitleData to TitleScreenGfxData across sys

* replace gbi names with understandable ones

* accidentally switched logo and pressStart

* changed GfxData to ImgList

* Renaming and b32

* Doing this but more
 2023-03-28 14:42:44 +09:00
Marijn van der Werf
595f142b27
Pal battle (#989) 
* world partners

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* battle partners

* battle items

* Update src/battle/common/move/ItemRefund.inc.c

Co-authored-by: Alex Bates <16batesa@gmail.com>

* add LANGUAGE enum

* Move extern variable declarations

* Remove temp var

* Update scripts

* remove post

* Fix n64img version

This reverts commit f5a2c592bd.

* unfix n64img

---------

Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Alex Bates <16batesa@gmail.com>
 2023-03-27 02:03:19 +09:00
Ethan Roseman
accdc4a7f6
test_item_player_collision (#999) 
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
 2023-03-26 17:02:47 +09:00
Unnunu
04086c771c
update_camera_mode_2 (#997) 2023-03-25 00:06:14 +09:00
Ethan Roseman
6efc4afac6
disaptch_damage_event_actor (#994) 2023-03-23 15:44:58 +09:00
Ethan Roseman
b8169491a4
blast_appendGfx (#993) 
all effects matched!

Co-authored-by: Mc-muffin <8714476+Mc-muffin@users.noreply.github.com>
 2023-03-23 13:07:10 +09:00
Unnunu
861aa3b4a9
matched underwater_appendGfx (#991) 2023-03-23 10:45:12 +09:00
Unnunu
4f723327d8
matched func_802428C8_A2CB08 (#990) 2023-03-23 00:29:26 +09:00
Unnunu
a23dbf6192
update_lerp_battle (#988) 2023-03-20 16:36:04 +09:00
Unnunu
4959741a4a
effect_65 (#987) 
* effect_65

* added pal version to coverage.py

* restored files
 2023-03-20 10:47:35 +09:00
Ethan Roseman
07569d8668
hotfix effect_65_appendGfx name 2023-03-20 10:07:17 +09:00
Marijn van der Werf
f504af5b90
A couple of PAL sections (#986) 
* Splat later segments

* battle_areas

* effects
 2023-03-20 00:05:43 +09:00
Unnunu
61f96a4470
create_target_list (#983) 
* matched create_target_list

* target flags

* fix
 2023-03-16 22:35:31 +09:00
Unnunu
2553df9320
matched update_status_menu (#980) 
* matched update_status_menu

* clean up

* fixed formatting

* PR comments
 2023-03-16 19:20:43 +09:00
HailSanta
f0145e8541
other world partners (#981) 
* watt

* half sushie

* sushie

* laki first pass

* checkpoint

* ok

* PartnerStatus

* enough

* minor

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-03-16 15:41:26 +09:00
Unnunu
cea7794e34
bulb_glow_appendGfx (#979) 2023-03-15 12:16:03 +00:00
Marijn van der Werf
76ff971c9b
Final batch of PAL maps (#977) 
* arn

* dgb

* kzn

* flo

* sam

* pra

* omo

* end

* mgm

* gv

* Clean up floats

* Use MODEL_ constants

* Prefix scripts with EVS_

* Use ACTION_STATE_IDLE

* Find common base for Kammy/Jr. Troopa speed

* Rename TOADHOUSE_ANIM_TALK

* Add TODO

* Calculate FRAME_RATE

* Add calculation for PAL wait duration
 2023-03-15 07:43:17 +09:00
Ethan Roseman
8f19afcd26
mdl_project_tex_coords (#978) 
* mdl_project_tex_coords

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* move 0 to 0

---------

Co-authored-by: Unnunu <serge_zorkin@mail.ru>
 2023-03-14 23:42:11 +09:00
HailSanta
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
Marijn van der Werf
d31022e042
Second batch of PAL maps (#974) 
* iwa

* sbk

* dro

* isk

* trd

* nok

* hos

* kpa

* osr

* kkj

* tst

* jan

* mim

* obk

* Use MODEL_ constants

* Rename defines

* Fix SetCamSpeed invocations

* Remove Boo float defines

* Simplifly float
 2023-03-14 17:47:14 +09:00
Ethan Roseman
7928eff738
The function formerly known as func_80282E30 (#975) 
* The function formerly known as func_80282E30

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* PR comments

---------

Co-authored-by: Unnunu <serge_zorkin@mail.ru>
 2023-03-14 14:58:39 +09:00
Ethan Roseman
f8836ce36f
Cleanup & effect gfx data (#973) 
* wip / clean

* remaining effect gfx data, cleanup

* restore file

* oopz

* oopz2

* oopz3
 2023-03-13 02:11:17 -04: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
df10ef30c7
render_hud_element (#972) 
* render_hud_element

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* update default size on progress.py

* PR comments

---------

Co-authored-by: Unnunu <serge_zorkin@mail.ru>
 2023-03-11 11:15:59 +09:00
Ethan Roseman
b2bfea4654
shop_open_item_select_popup (#971) 
Co-authored-by: 1superchip <57328807+1superchip@users.noreply.github.com>
 2023-03-09 17:50:51 +09:00
Ethan Roseman
2340b15e97
Master to main (#970) 
* step 1

* gMasterGfxPos -> gMainGfxPos

* change label name
 2023-03-09 01:55:54 +09:00
Ethan Roseman
c5dde1054f
cn -> ique (#969) 2023-03-09 00:40:22 +09:00
Ethan Roseman
30cc2aa6d0
func_802A3C98 (#968) 
* wip

* func_802A3C98

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* cleanup

---------

Co-authored-by: Unnunu <serge_zorkin@mail.ru>
 2023-03-08 11:52:49 +09:00
Macrepeh
061e87decd
Misc Labeling (#965) 
* A few flag names

* Flag names

* Flags two

* my great commit

* Fixy Fix

* Pascal Case

* fix
 2023-03-07 21:00:11 -05:00
HailSanta
5ba2b3a6bd
partners and notifications (#966) 
* kooper cleanup

* second pass

* notifications

* goombario

* tweesters mostly

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-03-06 16:44:48 +09:00
Ethan Roseman
31a49cbdb6
func_802A5290 (#964) 2023-03-06 02:07:51 +09:00
Marijn van der Werf
b6e5baa4fc
iQue engine2 (#954) 
* Include engine2 segment

* Match msg_get_print_char_width

* Make m2ctx include version/current/include

* fix undefined_syms

* Remove redundant syms

* match ique get_msg_properties

* Fix build after rebase

* Remove unused asm

* rebase fixes

---------

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
 2023-03-04 12:40:20 +09:00
HailSanta
288bb8511f
world kooper cleanup (#963) 
* kooper cleanup

* second pass

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-03-04 12:20:43 +09:00
Ethan Roseman
209457a32a
msg_copy_to_print_buffer (#962) 
* wip

* wip

* update_camera_mode_unused

* PR comment

* fix warning

* wip

* wip

* msg_copy_to_print_buffer

* PR comments
 2023-03-03 10:42:48 +09:00
Unnunu
fff7fa2e99
lightning_bolt_appendGfx (#961) 
* lightning_bolt_appendGfx

* PR comments
 2023-03-02 16:59:54 -05:00
HailSanta
1cf0d59f2a
camera control points union (#958) 
* union for camera points

* remove raw

* first cleanup

* enums and names

* one minor thing

* corrected comment

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-03-02 17:32:54 +09:00
HailSanta
8a7432f465
popup and window priority (#960) 
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-03-02 11:36:11 +09:00
Ethan Roseman
13901b29a4
update_camera_mode_unused (#959) 
* wip

* wip

* update_camera_mode_unused

* PR comment
 2023-03-02 10:16:55 +09:00
Unnunu
c266bc58d7
two geometric functions (#957) 
* matched two functions

* PR comments
 2023-02-26 19:19:16 +09:00
HailSanta
07c314d8e7
draw popup menu (#956) 
* shape misc

* new func

* popup stuff

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-02-25 17:30:02 +09:00
Ethan Roseman
ba42928a18
3unks the Threequel (#955) 
* Fix modern gcc issue with function call arg evaluation order, shiftability issue with heap, other fixes

* cursed function byebye

* configure cleanup

* npc_do_other_npc_collision & func_80244550_A2E790

* wip

* PR comments
 2023-02-24 13:02:57 +09: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
Marijn van der Werf
aaeddca8e8
Partially build iQue release (#935) 
* Build iQue main segment

* Dump CN assembly

* Clean up offsets

* Add CN version of pause screen

* Disassemble pause_stats_draw_contents

# Conflicts:
#	src/pause/pause_stats.c

* Extract version differences to variables

* Document changes in gv_01

* Include credits changes

* Build filemenu for ique

* Match iQue filemenu_draw_file_name

* Match filemenu_draw_char

* Match ique filemenu_draw_message

* Match remaining iQue filemenu functions

* Clean up ique bss

* Clean up ique libultra splat list

* Add constants for multibyte chars

* Use decimal int representation

* Use MSG_CHAR constants for condition

* Remove defined symbols

* Add ique rom to CI

* avoid x/0

---------

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2023-02-21 23:37:27 +09:00
HailSanta
4145cccd86
mario anim names (#951) 
* prep

* player anims

* consistency

* extra space

* slight adjustment

* suggest_player_anim func names

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-02-21 17:24:25 +09:00
HailSanta
5a5d088d83
battle cleanup (#947) 
* item cleanup

* quick

* star power cleanup

* battle cleanup

* battle cleanup

* SetGroupVisibility

* more stage cleanup

* stage clean

* misc

* half of stages

* stagework

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-02-21 00:22:38 +09:00
HailSanta
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
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
Marijn van der Werf
0d70e3ecac
Build main segment in JP (#939) 
* Remove JP dump

* Add new JP dump

* Fix sort_symbol_addrs to only look at one version

* Deduplicate and sort symbol_addrs

* Clean up JP rom if conditions

* Use /current dir for diffing

* Fix state_step_logos

* Add todo comments for unsplitted segments

* Fix draw_merlee_message

* rename background_gfx

* Fix background_gfx

* Fix JP build

* Set unused data offsets to auto
 2023-02-17 11:06:56 +09:00
Unnunu
8e671e2fff
match SetSpriteShading (#944) 2023-02-17 01:56:57 +00: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
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
Marijn van der Werf
f0ae9177ee
Refer to end of buffers instead of trailing data (#938) 2023-02-12 01:39:29 +09:00
HailSanta
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
HailSanta
6c606383e8
nok and pra done (#936) 
* nok_04 ok

* thread done

* push block doc

* nok done

* almost done pra

* pra done

* cleanup pra_31 mtx names

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "3bbc02af68"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "3bbc02af68"
git-subrepo:
  version:  "0.4.5"
  origin:   "???"
  commit:   "???"

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-02-08 09:47:26 +09:00
Unnunu
354ebdfe20
last audio function and more documentation (#934) 
* documented voice

* sfx_player

* sfx

* ambient sounds

* fix

* fix name

* au -> snd
 2023-02-06 20:21:55 +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
Mr-Wiseguy
a78099f909
Named and documented visibility test functions (func_8011C80C and func_8011CFBC) (#932) 
more s->w perspective renaming
 2023-02-03 08:50:48 +00: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
Ethan Roseman
625d7874c5
Shiftability, naming of things (#930) 
* Naming, shiftability fixes, etc

* follows_vram fixes

* more goods

* tweesterz

* agh

* warnings

* agh
 2023-02-02 20:23:17 +09:00
HailSanta
2d3a608ce7
area hos (#928) 
* hos_06 ok

* hos_06

* hos_01

* hos_01

* hos_04

* hos 10/20

* hos_05 builds

* hos_05 data ok

* hos_05 ok

* hos_05 cleanup pt1

* hos_05 cleanup done

* small fix

* a couple more

* fix little thing

* finish sam_01

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-02-01 11:31:09 +09:00
Ethan Roseman
bc618160ed
Shiftability / modern gcc work (#927) 
* cleanup & fixes

* some pointers

* fix some bss syms

* sizes, modern gcc prep, etc

* Fixing errors on modern gcc

* a few fixes

* fixes
 2023-02-01 01:12:03 +09:00
Unnunu
3c44b74922
au_pull_voice and some documentation (#926) 
* matched dispatch_damage_event_partner

* cleaning up

* matched au_voice_pull

* removed comment

* more renames

* and a couple more

* rename voice group -> fx bus
 2023-01-31 21:06:12 +09:00