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,564 Commits 4 Branches 0 Tags 206 MiB
ccc8e8e46b
Commit Graph

589 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Ethan Roseman
31a49cbdb6
func_802A5290 (#964) 2023-03-06 02:07:51 +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
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
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