Young Link Fixes, Doc Improvement,s Moveset

JSsixtyfour · Jan 9, 2020 · 5699e18 · 5699e18
1 parent 176d21b
commit 5699e18
Show file tree

Hide file tree

Showing 14 changed files with 119 additions and 4 deletions.
diff --git a/original.xdelta b/original.xdelta
diff --git a/roms/reqlist.txt b/roms/reqlist.txt
@@ -0,0 +1,112 @@
+00E0 Link Move Set
+0161 Link Up/Down Special Graphic
+08B2 Young Link Boomerang Hitbox
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+0161 Link Up/Down Special Graphic
+0161 Link Up/Down Special Graphic
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+0146 Link Boomerang Model
+0146 Link Boomerang Model
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+08B3 Young Link Character
+0147 Link Shield Pose
+0147 Link Shield Pose
+0147 Link Shield Pose
+0147 Link Shield Pose
+0147 Link Shield Pose
+0147 Link Shield Pose
+0147 Link Shield Pose
+0147 Link Shield Pose
+0147 Link Shield Pose
+END OF REQ LIST
diff --git a/src/Character.asm b/src/Character.asm
@@ -1957,7 +1957,7 @@ scope Character {
     // 0x1E - GND
     define_character(GND, CAPTAIN, File.GND_MAIN, 0x0EB, 0, File.GND_CHARACTER, 0x14E, 0, File.GND_ENTRY_KICK, File.GND_PUNCH_GRAPHIC, 0, 0x488, 0x0, OS.TRUE, Stages.id.BTT_FALCON, Stages.id.BTP_FALCON, sound_type.U)
     // 0x1F - YLINK
-    define_character(YLINK, LINK, File.YLINK_MAIN, 0x0E0, 0, File.YLINK_CHARACTER, 0x147, File.YLINK_BOOMERANG_HITBOX, 0x161, 0x145, 0, 0x760, 0, OS.TRUE, Stages.id.BTT_LINK, Stages.id.BTP_LINK, sound_type.U)
+    define_character(YLINK, LINK, File.YLINK_MAIN, 0x0E0, 0, File.YLINK_CHARACTER, 0x147, File.YLINK_BOOMERANG_HITBOX, 0x161, 0x145, 0, 0x6C0, 0, OS.TRUE, Stages.id.BTT_LINK, Stages.id.BTP_LINK, sound_type.U)
     // 0x20 - DRM
     define_character(DRM, MARIO, File.DRM_MAIN, 0x0CA, 0, File.DRM_CHARACTER, 0x12A, File.DRM_PROJECTILE_DATA, 0x164, File.DRM_PROJECTILE_GRAPHIC, 0, 0x454, 0x0, OS.TRUE, Stages.id.BTT_MARIO, Stages.id.BTP_MARIO, sound_type.U)
     // 0x21 - WARIO

diff --git a/src/CharacterSelect.asm b/src/CharacterSelect.asm
@@ -175,7 +175,7 @@ scope CharacterSelect {
     dw  0                                   // 0x1C - PLACEHOLDER
     dw  0x8810                              // 0x1D - FALCO
     dw  0x19270                             // 0x1E - GND
-    dw  0x140D0                             // 0x1F - YLINK
+    dw  0x174B0                             // 0x1F - YLINK
     dw  0x7B50                              // 0x20 - DRM
     dw  0x8A70                              // 0x21 - WARIO
     dw  0x121D0                             // 0x22 - DARK SAMUS

diff --git a/src/DrMario/Moveset/BACK_AERIAL.bin b/src/DrMario/Moveset/BACK_AERIAL.bin
diff --git a/src/DrMario/Moveset/DOWN_TILT.bin b/src/DrMario/Moveset/DOWN_TILT.bin
diff --git a/src/DrMario/Moveset/FORWARD_AERIAL.bin b/src/DrMario/Moveset/FORWARD_AERIAL.bin
diff --git a/src/DrMario/Moveset/NEUTRAL_SPECIAL_AIR.bin b/src/DrMario/Moveset/NEUTRAL_SPECIAL_AIR.bin
diff --git a/src/DrMario/Moveset/NEUTRAL_SPECIAL_GROUND.bin b/src/DrMario/Moveset/NEUTRAL_SPECIAL_GROUND.bin
diff --git a/src/DrMario/Moveset/UP_AERIAL.bin b/src/DrMario/Moveset/UP_AERIAL.bin
diff --git a/src/Falco/Falco.asm b/src/Falco/Falco.asm
@@ -44,8 +44,10 @@ scope Falco {
     insert USP_AIR_MOVE,"moveset/UP_SPECIAL_AIR_MOVE.bin" ; Moveset.GO_TO(USP_LOOP)
     insert DSP_GROUND_START,"moveset/DOWN_SPECIAL_GROUND_START.bin"
     insert DSP_AIR_START,"moveset/DOWN_SPECIAL_AIR_START.bin"
+    insert VICTORY_POSE_1,"moveset/VICTORY_POSE_1.bin"
     insert VICTORY_POSE_2,"moveset/VICTORY_POSE_2.bin"
     insert VICTORY_POSE_3,"moveset/VICTORY_POSE_3.bin"
+    insert CLAP, "moveset/CLAP.bin"
 
     // Modify Action Parameters             // Action               // Animation                // Moveset Data             // Flags
     Character.edit_action_parameters(FALCO, Action.Run,              -1,                        RUN,                        -1)
@@ -91,10 +93,11 @@ scope Falco {
     Character.edit_action(FALCO, 0xE2,              -1,             0x8015C750,                 Phantasm.air_subroutine_,       Phantasm.air_physics_,          0x80156358)
 
     // Modify Menu Action Parameters             // Action          // Animation                // Moveset Data             // Flags
+    Character.edit_menu_action_parameters(FALCO, 0x1,               -1,                         VICTORY_POSE_1,                       -1)
     Character.edit_menu_action_parameters(FALCO, 0x2,               -1,                         VICTORY_POSE_2,             -1)
     Character.edit_menu_action_parameters(FALCO, 0x3,               -1,                         VICTORY_POSE_3,             -1)
     Character.edit_menu_action_parameters(FALCO, 0x4,               -1,                         VICTORY_POSE_3,             -1)
-    Character.edit_menu_action_parameters(FALCO, 0x5,               0x174,                      VICTORY_POSE_3,             -1)
+    Character.edit_menu_action_parameters(FALCO, 0x5,               0x174,                      CLAP,                       -1)
 
     // Set menu zoom size.
     Character.table_patch_start(menu_zoom, Character.id.FALCO, 0x4)

diff --git a/src/Falco/Moveset/CLAP.bin b/src/Falco/Moveset/CLAP.bin
diff --git a/src/Falco/Moveset/VICTORY_POSE_1.bin b/src/Falco/Moveset/VICTORY_POSE_1.bin
diff --git a/src/Req/YLINK_MODEL.req b/src/Req/YLINK_MODEL.req
@@ -1 +1 @@
-�����������������������������������������������������������������������������������������������������������������������������������
+�����������������������������������������������������������������������������������������������������������������������