Skip to content

Commit

Permalink
Merge pull request mint-choc-chip-skyblade#435 from gymnast86/trial-o…
Browse files Browse the repository at this point in the history 
…bjects

Trial Object Shuffle and Trial Treasuresanity
  • Loading branch information
@CovenEsme
CovenEsme authored Dec 24, 2024
2 parents 90878b6 + 014f00e commit d0b5952
Show file tree
Hide file tree
Showing 27 changed files with 2,284 additions and 1,354 deletions.
3 changes: 3 additions & 0 deletions asm/additions/additions-landingpad.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ b.eq load_additional_sfx
cmp w8, #67
b.eq assign_item_textbox_collection_sfx

cmp w8, #68
b.eq get_silent_realm_item_glow_color

ret ; this should never be reached

; ends at 0x712e0a7000
40 changes: 20 additions & 20 deletions asm/additions/diffs/additions-landingpad-diff.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
0x712E0A5500: [0x1F, 0x01, 0x00, 0x71, 0x40, 0xD3, 0x03, 0x54, 0x1F, 0x05, 0x00, 0x71,
0xA0, 0x7F, 0x00, 0x54, 0x1F, 0x09, 0x00, 0x71, 0xA0, 0x90, 0x01, 0x54, 0x1F, 0x0D,
0x00, 0x71, 0x60, 0x65, 0x01, 0x54, 0x1F, 0x11, 0x00, 0x71, 0xE0, 0xFD, 0x03, 0x54,
0x1F, 0x15, 0x00, 0x71, 0x60, 0x78, 0x05, 0x54, 0x1F, 0x19, 0x00, 0x71, 0x60, 0x03,
0x05, 0x54, 0x1F, 0x1D, 0x00, 0x71, 0x40, 0x34, 0x05, 0x54, 0x1F, 0x21, 0x00, 0x71,
0x1F, 0x15, 0x00, 0x71, 0x60, 0x7D, 0x05, 0x54, 0x1F, 0x19, 0x00, 0x71, 0x60, 0x08,
0x05, 0x54, 0x1F, 0x1D, 0x00, 0x71, 0x40, 0x39, 0x05, 0x54, 0x1F, 0x21, 0x00, 0x71,
0xA0, 0x79, 0x01, 0x54, 0x1F, 0x25, 0x00, 0x71, 0x40, 0x6E, 0x01, 0x54, 0x1F, 0x29,
0x00, 0x71, 0x80, 0x68, 0x01, 0x54, 0x1F, 0x2D, 0x00, 0x71, 0x20, 0x45, 0x05, 0x54,
0x00, 0x71, 0x80, 0x68, 0x01, 0x54, 0x1F, 0x2D, 0x00, 0x71, 0x20, 0x4A, 0x05, 0x54,
0x1F, 0x31, 0x00, 0x71, 0x80, 0x60, 0x04, 0x54, 0x1F, 0x35, 0x00, 0x71, 0xA0, 0xC6,
0x03, 0x54, 0x1F, 0x39, 0x00, 0x71, 0xC0, 0xFB, 0x00, 0x54, 0x1F, 0x3D, 0x00, 0x71,
0x00, 0x0F, 0x01, 0x54, 0x1F, 0x41, 0x00, 0x71, 0x40, 0x6E, 0x05, 0x54, 0x1F, 0x45,
0x00, 0x71, 0xC0, 0x32, 0x04, 0x54, 0x1F, 0x49, 0x00, 0x71, 0xE0, 0x7C, 0x05, 0x54,
0x1F, 0x4D, 0x00, 0x71, 0xA0, 0x7D, 0x05, 0x54, 0x1F, 0x51, 0x00, 0x71, 0x40, 0x65,
0x05, 0x54, 0x1F, 0x55, 0x00, 0x71, 0x20, 0x34, 0x05, 0x54, 0x1F, 0x59, 0x00, 0x71,
0x00, 0x83, 0x05, 0x54, 0x1F, 0x5D, 0x00, 0x71, 0x80, 0xDD, 0x03, 0x54, 0x1F, 0x61,
0x00, 0x0F, 0x01, 0x54, 0x1F, 0x41, 0x00, 0x71, 0x40, 0x73, 0x05, 0x54, 0x1F, 0x45,
0x00, 0x71, 0xC0, 0x32, 0x04, 0x54, 0x1F, 0x49, 0x00, 0x71, 0xE0, 0x81, 0x05, 0x54,
0x1F, 0x4D, 0x00, 0x71, 0xA0, 0x82, 0x05, 0x54, 0x1F, 0x51, 0x00, 0x71, 0x40, 0x6A,
0x05, 0x54, 0x1F, 0x55, 0x00, 0x71, 0x20, 0x39, 0x05, 0x54, 0x1F, 0x59, 0x00, 0x71,
0x00, 0x88, 0x05, 0x54, 0x1F, 0x5D, 0x00, 0x71, 0x80, 0xDD, 0x03, 0x54, 0x1F, 0x61,
0x00, 0x71, 0xE0, 0x22, 0x02, 0x54, 0x1F, 0x65, 0x00, 0x71, 0x80, 0x26, 0x02, 0x54,
0x1F, 0x69, 0x00, 0x71, 0xA0, 0x23, 0x02, 0x54, 0x1F, 0x6D, 0x00, 0x71, 0x20, 0x17,
0x02, 0x54, 0x1F, 0x71, 0x00, 0x71, 0x00, 0xD0, 0x01, 0x54, 0x1F, 0x75, 0x00, 0x71,
0x60, 0x38, 0x04, 0x54, 0x1F, 0x79, 0x00, 0x71, 0x00, 0xE8, 0x00, 0x54, 0x1F, 0x7D,
0x00, 0x71, 0xE0, 0x8A, 0x05, 0x54, 0x1F, 0x81, 0x00, 0x71, 0xA0, 0x67, 0x04, 0x54,
0x1F, 0x85, 0x00, 0x71, 0x20, 0x6E, 0x05, 0x54, 0x1F, 0x89, 0x00, 0x71, 0x40, 0xA9,
0x00, 0x71, 0xE0, 0x8F, 0x05, 0x54, 0x1F, 0x81, 0x00, 0x71, 0xA0, 0x67, 0x04, 0x54,
0x1F, 0x85, 0x00, 0x71, 0x20, 0x73, 0x05, 0x54, 0x1F, 0x89, 0x00, 0x71, 0x40, 0xA9,
0x03, 0x54, 0x1F, 0x8D, 0x00, 0x71, 0x60, 0xAD, 0x03, 0x54, 0x1F, 0x91, 0x00, 0x71,
0x20, 0xBE, 0x03, 0x54, 0x1F, 0x95, 0x00, 0x71, 0xA0, 0xF1, 0x00, 0x54, 0x1F, 0x99,
0x00, 0x71, 0x20, 0xF3, 0x00, 0x54, 0x1F, 0x9D, 0x00, 0x71, 0x80, 0xC3, 0x01, 0x54,
0x1F, 0xA1, 0x00, 0x71, 0xC0, 0x89, 0x05, 0x54, 0x1F, 0xA5, 0x00, 0x71, 0xA0, 0x76,
0x1F, 0xA1, 0x00, 0x71, 0xC0, 0x8E, 0x05, 0x54, 0x1F, 0xA5, 0x00, 0x71, 0xA0, 0x76,
0x01, 0x54, 0x1F, 0xA9, 0x00, 0x71, 0x80, 0xC9, 0x01, 0x54, 0x1F, 0xAD, 0x00, 0x71,
0x80, 0x3B, 0x04, 0x54, 0x1F, 0xB1, 0x00, 0x71, 0x60, 0x57, 0x04, 0x54, 0x1F, 0xB5,
0x00, 0x71, 0x40, 0x93, 0x04, 0x54, 0x1F, 0xB9, 0x00, 0x71, 0xE0, 0xD1, 0x04, 0x54,
0x1F, 0xBD, 0x00, 0x71, 0xA0, 0xDA, 0x04, 0x54, 0x1F, 0xC1, 0x00, 0x71, 0xA0, 0xE2,
0x04, 0x54, 0x1F, 0xC5, 0x00, 0x71, 0xC0, 0xD1, 0x05, 0x54, 0x1F, 0xC9, 0x00, 0x71,
0x80, 0xE3, 0x05, 0x54, 0x1F, 0xCD, 0x00, 0x71, 0x20, 0x22, 0x02, 0x54, 0x1F, 0xD1,
0x04, 0x54, 0x1F, 0xC5, 0x00, 0x71, 0xC0, 0xD6, 0x05, 0x54, 0x1F, 0xC9, 0x00, 0x71,
0x80, 0xE8, 0x05, 0x54, 0x1F, 0xCD, 0x00, 0x71, 0x20, 0x22, 0x02, 0x54, 0x1F, 0xD1,
0x00, 0x71, 0xE0, 0x22, 0x02, 0x54, 0x1F, 0xD5, 0x00, 0x71, 0xE0, 0x23, 0x02, 0x54,
0x1F, 0xD9, 0x00, 0x71, 0x60, 0x06, 0x01, 0x54, 0x1F, 0xDD, 0x00, 0x71, 0xA0, 0x58,
0x04, 0x54, 0x1F, 0xE1, 0x00, 0x71, 0x60, 0x43, 0x05, 0x54, 0x1F, 0xE5, 0x00, 0x71,
0xC0, 0x4A, 0x05, 0x54, 0x1F, 0xE9, 0x00, 0x71, 0xA0, 0x3C, 0x05, 0x54, 0x1F, 0xED,
0x00, 0x71, 0x20, 0x5A, 0x04, 0x54, 0x1F, 0xF1, 0x00, 0x71, 0x00, 0xB3, 0x05, 0x54,
0x04, 0x54, 0x1F, 0xE1, 0x00, 0x71, 0x60, 0x48, 0x05, 0x54, 0x1F, 0xE5, 0x00, 0x71,
0xC0, 0x4F, 0x05, 0x54, 0x1F, 0xE9, 0x00, 0x71, 0xA0, 0x41, 0x05, 0x54, 0x1F, 0xED,
0x00, 0x71, 0x20, 0x5A, 0x04, 0x54, 0x1F, 0xF1, 0x00, 0x71, 0x00, 0xB8, 0x05, 0x54,
0x1F, 0xF5, 0x00, 0x71, 0x00, 0xEF, 0x04, 0x54, 0x1F, 0xF9, 0x00, 0x71, 0xA0, 0xF1,
0x04, 0x54, 0x1F, 0xFD, 0x00, 0x71, 0x60, 0xB9, 0x05, 0x54, 0x1F, 0x01, 0x01, 0x71,
0x40, 0xC0, 0x05, 0x54, 0x1F, 0x05, 0x01, 0x71, 0x20, 0xB5, 0x01, 0x54, 0x1F, 0x09,
0x01, 0x71, 0x00, 0xE7, 0x05, 0x54, 0x1F, 0x0D, 0x01, 0x71, 0x00, 0xF6, 0x05, 0x54,
0xC0, 0x03, 0x5F, 0xD6]
0x04, 0x54, 0x1F, 0xFD, 0x00, 0x71, 0x60, 0xBE, 0x05, 0x54, 0x1F, 0x01, 0x01, 0x71,
0x40, 0xC5, 0x05, 0x54, 0x1F, 0x05, 0x01, 0x71, 0x20, 0xB5, 0x01, 0x54, 0x1F, 0x09,
0x01, 0x71, 0x00, 0xEC, 0x05, 0x54, 0x1F, 0x0D, 0x01, 0x71, 0x00, 0xFB, 0x05, 0x54,
0x1F, 0x11, 0x01, 0x71, 0xE0, 0xF3, 0x04, 0x54, 0xC0, 0x03, 0x5F, 0xD6]
Loading

0 comments on commit d0b5952

Please sign in to comment.