pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,555 Commits 4 Branches 0 Tags 206 MiB
c2c5f15a2a
Commit Graph

960 Commits

Author SHA1 Message Date
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
f91fe539a4
Snug bugs unrelated to and never been inside of a rug (#1082) 
* Fix enum name, offset

* Fix bugs

Some assets were slipping by the asset stack
Tex archve building wasn't respecting the asset stack (Fixes #1074)

* Fixes #1081

* fix paths kinda

* git subrepo pull --force tools/splat

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

* Fix stuff after splupdate
 2023-07-13 17:56:16 +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
Lincoln-LM
d65dce43df
Document Probability Distribution of Calls to rand_int (#1063) 
* document probability of the majority of conditional calls to rand_int

* update positions of else/elseif comments

* remove unneeded documentation
 2023-06-16 10:22:26 +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
Marijn van der Werf
5511e18133
Clean executable files (#1047) 
* Mark headers as non-executable

* Update shebangs
 2023-05-04 18:03:02 +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
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
Unnunu
771113de21
npc_do_player_collision (#1017) 2023-04-16 10:21:08 +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
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
Unnunu
861aa3b4a9
matched underwater_appendGfx (#991) 2023-03-23 10:45:12 +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
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
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
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
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
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
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
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
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
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