-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This should handle creating the new overlay. The files are already split out for easy deduping. With Marble Gallery nearly done, seems to make sense to bring this one in next so it's ready to go ASAP. Some other small tweaks for things I ran into while setting this up, but nothing huge.
- Loading branch information
Showing
32 changed files
with
800 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| options: | ||
| platform: psx | ||
| basename: stno1 | ||
| base_path: .. | ||
| build_path: build/us | ||
| target_path: disks/us/ST/NO1/NO1.BIN | ||
| asm_path: asm/us/st/no1 | ||
| asset_path: assets/st/no1 | ||
| src_path: src/st/no1 | ||
| ld_script_path: build/us/stno1.ld | ||
| compiler: GCC | ||
| symbol_addrs_path: | ||
| - config/symbols.us.txt | ||
| - config/symbols.us.stno1.txt | ||
| undefined_funcs_auto_path: config/undefined_funcs_auto.us.stno1.txt | ||
| undefined_syms_auto_path: config/undefined_syms_auto.us.stno1.txt | ||
| find_file_boundaries: true | ||
| use_legacy_include_asm: false | ||
| migrate_rodata_to_functions: true | ||
| asm_jtbl_label_macro: jlabel | ||
| symbol_name_format: us_$VRAM | ||
| section_order: | ||
| - .data | ||
| - .rodata | ||
| - .text | ||
| - .bss | ||
| - .sbss | ||
| ld_bss_is_noload: false | ||
| disasm_unknown: true | ||
| include_macro_inc: false | ||
| disassemble_all: true | ||
| sha1: 41ccd886308d5527684ae2c41164ecf6c554721f | ||
| segments: | ||
| - name: stno1 | ||
| type: code | ||
| start: 0 | ||
| vram: 0x80180000 | ||
| align: 4 | ||
| subalign: 4 | ||
| subsegments: | ||
| - [0x0, data] | ||
| - [0x34670, .rodata, first_c_file] | ||
| - [0x34670, .rodata, e_red_door] | ||
| - [0x348A8, .rodata, st_common] | ||
| - [0x34930, .rodata, blit_char] | ||
| - [0x34940, .rodata, e_misc] | ||
| - [0x3497C, .rodata, e_axe_knight] | ||
| - [0x34A00, .rodata, e_stage_name] | ||
| - [0x34A34, .rodata, e_skeleton] | ||
| - [0x34A50, .rodata, unk_4DDD8] | ||
| - [0x34CBC, .rodata, prim_helpers] | ||
| - [0x34CC4, c, first_c_file] | ||
| - [0x34E6C, c, e_red_door] | ||
| - [0x419F0, c, st_update] | ||
| - [0x41E24, c, collision] | ||
| - [0x435E0, c, create_entity] | ||
| - [0x44158, c, st_common] | ||
| - [0x46B74, c, blit_char] | ||
| - [0x46E24, c, e_misc] | ||
| - [0x4A314, c, e_axe_knight] | ||
| - [0x4BA30, c, unk_4BA30] | ||
| - [0x4BB24, c, e_stage_name] | ||
| - [0x4C978, c, e_particles] | ||
| - [0x4D1BC, c, e_room_fg] | ||
| - [0x4D2A8, c, popup] | ||
| - [0x4D5D8, c, e_skeleton] | ||
| - [0x4DDD8, c, unk_4DDD8] | ||
| - [0x55AF8, c, prim_helpers] | ||
| - [0x56328, sbss] | ||
| - [0x57064] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| D_80180C88 = 0x80180A58; | ||
| D_80180C94 = 0x80180A64; | ||
| D_80180CA0 = 0x80180A70; | ||
| D_80182424 = 0x80182774; | ||
| D_80182488 = 0x801827D8; | ||
| D_801824B8 = 0x80182808; | ||
| D_801824C0 = 0x80182810; | ||
| EntityIsNearPlayer = 0x801B4E6C; | ||
| NO1_EntityRedDoor = 0x801B4EE4; | ||
| EntityUnkId12 = 0x801B5C64; | ||
| Random = 0x801C19F0; | ||
| Update = 0x801C1A20; | ||
| UpdateStageEntities = 0x801C1D1C; | ||
| HitDetection = 0x801C1E24; | ||
| EntityDamageDisplay = 0x801C2F3C; | ||
| CreateEntityFromLayout = 0x801C35E0; | ||
| CreateEntityWhenInHorizontalRange = 0x801C36A4; | ||
| FindFirstEntityAbove = 0x801C38D4; | ||
| FindFirstEntityBelow = 0x801C3920; | ||
| CreateEntitiesAbove = 0x801C3978; | ||
| CreateEntitiesBelow = 0x801C3A74; | ||
| InitRoomEntities = 0x801C3E3C; | ||
| UpdateRoomPosition = 0x801C3FB4; | ||
| CreateEntityFromCurrentEntity = 0x801C4068; | ||
| CreateEntityFromEntity = 0x801C40DC; | ||
| DestroyEntity = 0x801C4158; | ||
| DestroyEntitiesFromIndex = 0x801C41C4; | ||
| PreventEntityFromRespawning = 0x801C4240; | ||
| AnimateEntity = 0x801C4288; | ||
| UnkAnimFunc = 0x801C4340; | ||
| GetDistanceToPlayerX = 0x801C4458; | ||
| GetDistanceToPlayerY = 0x801C4494; | ||
| GetSideToPlayer = 0x801C44C8; | ||
| MoveEntity = 0x801C450C; | ||
| FallEntity = 0x801C453C; | ||
| UnkCollisionFunc3 = 0x801C4568; | ||
| UnkCollisionFunc2 = 0x801C47E0; | ||
| AllocEntity = 0x801C49C8; | ||
| GetSineScaled = 0x801C4A28; | ||
| GetSine = 0x801C4A54; | ||
| SetEntityVelocityFromAngle = 0x801C4A70; | ||
| Ratan2Shifted = 0x801C4ADC; | ||
| GetAngleBetweenEntitiesShifted = 0x801C4B14; | ||
| GetAnglePointToEntity = 0x801C4B5C; | ||
| AdjustValueWithinThreshold = 0x801C4BA4; | ||
| UnkEntityFunc0 = 0x801C4BFC; | ||
| Ratan2 = 0x801C4C88; | ||
| GetAngleBetweenEntities = 0x801C4CB8; | ||
| GetNormalizedAngle = 0x801C4D38; | ||
| SetStep = 0x801C4D98; | ||
| SetSubStep = 0x801C4DB8; | ||
| EntityExplosionSpawn = 0x801C4DD4; | ||
| InitializeEntity = 0x801C4E68; | ||
| EntityDummy = 0x801C4F64; | ||
| UnkCollisionFunc = 0x801C4F8C; | ||
| CheckFieldCollision = 0x801C50B4; | ||
| GetPlayerCollisionWith = 0x801C520C; | ||
| ReplaceBreakableWithItemDrop = 0x801C5550; | ||
| PrizeDropFall = 0x801C5608; | ||
| PrizeDropFall2 = 0x801C568C; | ||
| CollectHeart = 0x801C57E8; | ||
| CollectGold = 0x801C5868; | ||
| CollectSubweapon = 0x801C5944; | ||
| CollectHeartVessel = 0x801C5A5C; | ||
| CollectLifeVessel = 0x801C5B00; | ||
| DestroyCurrentEntity = 0x801C5B50; | ||
| EntityPrizeDrop = 0x801C5B78; | ||
| EntityExplosion = 0x801C63EC; | ||
| BlinkItem = 0x801C64E8; | ||
| EntityEquipItemDrop = 0x801C658C; | ||
| BlitChar = 0x801C6B74; | ||
| EntityRelicOrb = 0x801C6E24; | ||
| EntityHeartDrop = 0x801C78F4; | ||
| EntityMessageBox = 0x801C7A1C; | ||
| CheckColliderOffsets = 0x801C7F78; | ||
| EntityUnkId13 = 0x801C8068; | ||
| EntityExplosionVariantsSpawner = 0x801C8178; | ||
| EntityGreyPuffSpawner = 0x801C82A8; | ||
| EntityExplosionVariants = 0x801C8390; | ||
| EntityGreyPuff = 0x801C8480; | ||
| EntityOlroxDrool = 0x801C8574; | ||
| UnkCollisionFunc5 = 0x801C87A4; | ||
| UnkCollisionFunc4 = 0x801C88A0; | ||
| EntityIntenseExplosion = 0x801C8E20; | ||
| InitializeUnkEntity = 0x801C8F20; | ||
| MakeEntityFromId = 0x801C8FEC; | ||
| MakeExplosions = 0x801C90B4; | ||
| EntityBigRedFireball = 0x801C916C; | ||
| UnkRecursivePrimFunc1 = 0x801C9344; | ||
| UnkRecursivePrimFunc2 = 0x801C9924; | ||
| ClutLerp = 0x801CA024; | ||
| PlaySfxPositional = 0x801CA21C; | ||
| AxeKnightUnkFunc1 = 0x801CA314; | ||
| EntityAxeKnightRotateAxe = 0x801CB848; | ||
| EntityAxeKnightThrowingAxe = 0x801CB8A0; | ||
| StageNamePopupHelper = 0x801CBB24; | ||
| EntityStageNamePopup = 0x801CBCF4; | ||
| EntitySoulStealOrb = 0x801CC978; | ||
| EntityEnemyBlood = 0x801CCD0C; | ||
| EntityRoomForeground = 0x801CD1BC; | ||
| BottomCornerText = 0x801CD2A8; | ||
| SkeletonAttackCheck = 0x801CD5D8; | ||
| EntitySkeleton = 0x801CD670; | ||
| EntitySkeletonPieces = 0x801CDB40; | ||
| EntitySkeletonThrownBone = 0x801CDC20; | ||
| UnusedSkeletonEntity = 0x801CDD24; | ||
| UnkPrimHelper = 0x801D5AF8; | ||
| UpdateAnimation = 0x801D5EE0; | ||
| FindFirstUnkPrim = 0x801D6030; | ||
| FindFirstUnkPrim2 = 0x801D6060; | ||
| PrimToggleVisibility = 0x801D60DC; | ||
| PrimResetNext = 0x801D6164; | ||
| UnkPolyFunc2 = 0x801D6244; | ||
| UnkPolyFunc0 = 0x801D6298; | ||
| PrimDecreaseBrightness = 0x801D62C4; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/blit_char", BlitChar); | ||
|
|
||
| INCLUDE_RODATA("st/no1/nonmatchings/blit_char", D_us_801B4930); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/collision", HitDetection); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/collision", EntityDamageDisplay); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", CreateEntityFromLayout); | ||
|
|
||
| INCLUDE_ASM( | ||
| "st/no1/nonmatchings/create_entity", CreateEntityWhenInHorizontalRange); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", func_us_801C37BC); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", FindFirstEntityAbove); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", FindFirstEntityBelow); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", CreateEntitiesAbove); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", CreateEntitiesBelow); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", func_us_801C3B88); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", func_us_801C3BD4); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", func_us_801C3C2C); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", func_us_801C3D28); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", InitRoomEntities); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", UpdateRoomPosition); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", CreateEntityFromCurrentEntity); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/create_entity", CreateEntityFromEntity); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-or-later | ||
| #include "common.h" | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/e_axe_knight", AxeKnightUnkFunc1); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/e_axe_knight", func_us_801CA51C); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/e_axe_knight", func_us_801CAD20); | ||
|
|
||
| INCLUDE_RODATA("st/no1/nonmatchings/e_axe_knight", D_us_801B49D0); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/e_axe_knight", func_us_801CAE04); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/e_axe_knight", EntityAxeKnightRotateAxe); | ||
|
|
||
| INCLUDE_ASM("st/no1/nonmatchings/e_axe_knight", EntityAxeKnightThrowingAxe); |
Oops, something went wrong.