Merge pull request #2499 from 2dos/chapter-13

theballaam96 · web-flow · commit 3f38269b09ec · 2025-02-26T12:24:39.000-06:00
Fix climbing w/ move rando
diff --git a/base-hack/src/main.c b/base-hack/src/main.c
@@ -457,7 +457,7 @@ typedef struct menu_paad {
 } menu_paad;
 
 Gfx *displayMenuWarnings(Gfx *dl) {
-	if (EEPROMType != 2) {
+	if (EEPROMType != EEPROM_TYPE_16K) {
 		actorData* actor = findActorWithType(0x146);
 		if (actor) {
 			menu_paad* paad = (menu_paad*)actor->paad;
diff --git a/randomizer/Patching/MoveLocationRando.py b/randomizer/Patching/MoveLocationRando.py
@@ -167,6 +167,7 @@ def writeMoveDataToROM(ROM_COPY: LocalROM, arr: list, enable_hints: bool, spoile
                 "vine": 0x183,
                 "camera": 0x2FD,
                 "shockwave": 0x179,
+                "climbing": 0x297,
                 "camera_shockwave": 0xFFFE,
             }
             flag_index = 0xFFFF

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ def writeMoveDataToROM(ROM_COPY: LocalROM, arr: list, enable_hints: bool, spoile`
`167`	`167`	`"vine": 0x183,`
`168`	`168`	`"camera": 0x2FD,`
`169`	`169`	`"shockwave": 0x179,`
	`170`	`+ "climbing": 0x297,`
`170`	`171`	`"camera_shockwave": 0xFFFE,`
`171`	`172`	`}`
`172`	`173`	`flag_index = 0xFFFF`