diff options
| author | KiritoDv <kiritodev01@gmail.com> | 2024-05-20 16:25:45 -0600 |
|---|---|---|
| committer | Sonic Dreamcaster <alejandro.asenjo88@gmail.com> | 2024-09-17 20:16:46 -0300 |
| commit | 7c801d33d995869cbba2d0127919128489ae7d2a (patch) | |
| tree | a7220a77f2fccbfada34a014731eef21853c7596 /assets/yaml | |
| parent | 6248c70be1dd61b87ce9a5a9a65f3666f814a47c (diff) | |
Repo upstreamed
Diffstat (limited to 'assets/yaml')
| -rw-r--r-- | assets/yaml/jp/rev0/ast_A_ti.yaml | 4 | ||||
| -rw-r--r-- | assets/yaml/jp/rev0/ast_fortuna.yaml | 2 | ||||
| -rw-r--r-- | assets/yaml/jp/rev0/ast_venom_1.yaml | 2 | ||||
| -rw-r--r-- | assets/yaml/jp/rev0/ast_venom_2.yaml | 2 | ||||
| -rw-r--r-- | assets/yaml/us/rev1/ast_A_ti.yaml | 11 |
5 files changed, 18 insertions, 3 deletions
diff --git a/assets/yaml/jp/rev0/ast_A_ti.yaml b/assets/yaml/jp/rev0/ast_A_ti.yaml index c02dc4e5..6b7e738c 100644 --- a/assets/yaml/jp/rev0/ast_A_ti.yaml +++ b/assets/yaml/jp/rev0/ast_A_ti.yaml @@ -7,7 +7,11 @@ header: - '#include "gfx.h"' - '#include "sf64object.h"' +<<<<<<<< HEAD:assets/yaml/jp/rev0/ast_A_ti.yaml +======== + +>>>>>>>> 6fe91928 (Repo upstreamed):assets/yaml/us/rev1/ast_A_ti.yaml D_TI_A000000: {type: GFX, offset: 0xA000000, symbol: D_TI_A000000} diff --git a/assets/yaml/jp/rev0/ast_fortuna.yaml b/assets/yaml/jp/rev0/ast_fortuna.yaml index 06b71044..58d328ec 100644 --- a/assets/yaml/jp/rev0/ast_fortuna.yaml +++ b/assets/yaml/jp/rev0/ast_fortuna.yaml @@ -180,4 +180,4 @@ aFoMountain3Hitbox: { type: SF64:HITBOX, offset: 0x600FFC0, symbol: aFoMountain3Hitbox } aFoBaseHitbox: - { type: SF64:HITBOX, offset: 0x600FFE0, symbol: aFoBaseHitbox }
\ No newline at end of file + { type: SF64:HITBOX, offset: 0x600FFE0, symbol: aFoBaseHitbox } diff --git a/assets/yaml/jp/rev0/ast_venom_1.yaml b/assets/yaml/jp/rev0/ast_venom_1.yaml index 80b6e931..037c49bd 100644 --- a/assets/yaml/jp/rev0/ast_venom_1.yaml +++ b/assets/yaml/jp/rev0/ast_venom_1.yaml @@ -179,4 +179,4 @@ aVe1MonkeyStatueHitbox: { type: SF64:HITBOX, offset: 0x601B8D8, symbol: aVe1MonkeyStatueHitbox } aVe1EnemyGateHitbox: - { type: SF64:HITBOX, offset: 0x601B944, symbol: aVe1EnemyGateHitbox }
\ No newline at end of file + { type: SF64:HITBOX, offset: 0x601B944, symbol: aVe1EnemyGateHitbox } diff --git a/assets/yaml/jp/rev0/ast_venom_2.yaml b/assets/yaml/jp/rev0/ast_venom_2.yaml index 41871152..cb200957 100644 --- a/assets/yaml/jp/rev0/ast_venom_2.yaml +++ b/assets/yaml/jp/rev0/ast_venom_2.yaml @@ -202,4 +202,4 @@ aVe2BaseHitbox: { type: SF64:HITBOX, offset: 0x60166F4, symbol: aVe2BaseHitbox } aVe2MountainHitbox: - { type: SF64:HITBOX, offset: 0x6016714, symbol: aVe2MountainHitbox }
\ No newline at end of file + { type: SF64:HITBOX, offset: 0x6016714, symbol: aVe2MountainHitbox } diff --git a/assets/yaml/us/rev1/ast_A_ti.yaml b/assets/yaml/us/rev1/ast_A_ti.yaml index 02d77b7f..67ad7809 100644 --- a/assets/yaml/us/rev1/ast_A_ti.yaml +++ b/assets/yaml/us/rev1/ast_A_ti.yaml @@ -10,11 +10,19 @@ header: - '#include "gfx.h"' - '#include "sf64object.h"' +<<<<<<< HEAD external_files: - "assets/yaml/us/rev1/ast_7_ti_2.yaml" - "assets/yaml/us/rev1/ast_8_ti.yaml" - "assets/yaml/us/rev1/ast_9_ti.yaml" +======= +<<<<<<<< HEAD:assets/yaml/jp/rev0/ast_A_ti.yaml + +======== + +>>>>>>>> 6fe91928 (Repo upstreamed):assets/yaml/us/rev1/ast_A_ti.yaml +>>>>>>> 6fe91928 (Repo upstreamed) D_TI_A000000: {type: GFX, offset: 0xA000000, symbol: D_TI_A000000} @@ -65,4 +73,7 @@ D_TI_A002170: D_TI_A009990: {type: SF64:ANIM, offset: 0xA009990, symbol: D_TI_A009990} +<<<<<<< HEAD +======= +>>>>>>> 6fe91928 (Repo upstreamed) |