Commit Graph

2669 Commits

Author SHA1 Message Date
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
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
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
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
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
cec7e0edb7
oopth 2 electric boogaloopth 2023-03-09 01:05:41 +09:00
Ethan Roseman
7fd3734410
oopth (fixing Jenkinsfile for cn -> ique) 2023-03-09 00:58:19 +09:00
Ethan Roseman
57054c0a6c
Badges for other versions 2023-03-09 00:52:21 +09:00
Ethan Roseman
c5dde1054f
cn -> ique (#969) 2023-03-09 00:40:22 +09:00