Fix bank3d so it matches baserom.gbc

7 files changed, 26 insertions, 31 deletions

diff --git a/data/super_rod.asm b/data/super_rod.asm
index cacb8ffd..14a3b9b7 100755
--- a/data/super_rod.asm
+++ b/data/super_rod.asm
@@ -28,6 +28,6 @@ FishingSlots:: ; f5eda (3d:5eda)
 	db SAFARI_ZONE_WEST,MAGIKARP,5,MAGIKARP,10,MAGIKARP,15,DRATINI,15
 	db SEAFOAM_ISLANDS_4,KRABBY,25,STARYU,20,KINGLER,35,STARYU,40
 	db SEAFOAM_ISLANDS_5,KRABBY,25,STARYU,20,KINGLER,35,STARYU,40
-	db UNKNOWN_DUNGEON_2,GOLDEEN,25,SEAKING,35,SEAKING,45,SEAKING,55
+	db UNKNOWN_DUNGEON_1,GOLDEEN,25,SEAKING,35,SEAKING,45,SEAKING,55
 	db UNKNOWN_DUNGEON_3,GOLDEEN,30,SEAKING,40,SEAKING,50,SEAKING,60
 	db $ff
\ No newline at end of file
diff --git a/engine/bank3d/link_menu.asm b/engine/bank3d/link_menu.asm
index f794c1e4..3915c85d 100644
--- a/engine/bank3d/link_menu.asm
+++ b/engine/bank3d/link_menu.asm
@@ -9,7 +9,7 @@ Func_f531b:: ; f531b (3d:531b)
 	ld bc,$405
 	call TextBoxBorder
 	ld de,Text_f5791
-	hlCoord 0,1
+	hlCoord 1,2
 	call PlaceString
 	hlCoord 8,0
 	ld bc,$80a
@@ -177,7 +177,7 @@ Func_f531b:: ; f531b (3d:531b)
 	ret
 	
 Func_f5476:: ; f5476 (3d:5476)
-	ld hl,ColosseumEvolvedText
+	ld hl,ColosseumIneligibleText
 	call PrintText
 asm_f547c:: ; f547c (3d:574c)
 	jp Func_f531b
@@ -200,8 +200,8 @@ PokeCup:: ; f548e (3d:548e)
 	cp $3
 	jp nz,NotThreeMonsInParty
 	ld b,$3
-	ld a,[hli]
 .loop
+	ld a,[hli]
 	cp MEW
 	jp z,MewInParty
 	dec b
@@ -642,11 +642,11 @@ LinkMenu: ; f580c (3d:580c)
 	call SaveScreenTilesToBuffer1
 	ld hl, ColosseumWhereToText
 	call PrintText
-	hlCoord 5, 5
+	hlCoord 5, 3
 	ld bc, $80d
 	call TextBoxBorder
 	call UpdateSprites
-	hlCoord 7, 7
+	hlCoord 7, 5
 	ld de, TradeCenterText
 	call PlaceString
 	xor a
@@ -770,7 +770,7 @@ LinkMenu: ; f580c (3d:580c)
 	ld a, BATTLE_CENTER
 .next
 	ld [wd72d], a
-	ld hl, _ColosseumCanceledText
+	ld hl, ColosseumPleaseWaitText
 	call PrintText
 	ld c, $32
 	call DelayFrames
@@ -795,7 +795,7 @@ LinkMenu: ; f580c (3d:580c)
 	ld [wMenuJoypadPollCount], a
 	call Delay3
 	callab CloseLinkConnection
-	ld hl, ColosseumVersionText
+	ld hl, ColosseumCanceledText
 	call PrintText
 	ld hl, wd72e
 	res 6, [hl]
diff --git a/engine/bank3d/main.asm b/engine/bank3d/main.asm
index 78d314a7..7b3326c9 100644
--- a/engine/bank3d/main.asm
+++ b/engine/bank3d/main.asm
@@ -151,18 +151,18 @@ Func_f453f:: ; f453f (3d:453f)
 	ld bc,$730
 	ld a,BANK(PokemonLogoGraphics) ; redundant because this function is in bank3d
 	call FarCopyData
-	ld hl,YellowLogoGraphics
-	ld de,vChars1+$fd0
+	ld hl,YellowLogoGraphics+$230
+	ld de,vChars0+$fd0
 	ld bc,$30
 	ld a,BANK(YellowLogoGraphics)
 	call FarCopyData
-	ld hl,YellowLogoGraphics+$30
+	ld hl,YellowLogoGraphics+$260
 	ld de,vChars1
 	ld bc,$400
 	ld a,BANK(YellowLogoGraphics)
 	call FarCopyData
-	ld hl,YellowLogoGraphics+$430
-	ld de,vChars1+$f00
+	ld hl,YellowLogoGraphics+$660
+	ld de,vChars0+$f00
 	ld bc,$c0
 	ld a,BANK(YellowLogoGraphics)
 	call FarCopyData
@@ -288,7 +288,7 @@ HandleMenuInputPokemonSelectionDouble:: ; f5a44 (3d:5a44)
 	xor a
 	ld [wPartyMonAnimCounter],a ; counter for pokemon shaking animation
 	call Func_f5ab0
