summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bossBridgeBowser.yaml2
-rw-r--r--bugfixes.yaml12
-rw-r--r--poweruphax.yaml52
-rw-r--r--spritetex.yaml10
-rw-r--r--src/bossCaptainBowser.cpp2
-rw-r--r--src/music.cpp34
-rw-r--r--src/nullsub.S4
7 files changed, 58 insertions, 58 deletions
diff --git a/bossBridgeBowser.yaml b/bossBridgeBowser.yaml
index eed2625..c7aea6c 100644
--- a/bossBridgeBowser.yaml
+++ b/bossBridgeBowser.yaml
@@ -57,7 +57,7 @@ hooks:
- name: BowserBridgeHammerCollision
type: add_func_pointer
src_addr_pal: 0x80B7E848
- target_func: 'Return'
+ target_func: 'ReturnNone'
- name: PatchMagicStart
type: add_func_pointer
diff --git a/bugfixes.yaml b/bugfixes.yaml
index 4d2d5b9..ac884e4 100644
--- a/bugfixes.yaml
+++ b/bugfixes.yaml
@@ -88,29 +88,29 @@ hooks:
- name: StarsDontKillSpikesUD
type: add_func_pointer
src_addr_pal: 0x80AFF4D8
- target_func: 'Return'
+ target_func: 'ReturnNone'
- name: StarsDontKillSpikesD
type: add_func_pointer
src_addr_pal: 0x80AFF784
- target_func: 'Return'
+ target_func: 'ReturnNone'
- name: StarsDontKillSpikesU
type: add_func_pointer
src_addr_pal: 0x80AFFA30
- target_func: 'Return'
+ target_func: 'ReturnNone'
- name: StarsDontKillSpikesLR
type: add_func_pointer
src_addr_pal: 0x80AFFCDC
- target_func: 'Return'
+ target_func: 'ReturnNone'
- name: StarsDontKillSpikesR
type: add_func_pointer
src_addr_pal: 0x80AFFF88
- target_func: 'Return'
+ target_func: 'ReturnNone'
- name: StarsDontKillSpikesL
type: add_func_pointer
src_addr_pal: 0x80B00234
- target_func: 'Return'
+ target_func: 'ReturnNone'
diff --git a/poweruphax.yaml b/poweruphax.yaml
index 9ec32d4..5992453 100644
--- a/poweruphax.yaml
+++ b/poweruphax.yaml
@@ -400,22 +400,22 @@ hooks:
# - name: HammerClamNull
# type: add_func_pointer
# src_addr_pal: 0x80AD5BF0
-# target_func: 'Return'
+# target_func: 'ReturnNone'
- name: HammerGiantWigglerNull
type: add_func_pointer
src_addr_pal: 0x80AD7FC8
- target_func: 'Return'
+ target_func: 'ReturnNone'
- name: HammerParabeetleNull
type: add_func_pointer
src_addr_pal: 0x80B028D8
- target_func: 'Return'
+ target_func: 'ReturnNone'
- name: HammerGiantBuzzyNull
type: add_func_pointer
src_addr_pal: 0x80AD8A10
- target_func: 'Return'
+ target_func: 'ReturnNone'
- name: HammerGiantBuzzy
type: patch
@@ -440,7 +440,7 @@ hooks:
- name: HammerKingBillNull
type: add_func_pointer
src_addr_pal: 0x80AF72A8
- target_func: 'Return'
+ target_func: 'ReturnNone'
@@ -489,12 +489,12 @@ hooks:
- name: IcicleNormalNoIceball
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80AEFFFC
# - name: IcicleFixationNoIceball
# type: patch
- # target_func: 'Return'
+ # target_func: 'ReturnNone'
# src_addr_pal: 0x80AE9DC0
@@ -502,104 +502,104 @@ hooks:
- name: FuckinCastleLarryNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B76C90
- name: FuckinLarryNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B81F44
- name: FuckinCastleLemmyNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B777A8
- name: FuckinLemmyNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B82DF0
- name: FuckinCastleWendyNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B7AD70
- name: FuckinWendyNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B87644
- name: FuckinCastleLudwigNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B78380
- name: FuckinLudwigNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B840D8
- name: FuckinCastleIggyNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B75F80
- name: FuckinIggyNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B7BC28
- name: FuckinCastleMortonNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B79060
- name: FuckinMortonNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B853A8
- name: FuckinCastleRoyNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B79DC8
- name: FuckinRoyNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B86410
- name: FuckinKamekNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B7CBDC
- name: FuckinBowserNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B7E800
- name: FuckinJrANull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B804B4
- name: FuckinJrBNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B80BBC
- name: FuckinJrCNull
type: add_func_pointer
- target_func: 'Return'
+ target_func: 'ReturnNone'
src_addr_pal: 0x80B81468
diff --git a/spritetex.yaml b/spritetex.yaml
index 1b7e521..ad6183e 100644
--- a/spritetex.yaml
+++ b/spritetex.yaml
@@ -293,11 +293,11 @@ hooks:
target_func: 'TEX_Goal'
- - name: TEX_ColorBlock
- type: branch_insn
- branch_type: bl
- src_addr_pal: 0x800BEA90
- target_func: 'TEX_ColorBlock'
+ # - name: TEX_ColorBlock
+ # type: branch_insn
+ # branch_type: bl
+ # src_addr_pal: 0x800BEA90
+ # target_func: 'TEX_ColorBlock'
# - name: TEX_StretchMush
diff --git a/src/bossCaptainBowser.cpp b/src/bossCaptainBowser.cpp
index bd6a53f..af02c3c 100644
--- a/src/bossCaptainBowser.cpp
+++ b/src/bossCaptainBowser.cpp
@@ -211,7 +211,7 @@ int daCaptainBowser::onCreate() {
this->playerCount = GetActivePlayerCount();
this->maxDamage = (10 * this->playerCount) + 10;
- pos.z = 3300.0;
+ pos.z = 8000.0;
this->scale = (Vec){0.57, 0.57, 0.57};
this->homingBillCountdown = 270;
this->homingBillSlot = 0;
diff --git a/src/music.cpp b/src/music.cpp
index 669a775..6e658f7 100644
--- a/src/music.cpp
+++ b/src/music.cpp
@@ -36,8 +36,8 @@ const char* SongNameList [] = {
"SEWER",
"SPACE",
"BOWSER",
- "",
- "",
+ "BONUS",
+ "AMBUSH",
"",
"",
"",
@@ -60,8 +60,8 @@ const char* SongNameList [] = {
"",
"",
"",
- "",
- "",
+ "MINIGAME",
+ "BONUS_AREA",
"CHALLENGE",
"",
"",
@@ -72,18 +72,18 @@ const char* SongNameList [] = {
"",
"",
"",
- "YOSHI ISLAND MAP",
- "GOLDWOOD MAP",
- "SEWER MAP",
- "FULLMAP FRONT",
- "FULLMAP REAR",
- "MINIMEGA MAP",
- "FF VOLCANO MAP",
- "CRYSTAL CAVE MAP",
- "SPACE MAP",
- "SKY CITY MAP",
- "KOOPA PLANET MAP",
- "KOOPA CORE MAP",
+ "MAP_YOSHIISLAND",
+ "MAP_GOLDWOOD",
+ "MAP_SEWER",
+ "FULLMAP_FRONT",
+ "FULLMAP_REAR",
+ "MAP_MINIMEGA",
+ "MAP_FF_VOLCANO",
+ "MAP_CRYSTAL_CAVE",
+ "MAP_SPACE",
+ "MAP_SKYCITY",
+ "MAP_KOOPA_PLANET",
+ "MAP_KOOPA_CORE",
NULL
};
@@ -147,7 +147,7 @@ extern "C" u8 after_course_getMusicForZone(u8 realThemeID) {
HijackedStream *stream = &hj->stream[hj->currentStream];
OSReport("%d", realThemeID);
- OSReport("%s", SongNameList[realThemeID-99]);
+ OSReport("%s", SongNameList[realThemeID-100]);
sprintf(BrsarInfoOffset(stream->stringOffset), "new/%s.er", SongNameList[realThemeID-100]);
sprintf(BrsarInfoOffset(stream->stringOffsetFast), "new/%s_F.er", SongNameList[realThemeID-100]);
diff --git a/src/nullsub.S b/src/nullsub.S
index afdeed9..d46e8a4 100644
--- a/src/nullsub.S
+++ b/src/nullsub.S
@@ -1,7 +1,7 @@
.text
-.global Return
-Return:
+.global ReturnNone
+ReturnNone:
blr
.global ReturnTrue
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 09:29:01 +0000