Merge branch 'Rainchus:main' into main

This commit is contained in:
CreateSource 2024-07-27 12:48:34 -04:00 committed by GitHub
commit ebef402160
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4973 additions and 82 deletions

View file

@ -260,28 +260,29 @@ lbl_1_data_73CC = .data:0x000073CC; // type:object size:0x28
lbl_1_data_73F4 = .data:0x000073F4; // type:object size:0x28
lbl_1_data_741C = .data:0x0000741C; // type:object size:0x70 data:float
lbl_1_data_748C = .data:0x0000748C; // type:object size:0x140
lbl_1_data_75CC = .data:0x000075CC; // type:object size:0x14
lbl_1_data_75CC = .data:0x000075CC; // type:object size:0x14 data:float
lbl_1_data_75E0 = .data:0x000075E0; // type:object size:0x10 data:4byte
lbl_1_data_75F0 = .data:0x000075F0; // type:object size:0xC data:float
lbl_1_data_75FC = .data:0x000075FC; // type:object size:0xC data:float
lbl_1_data_7608 = .data:0x00007608; // type:object size:0x4
lbl_1_data_760C = .data:0x0000760C; // type:object size:0xC
lbl_1_data_7618 = .data:0x00007618; // type:object size:0xC
lbl_1_data_7624 = .data:0x00007624; // type:object size:0x24
lbl_1_data_760C = .data:0x0000760C; // type:object size:0xC data:float
lbl_1_data_7618 = .data:0x00007618; // type:object size:0xC data:float
lbl_1_data_7624 = .data:0x00007624; // type:object size:0x23 data:string
lbl_1_data_7648 = .data:0x00007648; // type:object size:0x4 data:4byte
lbl_1_data_764C = .data:0x0000764C; // type:object size:0x4 data:4byte
jumptable_1_data_7650 = .data:0x00007650; // type:object size:0x28 scope:local
lbl_1_data_7678 = .data:0x00007678; // type:object size:0x1C data:string
lbl_1_data_7694 = .data:0x00007694; // type:object size:0x1C
lbl_1_data_76B0 = .data:0x000076B0; // type:object size:0x58
lbl_1_data_7708 = .data:0x00007708; // type:object size:0x30
lbl_1_data_7738 = .data:0x00007738; // type:object size:0x5C
lbl_1_data_76B0 = .data:0x000076B0; // type:object size:0x58 data:float
lbl_1_data_7708 = .data:0x00007708; // type:object size:0x30 data:float
lbl_1_data_7738 = .data:0x00007738; // type:object size:0x3C data:2byte
lbl_1_data_7774 = .data:0x00007774; // type:object size:0x20 data:4byte
lbl_1_data_7794 = .data:0x00007794; // type:object size:0x4
lbl_1_data_7798 = .data:0x00007798; // type:object size:0x4 data:4byte
lbl_1_data_779C = .data:0x0000779C; // type:object size:0x4 data:4byte
lbl_1_data_77A0 = .data:0x000077A0; // type:object size:0x28
lbl_1_data_77C8 = .data:0x000077C8; // type:object size:0x70
lbl_1_data_7838 = .data:0x00007838; // type:object size:0x1C
lbl_1_data_77C8 = .data:0x000077C8; // type:object size:0x70 data:float
lbl_1_data_7838 = .data:0x00007838; // type:object size:0x1C data:2byte
lbl_1_data_7854 = .data:0x00007854; // type:object size:0x6 data:string
lbl_1_data_785A = .data:0x0000785A; // type:object size:0x6 data:string
lbl_1_data_7860 = .data:0x00007860; // type:object size:0x8 data:string
@ -295,7 +296,7 @@ lbl_1_data_788E = .data:0x0000788E; // type:object size:0x6 data:string
lbl_1_data_7894 = .data:0x00007894; // type:object size:0x6 data:string
lbl_1_data_789A = .data:0x0000789A; // type:object size:0x6 data:string
lbl_1_data_78A0 = .data:0x000078A0; // type:object size:0x20
lbl_1_data_78C0 = .data:0x000078C0; // type:object size:0x30
lbl_1_data_78C0 = .data:0x000078C0; // type:object size:0x30 data:float
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte
lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x4 data:4byte
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x20
@ -319,7 +320,8 @@ lbl_1_bss_144 = .bss:0x00000144; // type:object size:0x4 data:4byte
lbl_1_bss_148 = .bss:0x00000148; // type:object size:0x4 data:4byte
lbl_1_bss_14C = .bss:0x0000014C; // type:object size:0x4 data:4byte
lbl_1_bss_150 = .bss:0x00000150; // type:object size:0x10 data:4byte
lbl_1_bss_160 = .bss:0x00000160; // type:object size:0x8 data:4byte
lbl_1_bss_160 = .bss:0x00000160; // type:object size:0x4 data:4byte
lbl_1_bss_164 = .bss:0x00000164; // type:object size:0x4 data:4byte
lbl_1_bss_168 = .bss:0x00000168; // type:object size:0x4 data:4byte
lbl_1_bss_16C = .bss:0x0000016C; // type:object size:0x4 data:4byte
lbl_1_bss_170 = .bss:0x00000170; // type:object size:0x4 data:4byte