-	call Delay3
+	call JoypadLowSensitivity
 	ld a,[hJoy5]
 	and a ; was a key pressed?
 	jr nz,.keyPressed
@@ -323,7 +323,7 @@ HandleMenuInputPokemonSelectionDouble:: ; f5a44 (3d:5a44)
 	ld c,a
 	ld a,[wMaxMenuItem]
 	cp c
-	jr nc,.checkOtherKeys
+	jr c,.checkOtherKeys
 	ld a,c
 	ld [wCurrentMenuItem],a
 .checkOtherKeys
@@ -342,8 +342,6 @@ HandleMenuInputPokemonSelectionDouble:: ; f5a44 (3d:5a44)
 	ld [H_DOWNARROWBLINKCNT2],a
 	pop af
 	ld [H_DOWNARROWBLINKCNT1],a ; restore previous values
-	xor a
-	ld [wMenuWrappingEnabled],a ; disable menu wrapping
 	ld a,[hJoy5]
 	ret
 	
@@ -450,7 +448,7 @@ Func_f5b2d:: ; f5b2d (3d:5b2d)
 	jp PrintText
 	
 CoordsData_f5b64:: ; f5b64 (3d:5b64)
-	db 13,07
+	db 11,07
 	db $ff
 	
 Text_f5b67:: ; f5b67 (3d:5b67)
@@ -458,7 +456,7 @@ Text_f5b67:: ; f5b67 (3d:5b67)
 	db "@"
 	
 Text_f5b6c:: ; f5b6c (3d:5b6c)
-	TX_FAR _NewBadgeRequiredText ; 2d:412d
+	TX_FAR _CyclingIsFunText ; 2d:41ca
 	db "@"
 	
 AddItemToInventory_:: ; f5b70 (3d:5b70)
@@ -484,16 +482,17 @@ AddItemToInventory_:: ; f5b70 (3d:5b70)
 	ld a,[hli]
 	and a
 	jr z,.addNewItem
-.loop
+.notAtEndOfInventory
 	ld a,[hli]
 	ld b,a ; b = ID of current item in table
 	ld a,[wcf91] ; a = ID of item being added
 	cp b ; does the current item in the table match the item being added?
 	jp z,.increaseItemQuantity ; if so, increase the item's quantity
 	inc hl
+.loop
 	ld a,[hl]
 	cp a,$ff ; is it the end of the table?
-	jr nz,.loop
+	jr nz, .notAtEndOfInventory
 .addNewItem ; add an item not yet in the inventory
 	pop hl
 	ld a,d
diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm
index e8e4a8b1..74b70431 100644
--- a/engine/battle/moveEffects/transform_effect.asm
+++ b/engine/battle/moveEffects/transform_effect.asm
@@ -100,18 +100,11 @@ TransformEffect_: ; f637f (3d:637f)
 	and a
 	jr z, .lessThanFourMoves
 	ld a, $5
-	ld [de], a
-	inc de
-	dec b
-	jr nz, .copyPPLoop
-	jr .copyStats
 .lessThanFourMoves
-; 0 PP for blank moves
-	xor a
 	ld [de], a
 	inc de
 	dec b
-	jr nz, .lessThanFourMoves
+	jr nz, .copyPPLoop
 .copyStats
 ; original (unmodified) stats and stat mods
 	pop hl
diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm
index 2bc23ce3..93499cc8 100755
--- a/engine/give_pokemon.asm
+++ b/engine/give_pokemon.asm
@@ -41,6 +41,8 @@ _GivePokemon: ; f66fa (3d:66fa)
 	ret
 .partyNotFull
 	call SetPokedexOwnedFlag
+	ld hl, UnknownTerminator_f6794
+	call PrintText
 	call AddPartyMon
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
diff --git a/engine/multiply_divide.asm b/engine/multiply_divide.asm
index a72f1505..6ff427c6 100755
--- a/engine/multiply_divide.asm
+++ b/engine/multiply_divide.asm
@@ -36,7 +36,7 @@ _Multiply: ; f660e (3d:660e)
 .smallMultiplier
 	dec b
 	jr z, .done
-	ld a, [H_MULTIPLICAND]
+	ld a, [H_MULTIPLICAND+2]
 	sla a
 	ld [H_MULTIPLICAND+2], a
 	ld a, [H_MULTIPLICAND+1]
@@ -56,6 +56,7 @@ _Multiply: ; f660e (3d:660e)
 	ld [H_PRODUCT+2], a
 	ld a, [H_MULTIPLYBUFFER+1] ; $ff9c
 	ld [H_PRODUCT+1], a ; $ff96
+	ld a, [H_MULTIPLYBUFFER]
 	ld [H_PRODUCT], a ; $ff95
 	ret
 
diff --git a/engine/predefs.asm b/engine/predefs.asm
index 7a629444..6cf84511 100755
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -52,7 +52,7 @@ GetPredefPointer: ; f67ed (3d:67ed)
 PredefPointers:: ; f681d (3d:681d)
 ; these are pointers to ASM routines.
 ; they appear to be used in overworld map scripts.
-	dr $f681d,$f8000
+	dr $f681d,$f7000
 	;add_predef DrawPlayerHUDAndHPBar
 	;add_predef Func_3f0c6
 	;add_predef Func_3f073