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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Unnunu
b9502a1ac4
action commands ( #853 )
...
* reorg done
* warning
* PR comments
2022-11-08 22:01:42 +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
Unnunu
76254641e5
non-world data migration ( #841 )
...
* migrated 54360
* partially migrated 1AF2D0
* level up screen
* 1AF2D0 fully migrated
* cleaned up
* matched one audio function
* fixed warning
* PR comments
2022-10-31 00:41:22 +09:00
HailSanta
b656ab90b4
area_flo ( #839 )
...
* some reorg
* minor stuff
* flo_03
* flo_08
* flo_09
* flo_00
* flo_11/12
* flo_10
* flo 24/25
* flo 22/23
* flo 21
* flo_19
* flo 17/23
* flo 16
* flo 15
* flo_14
* flo_13
* area flo
* tik_06
* couple missed things
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-31 00:23:13 +09:00
HailSanta
fab07c1c8c
area_dro ( #821 )
...
* dro work
* nok varstash dupes
* p1
* rest
* documentin
* fixes
* imports sorted
* dro_01 cleaned up
* dro done
* kmr_06
* cleanup
* mergin
* warnings
* really fix warnings
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "ebadd64f07"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "ebadd64f07"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* dead map reorg I
* dead reorg II
* dead reorg III
* dead reorg IV
* got a func
* part of area_kmr
* oops
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-10-15 12:04:53 -04:00
HailSanta
7481bed65b
area_arn ( #810 )
...
* area_arn
* iwa
* iwa cleanup
* run coverage
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-09 01:55:27 -04:00
Unnunu
41f5781a1d
tik2/tik3/kzn2/kkj battle maps ( #808 )
...
* area_tik2
* area_tik3
* area_kzn2
* area_kkj
* added area refs
2022-10-08 11:06:15 +01:00
HailSanta
f96542f52a
area_trd ( #807 )
...
* EVT_PLAY_EFFECT
* area_trd data
* forgot a flag name
* fix bobomb spelling
* todo note
* fix macros
* fixed a couple more
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-07 14:45:58 -04:00
HailSanta
43c9a7c91d
sbk map data ( #802 )
...
* jan_00 ok
* whale cleanup
* sbk
* format cleanup
* fixes, revisions, and some trd
* stop warnings
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-06 05:11:24 +09:00
Unnunu
f62c83607e
omo3/pra/dig battle maps ( #799 )
...
* area_pra wip
* temp
* finish area_pra
* omo3 map
* area_dig
* cleaning up
* fixed sprite include
* removed script
2022-10-04 10:10:23 +09:00
HailSanta
cba14cc73d
end/mgm/tst maps ( #798 )
...
* mgm_00
* mgm_03
* mgm_01 OK
* several btl_kzn2
* reflection cleanup
* more maps
* ok for now
* tst_10
* area tst
* pre mgm
* mgm_02 ok
* mgm_02 cleanup
* added IDs
* end_01 almost compiles
* end_01 OK
* end_01 partially done
* end_01 almost done
* end_01 done
* end_00 OK
* credits include cleanup
* end_00 initial cleanup
* new splits 1
* done end_00 cleanup
* areas mgm, end, tst
* whale stuff
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-03 20:56:24 -04:00
HailSanta
7b24d78503
area KZN and others ( #795 )
...
* kzn_01
* cleanup
* kzn_05
* sound name
* missed evt_ptr
* splat change
* broken :(
* pan params for other maps
* works, but not great
* some kzn funcs
* documentin
* minor
* kzn_07 funcs
* more matches
* kzn_08
* kzn_06 fixup
* kzn_01_fix
* kzn 5
* kzn_07
* surprisingly OK
* some matches
* letter choice
* refactor
* more maps
* check
* first area done!
* now with extra bonus map
* kzn23
* some camera stuff
* entrances adjustment
* kzn_22 OK
* kzn_22 cleanup
* kzn_20 ok
* kzn_20 cleanup
* kzn_18 ok
* kzn_18 cleanup
* kgr_01
* area kgr done
* kgr_02 renames
* kzn_11
* kzn_17 ok
* kzn_17 cleanup
* kzn_04 done
* kzn_03 ok
* kzn_19
* bad kzn_19
* funcs idk
* figured a thing out
* kzn_19 ok
* some matches
* kzn_19 cleanup
* all kzn funcs
* merg'd
* some kzn btl matches
* vine field renames
* kzn cleanup 1
* kzn cleanup 2
* tab patrol
* trailing space patrol
* piranha anims split
* actor type sounds
* example
* requests + remove hardcoded dma entries
* split vine image
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-30 21:44:48 -04:00
Ethan Roseman
473bfa0692
dead_sqrtf, data migration, etc ( #790 )
...
* more goods
* move dead map data to dir
* data migration / splatification
* new splat
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "d93b6550c4"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "d93b6550c4"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* splat fix
* dead_sqrtf bye bye
* fix
* Clover comments
* comment
2022-09-29 05:52:12 +09:00
HailSanta
3706178f3a
sprite names ( #782 )
...
* initial variation support
* checkpoint
* pass 1
* second pass
* first few
* more
* change anim < 16 format
* next batch
* goomba anims
* more npcs
* safety
* success
* checkpoint
* last of dro
* a few
* checkpoint
* penguins
* conventions
* flowers A
* Flowers B
* partner animation support
* parter stuff
* id cleanup
* laki
* more laki
* laki done
* sushie
* goompa
* watt + bow
* bombette + parakarry
* goombario
* kooper
* goomba family
* spike jr troopa
* jr troopa
* world partners
* goombas
* lee
* chan
* the master
* toads
* mostly toads
* so many toads
* penguins
* nok npcs
* ch 2+3
* rest of chapters
* parade
* green mario harharhar
* battle bowser
* world bowser
* goomba king
* enough sprites for now
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-24 18:04:13 +09:00
HailSanta
70d3b7b3a8
msg names and more map data prep ( #768 )
...
* minor NPC fixup
* most var type renames
* rest of var names
* remove deprecated
* var types cleanup
* fixed -> float 1
* fixed -> float 2
* fixed -> float 3
* fixed -> float 4
* evt fixed removed
* localvar shorthand
* missing byte names
* missing flag names
* evt var cleanup
* local var shorthand redux
* minor cleanup
* mario anim name
* item ranges cleanup
* player anim names
* all message names
* renames for existing
* remove unused enum
* squash msg ids
* again
* all message refs replaced
* area headers
* idk
* also merged
* remove superfluous parens
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-12 01:23:47 +09:00
HailSanta
c108f11cab
EVT mass renames ( #763 )
...
* mapconfig -> mapsettings
* Map/Area -> MapConfig/AreaConfig
* old EVT names
* kmr names
* game byte names
* EVT_SAVE_FLAG names
* removed EVT_WAIT_FRAMES
* including the to_rename files in case they need to be reused
* more npc AI
* battle and stage names
* fixed enum value
* territory substruct refactor
* refactored enemy drops substruct
* refactor NpcGroupList
* adjusted NPC_GROUP for passive NPCs
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-08 21:12:26 +09:00
HailSanta
0df93d5b2b
prep for map dumping ( #760 )
...
* prep for map dumping
* s p a c i n g
* advanced door + world statics
* sneaky tabs
* more world
* one more
* saved for later
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-06 11:26:53 -04:00
mrshigure
cc2d6996b8
Matching effects and some world/area_kkj functions ( #756 )
...
* Matching effects and some world/area_kkj functions
* Partially addressed PR comments
* Partially addressed PR comments
* Added EVT_FIXED_TO_FLOAT macro
2022-09-05 13:53:21 +09:00
Unnunu
ae64b1b5cc
entities ( #741 )
...
* matched execute_render_tasks
* step_entity_command_list
* partially migrated entity data
* entity blueprints migrated
* matched create_entity
* matched entity functions
* SaveBlock
* SaveBlock and Switch
* switch model done
* matched shattering block functions
* shattering block models
* matched block funcs
* block models
* finish Block.c
* ItemBlock
* HeartBlock
* SuperBlock
* SimpleSpring
* HiddenPanel wip
* HiddenPanel
* Chest
* WoodenCrate
* BlueWarpPipe
* SignPost
* Padlock
* Boarded floor and padlocks
* BombableRock
* Tweester
* StarBoxLauncher
* wip
* ArrowSign
* BellbellPlant
* TrumpetPlant
* munchlesia wip
* Munchlesia
* UnusedBlock
* cleaning
* fix warnings
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "fd9cbc3a1"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fd9cbc3a1"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* PR suggestions
* created vtx splat segments
2022-07-17 17:38:19 +01:00
Ethan Roseman
ec0ae12540
Partner, map, engine funcs ( #736 )
...
* phys_should_player_be_sliding
* functions from brotenko
* UnkTrigFunc001
* trd_05
* IsPartnerXXX funcs
* nok funcs
2022-06-26 11:21:38 +01:00
Unnunu
763b320bfb
b_area_omo2 ( #729 )
2022-06-12 15:44:36 +01:00
HailSanta
a335b73d0a
misc-functions ( #728 )
...
* misc stuff
* ShowEmote
* finish fx_api + replacing sound enum values
* load_path_data
* requested fixes
* vertex data extracted
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-06-11 03:06:12 +09:00
Unnunu
52b9d1b11c
battle camera ( #710 )
...
* match func_80248DE4
* BattleCam_TargetActor
* renamed functions
* Update src/16F740.c
Co-authored-by: alex <16batesa@gmail.com>
Co-authored-by: alex <16batesa@gmail.com>
2022-05-16 15:18:18 -04:00
