pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-19 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,631 Commits 4 Branches 0 Tags 202 MiB
shape-c
Commit Graph

2631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6327c84e8e
Update .git-blame-ignore-revs (#1039) 2023-04-30 03:56:50 +09:00
HailSanta
884140f419
split em (#1040) 
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-04-30 03:33:56 +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
Marijn van der Werf
a1918c3328
Add version option to diff.py (#1037) 2023-04-29 21:48:27 +09: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
44d1b29590
ui_images (#1021) 
* ui_images

* Move French assets to their own folder
 2023-04-25 02:31:19 +09:00
Devon R
cd130dfe8d
Replace python-githooks with manual command (#1027) 2023-04-24 15:02:57 +09:00
Alex Bates
90656fea19
use ARRAY_COUNT(ExtraDoubleRecipes) (#1023) 2023-04-23 18:57:39 +09:00
Julian
0e9626913a
Nix support (#1020) 
Very hacky
Will be maintained by @NotNite
 2023-04-22 14:47:03 +01: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
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
Marijn van der Werf
4380c32b8d
Add .git-blame-ignore-revs (#1014) 
# 1213a4adf0aa515d0c7c7e37db396363914fda2egit-blame
 2023-04-11 03:16:19 +09:00
Marijn van der Werf
1213a4adf0
Convert tabs to spaces (#1012) 2023-04-11 03:06:19 +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
HailSanta
314c4ef423
pause menu cleanup (#1008) 
* minor pause cleanup

* macro

* comments

* second macro

* delete macros

* hm

* pause message names

* unused tutorial messages

* oops

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-03-28 16:10:01 +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
Alex Bates
e599c2e773
add git hook to make sure assets/$version has been gitignored (#1006) 
* add git hook to make sure assets/ hasn't been gitignored

* echo to stderr

* quiet git check-ignore

* add .v64 and .n64 to gitignore
 2023-03-28 13:32:20 +09:00
Marijn van der Werf
2c7b849152
Clean up #989 (#1005) 2023-03-27 18:57:36 +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
Marijn van der Werf
0c741974a6
fix image building to work with new n64img output (#1001) 2023-03-27 00:43:00 +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
Alex Bates
4c080f1149
add PAL and iQue hashes to readme and change list into table (#995) 
Closes #984
 2023-03-24 03:08:39 +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
Marijn van der Werf
7c04b86492
build: remove iconv wrapper for macOS (#992) 2023-03-23 10:21:32 +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
42d899fd44
Hotfix coverage script 2023-03-20 10:36:13 +09:00
Ethan Roseman
07569d8668
hotfix effect_65_appendGfx name 2023-03-20 10:07:17 +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
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
1c9b62056c
LVars (#982) 
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-03-16 15:59:21 +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
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
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