pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-16 14:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,656 Commits 4 Branches 0 Tags 202 MiB
5f1f696bdc
Commit Graph

279 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Ethan Roseman
2340b15e97
Master to main (#970) 
* step 1

* gMasterGfxPos -> gMainGfxPos

* change label name
 2023-03-09 01:55:54 +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
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
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
Unnunu
8e671e2fff
match SetSpriteShading (#944) 2023-02-17 01:56:57 +00: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
Marijn van der Werf
f0ae9177ee
Refer to end of buffers instead of trailing data (#938) 2023-02-12 01:39:29 +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
HailSanta
858eb4c19e
fix map warnings (#916) 
* omo_17

* sam_06

* sam_06

* hos_02

* hos_03

* shops

* star kid name fix

* shop dialogue

* nok_11

* nok 14/15

* small fixes

* ready

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-21 17:14:46 +09:00
HailSanta
935fd14530
misc battle cleanup III (#911) 
* misc

* fix one type

* yeah

* misc

* all substates

* almost done

* renames

* comments

* a couple maps

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-15 18:22:41 +09:00
Unnunu
2f79b35772
model functions (#910) 
* matched appendGfx_model

* 3 more

* fog modes

* cleaning

* fix

* fixed macro name

* FogModes enum

* extra tile enum renamed
 2023-01-13 16:56:28 +09:00
HailSanta
cc3a146066
battle substates cleanup I (#906) 
* cleanup in progress

* celebrate done

* progress

* etc

* substate enums done

* flag fixup

* brevity

* msg name fix

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-10 15:33:09 +09:00
HailSanta
0e54cd9b30
area kmr (#898) 
* kmr_02 ok

* some cleanup

* foliage EVS

* quiz cleanup

* partners

* cleanup pass ?

* kmr_02 done

* kmr_20 ok

* begin kmr_20 cleanup

* enough kmr_20

* kpa_90+

* more kpa

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-02 10:58:39 +09:00
Ethan Roseman
03c7e0d80d
BSS, undefined_syms (#891) 2022-12-17 12:20:37 +09:00
Ethan Roseman
29c3ffa2e0
Misc decomp 3: Oh baby a triple (#882) 
* clean

* git subrepo pull --force tools/splat

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

* splat update

* more matches after nop hack

* git subrepo pull --force tools/splat

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

* Renames, match boot_idle

* one mo

* wips

* fish func

Co-authored-by: @JaThePlayer

* sushie dun

* warnings

* clean

* match a nok func

* nok_02 stuff

* nok_04 party image

* func_802BD5D8_3174F8

* LoadPartyImage & stuff

* warnings
 2022-12-11 16:43:29 +09:00
Ethan Roseman
5b5b8c579f
95% (#881) 
* fixes

* 2 nusys funcs

* warnings

* appendGfx_npc_blur

* clean

* cleanup, standardize button macro
 2022-12-07 17:39:22 +09:00
HailSanta
703896a7f1
isk+ (#878) 
* isk_01/2/3

* machi

* mac_05

* mac_04 matched

* mac_04

* mac_02 match

* mostly cookin

* mac_02 cleanup

* tayce t cleanup done

* most of isk

* almost done isk

* isk done

* mapconfig 1C

* jump to goal

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-12-06 08:29:22 +09:00
HailSanta
c776b32bc6
generic_entity -> worker (#865) 
* workers

* broke out worker flags

* quick fix

* player sprite sets

* enum ws

* default -> world

* fix long line

* virtual entity split and minor cleanup

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-11-21 23:12:28 -05:00
Unnunu
0f4f12a1dd
btl_state_update_partner_menu (#860) 
* btl_state_update_partner_menu

* cleaning

* enums in btl_state_draw_partner_menu

* PR comments
 2022-11-16 18:46:50 +09:00
Ethan Roseman
8d429c8b07
Map Funcs (#855) 
* 2 mo hossz

* jan_00 2 funcs

* a jan_03

* dupes & stuff

* 2 mo

* 4 macs

* mac_01/8017D0

* cleanup + matching

* 3 obks

* wip

* clean
 2022-11-12 04:34:36 +09:00
Unnunu
b9502a1ac4
action commands (#853) 
* reorg done

* warning

* PR comments
 2022-11-08 22:01:42 +09:00
Unnunu
8fd2613bd8
encounters and static npc flags (#843) 
* matched update_encounters_neutral

* matched encounter funcs

* replaced NPC flags with ENEMY flags

* cleaning up

* warnings
 2022-11-01 12:27:10 +00:00
Unnunu
76254641e5
non-world data migration (#841) 
* migrated 54360

* partially migrated 1AF2D0

* level up screen

* 1AF2D0 fully migrated

* cleaned up

* matched one audio function

* fixed warning

* PR comments
 2022-10-31 00:41:22 +09:00
HailSanta
342887a94c
kmr + revisions (#828) 
* kmr_07

* more kmr

* kzn cleanup 1-9

* kzn cleanup II

* arn/mgm/gv/end revision

* iwa I

* bubulb spelling

* rest of iwa

* more kmr

* enough kmr_23 for now

* quick fix

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-17 16:46:24 +09:00
Ethan Roseman
46decfa258
Warning Fixies (#826) 
* warnings

* morenings

* more

* morz

* mor3

* PR
 2022-10-16 23:22:18 +09:00
Ethan Roseman
c700116f41
BSS And Libultra (#823) 
* BSS refactor (the Wiseguy method)

* controller.c

* ldiv.c

* motor.c

* cartrominit.c

* more libultra matching + standardization

* more libultra stuff

* more

* clean

* warnings
 2022-10-16 07:24:05 +09:00
Unnunu
b93928a013
two background gfx functions (#819) 
* matched tattle_cam_pre_render

* matched appendGfx_background_texture

* cleaning up

* fix one warning

* made ARRAY_COUNT and removed unnecessary cast
 2022-10-13 10:16:49 +09:00
Ethan Roseman
f394da14cb
Floaters (#816) 
* progrz

* 3 big boys

* play_movement_dust_effects

* clean
 2022-10-12 06:13:08 +09:00
HailSanta
f96542f52a
area_trd (#807) 
* EVT_PLAY_EFFECT

* area_trd data

* forgot a flag name

* fix bobomb spelling

* todo note

* fix macros

* fixed a couple more

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-07 14:45:58 -04:00
Ethan Roseman
73af4eb5a0
Tables & Chairs (sorry no chairs actually) (#800) 
* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "ec7bd4868e"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "ec7bd4868e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* wips

* more

* wipperz

* it workz

* mdl_make_local_vertex_copy

* sleep_bubble finished + gfx

* fire_breath gfx

* func_800F0490

* func_800EFE2C

* 8a860 funcs

* cleanup + dead cod

* dead clean

* git subrepo pull --force tools/splat

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

* cleanup + splat prep

* git subrepo pull --force tools/splat

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

* bits

* clean

* bss c -> asm

* btl_update_starpoints_display

* is_debug + cleanup

* load_script / 190B20 data

* all the symz

* clean

* cleanup + stuff
 2022-10-04 23:09:23 +09:00
Ethan Roseman
87179cdf3f
Shiftability work + splat update (#783) 
* evt bss + shiftability work

* entity BSS

* more BSS

* another follows_vram

* more shift goodz

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "9af40c5265"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "9af40c5265"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2022-09-24 11:21:54 -04:00
HailSanta
9ef69b66cf
needed more DEG_TO_RAD (#773) 
* sneaky

* first batch

* DEG_TO_RAD

* some mac_04 funcs

* parasol done

* unk playerstatus fields

* sprite learnin

* new sprite stuff

* yay

* fix a warning

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-15 09:39:16 -10:00
HailSanta
f7e39c0802
player anim + collider surface types (#769) 
* player anim + collider surface types

* added default surface type

* remove unused flags and define surface mask

* revised action table

* checkpoint

* player sprite stuff

* remove currentAnim union

* more actions

* enough

* discharged

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-13 02:26:57 -04:00
Ethan Roseman
0094fa6a31
Pigs and speech bubbles 🐽 💬 (#767) 
* lil_oink effect

* oink map funcs

* fix build to not be big

* machi funcs

* mac func

* data migration

* draw_shop_items

* e20eb0.c funcs + data

* warnings

* PR warnings and cleanup
 2022-09-11 02:04:04 +09:00
Ethan Roseman
408c49cb75
one for the books (#765) 
* func_802A1518_78BB18

* btl_state_update_select_target

* wip

* btl_state_draw_select_target and WIP

* cleanup

* render_shaded_sprite and wip

* WIP/cleanup

* wip

* reset_player_status

* btl_state_update_player_move and cleanup

* func_802A2C84

* func_80242FE0 wip

* btl_state_update_normal_start and cleanup

* WIP

* btl_state_update_end_turn

* btl_state_update_enemy_striking_first

* cleanup

* cleanup & wip

* item_entity_update & cleanup

* update_item_entity_temp

* appendGfx_item_entity

* E21870

* mdl_create_mode

* cleanup

* func_802A9310_42D220

* area_flo2 battle funcs dun

* b_area_isk_part_1_ChompChainUpdate

* wip and rip

* clean

* partner_move_to_goal

* partner_get_out

* wip

* cleanup

* func_802BD1AC_31CD1C

* func_802BD754_31D2C4

* Cleanin

* fix func def

* UnkShadowFunc001

* a bunch of kpa funcs

* comment
 2022-09-08 21:21:07 +09:00
HailSanta
0df93d5b2b
prep for map dumping (#760) 
* prep for map dumping

* s p a c i n g

* advanced door + world statics

* sneaky tabs

* more world

* one more

* saved for later

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-06 11:26:53 -04:00