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,488 Commits 4 Branches 0 Tags 206 MiB
61f96a4470
Commit Graph

930 Commits

Author SHA1 Message Date
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
HailSanta
44fd49ea0b
peach anims (#953) 
* checkpoint

* peach anims

* print message

* oh

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2023-02-22 17:03:47 +09:00
Macrepeh
a07575cc00
Some Flag Names (#950) 
* A few flag names

* Flag names

* Flags two
 2023-02-22 00:10:03 +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
Ethan Roseman
76438a7198
Fix typedefs for various things to be more C compliant (#929) 2023-02-02 02:48:25 +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
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
Ethan Roseman
8b27ed01ef
3unks (#920) 
* chomp_drop_appendGfx

* stars_shimmer_main & stars_shimmer_update

* clean
 2023-01-24 12:33:04 +09:00
MS-DOS1999
ebe5fbd0f6
match update_camera_mode_4/6 (#919) 2023-01-23 23:46:51 +00:00
Ethan Roseman
bfbb7d1f98
Twuncs (#917) 
* wip

* func_80240000_D2BD30

* npc_find_standing_on_entity

* wip

* cleanup

* warning

* close

* anotha one

* spr_allocate_components

* func_80243FC4_A2E204

* func_80240B4C_B2108C

* clean
 2023-01-23 00:35:43 +09:00