View file

@ -822,7 +822,7 @@ config.libs = [
},
),
Rel(
"m401Dll", #Manta Rings
"m401Dll", # Manta Rings
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m401Dll/main.c"),
@ -830,13 +830,13 @@ config.libs = [
},
),
Rel(
"m402Dll", #Slime Time
"m402Dll", # Slime Time
objects={
Object(Matching, "REL/m402Dll/main.c"),
},
),
Rel(
"m403Dll", #Booksquirm
"m403Dll", # Booksquirm
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m403Dll/main.c"),
@ -844,20 +844,20 @@ config.libs = [
},
),
Rel(
"m404Dll", #Trace Race
"m404Dll", # Trace Race
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m404Dll/main.c"),
},
),
Rel(
"m405Dll", #Mario Medley
"m405Dll", # Mario Medley
objects={
Object(Matching, "REL/m405Dll/main.c"),
},
),
Rel(
"m406Dll", #Avalanche!
"m406Dll", # Avalanche!
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m406Dll/main.c"),
@ -866,7 +866,7 @@ config.libs = [
},
),
Rel(
"m407dll", #Domination
"m407dll", # Domination
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m407dll/player.c"),
@ -880,7 +880,7 @@ config.libs = [
},
),
Rel(
"m408Dll", #Paratrooper Plunge
"m408Dll", # Paratrooper Plunge
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m408Dll/main.c"),
@ -890,7 +890,7 @@ config.libs = [
},
),
Rel(
"m409Dll", #Toad's Quick Draw
"m409Dll", # Toad's Quick Draw
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m409Dll/main.c"),
@ -899,7 +899,7 @@ config.libs = [
},
),
Rel(
"m410Dll", #Three Throw
"m410Dll", # Three Throw
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m410Dll/main.c"),
@ -909,35 +909,35 @@ config.libs = [
},
),
Rel(
"m411Dll", #Photo Finish
"m411Dll", # Photo Finish
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m411Dll/main.c"),
},
),
Rel(
"m412Dll", #Mr. Blizzard's Brigade
"m412Dll", # Mr. Blizzard's Brigade
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m412Dll/main.c"),
},
),
Rel(
"m413Dll", #Bob-omb Breakers
"m413Dll", # Bob-omb Breakers
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m413Dll/main.c"),
},
),
Rel(
"m414Dll", #Long Claw of the Law
"m414Dll", # Long Claw of the Law
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m414Dll/main.c"),
},
),
Rel(
"m415Dll", #Stamp Out!
"m415Dll", # Stamp Out!
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m415Dll/main.c"),
@ -945,7 +945,7 @@ config.libs = [
},
),
Rel(
"m416Dll", #Candlelight Flight
"m416Dll", # Candlelight Flight
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m416Dll/main.c"),
@ -953,7 +953,7 @@ config.libs = [
},
),
Rel(
"m417Dll", #Makin' Waves
"m417Dll", # Makin' Waves
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m417Dll/main.c"),
@ -963,21 +963,21 @@ config.libs = [
},
),
Rel(
"m418Dll", #Hide and Go BOOM!
"m418Dll", # Hide and Go BOOM!
objects={
Object(NonMatching, "REL/m418Dll/main.c"),
Object(NonMatching, "REL/m418Dll/sequence.c"),
},
),
Rel(
"m419Dll", #Tree Stomp
"m419Dll", # Tree Stomp
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m419Dll/main.c"),
},
),
Rel(
"m420dll", #Fish n' Drips
"m420dll", # Fish n' Drips
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m420dll/main.c"),
@ -987,7 +987,7 @@ config.libs = [
},
),
Rel(
"m421Dll", #Hop or Pop
"m421Dll", # Hop or Pop
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m421Dll/main.c"),
@ -996,21 +996,21 @@ config.libs = [
},
),
Rel(
"m422Dll", #Money Belts
"m422Dll", # Money Belts
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m422Dll/main.c"),
},
),
Rel(
"m423Dll", #GOOOOOOOAL!!
"m423Dll", # GOOOOOOOAL!!
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m423Dll/main.c"),
},
),
Rel(
"m424Dll", #Blame it on the Crane
"m424Dll", # Blame it on the Crane
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m424Dll/main.c"),
@ -1020,7 +1020,7 @@ config.libs = [
},
),
Rel(
"m425Dll", #The Great Deflate
"m425Dll", # The Great Deflate
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m425Dll/main.c"),
@ -1028,14 +1028,14 @@ config.libs = [
},
),
Rel(
"m426Dll", #Revers-a-Bomb
"m426Dll", # Revers-a-Bomb
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m426Dll/main.c"),
},
),
Rel(
"m427Dll", #Right Oar Left?
"m427Dll", # Right Oar Left?
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m427Dll/main.c"),
@ -1044,7 +1044,7 @@ config.libs = [
},
),
Rel(
"m428Dll", #Cliffhangers
"m428Dll", # Cliffhangers
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m428Dll/main.c"),
@ -1053,13 +1053,13 @@ config.libs = [
},
),
Rel(
"m429Dll", #Team Treasure Trek
"m429Dll", # Team Treasure Trek
objects={
Object(Matching, "REL/m429Dll/main.c"),
},
),
Rel(
"m430Dll", #Pair-a-sailing
"m430Dll", # Pair-a-sailing
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m430Dll/main.c"),
@ -1068,7 +1068,7 @@ config.libs = [
},
),
Rel(
"m431Dll", #Order Up
"m431Dll", # Order Up
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m431Dll/main.c"),
@ -1076,13 +1076,13 @@ config.libs = [
},
),
Rel(
"m432Dll", #Dungeon Duos
"m432Dll", # Dungeon Duos
objects={
Object(NonMatching, "REL/m432Dll/main.c"),
},
),
Rel(
"m433Dll", #Beach Volley Folly
"m433Dll", # Beach Volley Folly
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m433Dll/main.c"),
@ -1091,7 +1091,7 @@ config.libs = [
},
),
Rel(
"m434Dll", #Cheep Cheep Sweep
"m434Dll", # Cheep Cheep Sweep
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m434Dll/main.c"),
@ -1101,28 +1101,28 @@ config.libs = [
},
),
Rel(
"m435Dll", #Darts of Doom
"m435Dll", # Darts of Doom
objects={
Object(NonMatching, "REL/m435Dll/main.c"),
Object(NonMatching, "REL/m435Dll/sequence.c"),
},
),
Rel(
"m436Dll", #Fruits of Doom
"m436Dll", # Fruits of Doom
objects={
Object(NonMatching, "REL/m436Dll/main.c"),
Object(NonMatching, "REL/m436Dll/sequence.c"),
},
),
Rel(
"m437Dll", #Balloon of Doom
"m437Dll", # Balloon of Doom
objects={
Object(NonMatching, "REL/m437Dll/main.c"),
Object(NonMatching, "REL/m437Dll/sequence.c"),
},
),
Rel(
"m438Dll", #Chain Chomp Fever
"m438Dll", # Chain Chomp Fever
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m438Dll/main.c"),
@ -1131,14 +1131,14 @@ config.libs = [
},
),
Rel(
"m439Dll", #Paths of Peril
"m439Dll", # Paths of Peril
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m439Dll/main.c"),
Object(Matching, "REL/m439Dll/main.c"),
},
),
Rel(
"m440Dll", #Bowser's Bigger Blast
"m440Dll", # Bowser's Bigger Blast
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m440Dll/main.c"),
@ -1146,13 +1146,13 @@ config.libs = [
},
),
Rel(
"m441Dll", #Butterfly Blitz
"m441Dll", # Butterfly Blitz
objects={
Object(NonMatching, "REL/m441Dll/main.c"),
},
),
Rel(
"m442Dll", #Barrel Baron
"m442Dll", # Barrel Baron
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m442Dll/main.c"),
@ -1160,7 +1160,7 @@ config.libs = [
},
),
Rel(
"m443Dll", #Mario Speedwagons
"m443Dll", # Mario Speedwagons
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m443Dll/main.c"),
@ -1169,7 +1169,7 @@ config.libs = [
},
),
Rel(
"m444dll", #Reversal of Fortune
"m444dll", # Reversal of Fortune
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m444dll/main.c"),
@ -1179,14 +1179,14 @@ config.libs = [
},
),
Rel(
"m445Dll", #Bowser Bop
"m445Dll", # Bowser Bop
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m445Dll/main.c"),
},
),
Rel(
"m446dll", #Mystic Match 'Em
"m446dll", # Mystic Match 'Em
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m446Dll/main.c"),
@ -1200,7 +1200,7 @@ config.libs = [
},
),
Rel(
"m447dll", #Archaeologuess
"m447dll", # Archaeologuess
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m447dll/main.c"),
@ -1212,33 +1212,33 @@ config.libs = [
},
),
Rel(
"m448Dll", #Goomba's Chip Flip
"m448Dll", # Goomba's Chip Flip
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m448Dll/main.c"),
},
),
Rel(
"m449Dll", #Kareening Koopa
"m449Dll", # Kareening Koopa
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m449Dll/main.c"),
},
),
Rel(
"m450Dll", #The Final Battle!
"m450Dll", # The Final Battle!
objects={
Object(NonMatching, "REL/m450Dll/main.c"),
},
),
Rel(
"m451Dll", #Jigsaw Jitters
"m451Dll", # Jigsaw Jitters
objects={
Object(Matching, "REL/m451Dll/m451.c"),
},
),
Rel(
"m453Dll", #Challenge Booksquirm
"m453Dll", # Challenge Booksquirm
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m453Dll/main.c"),
@ -1247,7 +1247,7 @@ config.libs = [
},
),
Rel(
"m455Dll", #Rumble Fishing
"m455Dll", # Rumble Fishing
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m455Dll/main.c"),
@ -1255,7 +1255,7 @@ config.libs = [
},
),
Rel(
"m456Dll", #Take a Breather
"m456Dll", # Take a Breather
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m456Dll/main.c"),
@ -1263,28 +1263,28 @@ config.libs = [
},
),
Rel(
"m457Dll", #Bowser Wrestling
"m457Dll", # Bowser Wrestling
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m457Dll/main.c"),
},
),
Rel(
"m458Dll", #Panels of Doom
"m458Dll", # Panels of Doom
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m458Dll/main.c"),
},
),
Rel(
"m459dll", #Mushroom Medic
"m459dll", # Mushroom Medic
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m459dll/main.c"),
},
),
Rel(
"m460Dll", #Doors of Doom
"m460Dll", # Doors of Doom
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m460Dll/main.c"),
@ -1294,21 +1294,21 @@ config.libs = [
},
),
Rel(
"m461Dll", #Bob-omb X-ing
"m461Dll", # Bob-omb X-ing
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m461Dll/main.c"),
},
),
Rel(
"m462Dll", #Goomba Stomp
"m462Dll", # Goomba Stomp
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m462Dll/main.c"),
},
),
Rel(
"m463Dll", #Panel Panic 9 Player
"m463Dll", # Panel Panic 9 Player
objects={
Object(NonMatching, "REL/m463Dll/main.c"),
},
@ -1471,7 +1471,7 @@ config.libs = [
},
),
Rel(
"w01Dll", #Toad's Midway Madness
"w01Dll", # Toad's Midway Madness
objects={
Object(Matching, "REL/board_executor.c"),
Object(Matching, "REL/w01Dll/main.c"),
@ -1480,7 +1480,7 @@ config.libs = [
},
),
Rel(
"w02Dll", #Goomba's Greedy Gala
"w02Dll", # Goomba's Greedy Gala
objects={
Object(Matching, "REL/board_executor.c"),
Object(Matching, "REL/w02Dll/main.c"),
@ -1493,7 +1493,7 @@ config.libs = [
},
),
Rel(
"w03Dll", #Shy Guy's Jungle Jam
"w03Dll", # Shy Guy's Jungle Jam
objects={
Object(Matching, "REL/board_executor.c"),
Object(Matching, "REL/w03Dll/main.c"),
@ -1506,7 +1506,7 @@ config.libs = [
},
),
Rel(
"w04Dll", #Boo's Haunted Bash
"w04Dll", # Boo's Haunted Bash
objects={
Object(Matching, "REL/board_executor.c"),
Object(Matching, "REL/w04Dll/main.c"),
@ -1518,7 +1518,7 @@ config.libs = [
},
),
Rel(
"w05Dll", #Koopa's Seaside Soiree
"w05Dll", # Koopa's Seaside Soiree
objects={
Object(Matching, "REL/board_executor.c"),
Object(Matching, "REL/w05Dll/main.c"),
@ -1530,7 +1530,7 @@ config.libs = [
},
),
Rel(
"w06Dll", #Bowser's Gnarly Party
"w06Dll", # Bowser's Gnarly Party
objects={
Object(Matching, "REL/board_executor.c"),
Object(Matching, "REL/w06Dll/main.c"),
@ -1542,7 +1542,7 @@ config.libs = [
},
),
Rel(
"w10Dll", #Tutorial board
"w10Dll", # Tutorial board
objects={
Object(Matching, "REL/board_executor.c"),
Object(Matching, "REL/w10Dll/main.c"),
@ -1552,14 +1552,14 @@ config.libs = [
},
),
Rel(
"w20Dll", #Mega Board Mayhem
"w20Dll", # Mega Board Mayhem
objects={
Object(Matching, "REL/board_executor.c"),
Object(Matching, "REL/w20Dll/main.c"),
},
),
Rel(
"w21Dll", #Mini Board Mad Dash
"w21Dll", # Mini Board Mad Dash
objects={
Object(Matching, "REL/board_executor.c"),
Object(Matching, "REL/w21Dll/main.c"),

2843
include/REL/m439data.h Normal file

File diff suppressed because it is too large Load diff

2046
src/REL/m439Dll/main.c Normal file

File diff suppressed because it is too large Load diff