pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-20 00:11:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,454 Commits 4 Branches 0 Tags 202 MiB
8f974438a3
Commit Graph

254 Commits

Author SHA1 Message Date
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
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
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
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
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
Ethan Roseman
99ddd82d60
Shiftability / symbol fixes (#925) 
* shiftability / symbol fixes

* temp fix to hos_05
 2023-01-28 19:47:26 +09:00
HailSanta
b5052b5bd0
most of pra (#924) 
* halfway

* five more

* mergin

* standardize foliage model lists

* alignment

* cleanup

* include reorg

* additional reorg

* more pra

* pra_19

* misc sprite

* missed sprite stuff

* enum value names

* FoldTypes

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-28 07:26:26 +09:00
Ethan Roseman
dfff7bce1a
squirt effect done, 0 warnings, undefined_syms cleanup, wip (#922) 
* warnings & WIP

* 0 warnings

* squirt_appendGfx && gfx data (squirt effect dun)

* undefined_syms cleanup

* clean

* don't die when no warnings
 2023-01-25 23:06:57 +09:00
HailSanta
a03510d8a6
area_omo (#921) 
* omo_09

* omo_11

* part of omo

* 08/10/13

* more

* train toad rename

* hmm

* guard ai

* omo_02

* fix partner anim enum

* omo_15

* omo_12

* last omo

* pra_15

* reflections

* under 100 maps left

* cleanup floats

* horse

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-25 11:33:20 +09: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
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
403f796246
area_dgb (#904) 
* a couple maps

* almost done

* ok

* cleanup

* ok

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-05 17:02:12 -05:00
HailSanta
1c470c92e5
area osr (#903) 
* 0/1

* ~2

* 2

* 4

* done

* ws

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-05 02:04:03 -05:00
HailSanta
a2e96ae3ae
area kpa (#901) 
* kpa 1/3/4/5

* more!

* just one left

* done

* stray cleanup

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-03 19:46:15 +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
Unnunu
e6de400efa
Draw box (#897) 
* wip

* matched draw_box

* cleaning up

* renamed file

* fixed warning

* PR comments
 2022-12-29 14:08:13 +09:00
HailSanta
cbdce77daf
area_spooky (#894) 
* obk_01

* obk_02

* obk_03

* obk_06

* obk_05

* checkpoint

* chandelier documentation

* obk_04

* obk_09

* obk_07

* obk done

* tabs

* kmr_22

* kmr_11

* last thing

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-12-25 14:10:23 +09:00
Ethan Roseman
1452474409
More cleanup, bss, undefined_syms (#892) 
* tons more BSS, undefined_syms, cleanup abound

* git subrepo pull --force tools/splat

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

* one more

* fix progress.py
 2022-12-18 02:08:52 +09:00
Ethan Roseman
03c7e0d80d
BSS, undefined_syms (#891) 2022-12-17 12:20:37 +09:00
HailSanta
e4283f3ea1
area_mac (#884) 
* mac_00 match

* mac_00 cleanup pass

* enough mac_00 cleanup

* mac_01 match

* cleanup pass 1

* first pass done

* more

* unkfoldfunc dedupe

* quick

* mockup

* new splat segment

* git subrepo pull --force tools/splat

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

* fix custom segment

* git subrepo pull --force tools/splat

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

* common vtx

* victory

* checkpoint

* remove map-specific subaligns

* enough

* quick fixes

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-12-12 21:31:29 +09:00
pixel-stuck
ff3835672d
water block effect matched (#883) 
* more effects

* delete asm

* PR comments

* More PR comments

* fully match water block effect

* cleanup for PR

* PR comments

* define for components
 2022-12-12 15:13:49 +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
Ethan Roseman
5b63159eaf
Effect, map decomp (#877) 
* snaking_static_appendGfx, gfx migration, cleanup

* more decomp + data stuff

* fix for Light

* map funcs

* 2 obk_07

* 4 mor

* fixes

* message IDs
 2022-12-06 08:53:46 +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
Ethan Roseman
d2b436287f
Effect work (#875) 
* quizmo_audience effect

* explosion_main

* tidying

* wip shtuff

* fixules

* partner_buff dun

* shockwave

* remove script
 2022-12-04 11:05:33 +09:00
HailSanta
2561914d1a
area_tik+ (#874) 
* koopa

* para troopa

* some fuzzy

* tik_05

* tik_02

* tik_01

* tik_03

* tik_03b

* tik_04

* tik_07

* tik_08

* tik_09

* tik_10/12

* tik_14

* tik_15

* tik_17/18

* more tiks

* area_tik

* mac_03

* cleanup

* oink names

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-11-30 16:39:42 +09:00
Ethan Roseman
2adca590f6
Effect work (#872) 
* this effect is awful

* ice_pillar effect

* radial_shimmer done, some data migration

* snowfalls

* data & snowfall

* wip
 2022-11-28 05:38:13 +09:00
Unnunu
30f8879ddc
dead maps (#871) 
* dead flo_00

* dead flo_03

* dead flo_07

* dead flo_08

* dead flo_09

* dead flo_10

* dead flo_11

* dead flo_12

* dead flo_13

* dead flo_14 flo_15

* dead flo_16

* dead flo_17 flo_18

* dead flo_19 unused

* kzn maps and PR comments
 2022-11-26 22:14:03 +09:00
pixel-stuck
0c9c8e8137
Windy leaves and water splash effects (#870) 
* more effects

* delete asm

* PR comments

* More PR comments
 2022-11-26 01:06:31 +09:00
pixel-stuck
f63ffa7e95
Match whirlwind effect (#869) 
* match whirlwind effect

* delete asm

* PR comments
 2022-11-24 23:57:29 +09:00
Ethan Roseman
78c30637f2
Misc matches & cleanup (#868) 
* yaml updates

* 2 funcs & cleanup

* anotha 1

* re-org

* PR & cleanup
 2022-11-24 03:33:39 +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
697a050e12
matched 4 (#863) 2022-11-20 02:35:04 +09:00
Ethan Roseman
f56df3d9f7
sprite_shading_profiles & obk_07 (#859) 
* obk_07 funcs

* 2 mo

* sprite_shading_profiles

* tiny clean

* PR comments
 2022-11-15 23:55:59 +09:00
Unnunu
b9502a1ac4
action commands (#853) 
* reorg done

* warning

* PR comments
 2022-11-08 22:01:42 +09:00
Ethan Roseman
922a953691
4 effect funcs (#851) 
* tattle_window

* cleanup

* music_note_appendGfx

* motion_blur_flame_update

* Gfx bin, PR comments

* undefined_syms cleanup

* undefined_syms cleanup
 2022-11-06 00:31:01 +09:00
Unnunu
294602ec98
battle partners (#852) 
* goompa and goombario

* kooper

* bombette

* parakarry

* watt

* sushie

* lakilester

* bow

* twink

* fix warning

* fix messed fields

* CalculateArcsinDeg

* updated splat entries
 2022-11-05 16:06:28 +09:00
mrshigure
9da8f0a56a
[Effects] A few functions (#850) 
* [Effects] A few functions

* Addressing PR comments
 2022-11-05 09:43:44 +09:00
mrshigure
7a56814010
Some effect functions (#846) 2022-11-02 12:51:32 +00:00