diff options
| -rw-r--r-- | engine/bank3d/link_menu.asm | 4 | ||||
| -rw-r--r-- | engine/bank3f/main.asm | 12 | ||||
| -rw-r--r-- | home.asm | 4 | ||||
| -rwxr-xr-x | yellow/main.asm | 39 |
4 files changed, 32 insertions, 27 deletions
diff --git a/engine/bank3d/link_menu.asm b/engine/bank3d/link_menu.asm index 3915c85d..a460eb00 100644 --- a/engine/bank3d/link_menu.asm +++ b/engine/bank3d/link_menu.asm @@ -787,8 +787,8 @@ LinkMenu: ; f580c (3d:580c) inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a ld [wcc47], a - ld hl,SpecialWarpIn - ld b,BANK(SpecialWarpIn) + ld hl,Func_5ce4 + ld b,BANK(Func_5ce4) jp Bankswitch .choseCancel xor a diff --git a/engine/bank3f/main.asm b/engine/bank3f/main.asm index a17d5138..b9c34e1a 100644 --- a/engine/bank3f/main.asm +++ b/engine/bank3f/main.asm @@ -60,7 +60,7 @@ Func_fc534:: ; fc534 (3f:4534) ret Func_fc53f:: ; fc53f (3f:453f) - ld bc,wSpriteStateData1 + $10 + ld bc,wSpriteStateData1 + $f0 ld a,[W_YCOORD] add $4 ld e,a @@ -160,7 +160,7 @@ Func_fc5bc:: ; fc5bc (3f:45bc) jr z,.asm_fc5e4 cp $7 jr z,.asm_fc5f1 - call Func_fc4b2 + call Func_fccb2 ret .asm_fc5e4 @@ -272,12 +272,12 @@ Func_fc69a:: ; fc69a (3f:469a) jr .asm_fc6bd .asm_fc6a7 ld a,[wSpriteStateData1 + $9] - cp SPRITE_FACING_DOWN + cp SPRITE_FACING_UP jr z,.asm_fc6b9 jr .asm_fc6bd .asm_fc6b0 ld a,[wSpriteStateData1 + $9] - cp SPRITE_FACING_DOWN + cp SPRITE_FACING_UP jr z,.asm_fc6b9 jr .asm_fc6bd .asm_fc6b9 @@ -296,7 +296,9 @@ Func_fc6d5:: ; fc6d5 (3f:46d5) Func_fcb84: ; fcb84 (3f:45bc) dr $fcb84,$fcc08 Func_fcc08:: ; fcc08 (3f:4c08) - dr $fcc08,$fcdb8 + dr $fcc08,$fccb2 +Func_fccb2:: ; fccb2 (3f:4cb2) + dr $fccb2,$fcdb8 Func_fcdb8:: ; fcdb8 (3f:4db8) dr $fcdb8,$fce18 Func_fce18:: ; fce18 (3f:4e18) @@ -3032,8 +3032,8 @@ Func_3467:: ; 3467 (0:3467) DisplayPokedex:: ; 347d (0:347d) ld [wd11e], a - ld b, BANK(Func_7c18) - ld hl, Func_7c18 + ld b, BANK(Func_7abf) + ld hl, Func_7abf jp Bankswitch SetSpriteFacingDirectionAndDelay:: ; 3488 (0:3488) diff --git a/yellow/main.asm b/yellow/main.asm index 64eac381..82c3f2f8 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -40,7 +40,9 @@ _IsTilePassable:: ; 4aaa (1:4aaa) PrintWaitingText:: ; 4b89 (1:4b89) dr $4b89,$4bb7 _UpdateSprites:: ; 4bb7 (1:4bb7) - dr $4bb7,$6042 + dr $4bb7,$5ce4 +Func_5ce4:: ; 5ce4 (1:5ce4) + dr $5ce4,$6042 SpecialWarpIn:: ; 6042 (1:6042) dr $6042,$68a6 SubtractAmountPaidFromMoney_:: ; 68a6 (1:68a6) @@ -64,9 +66,9 @@ DisplayTextBoxID_:: ; 71bf (1:71bf) PlayerPC:: ; 778e (1:778e) dr $778e,$7a0f _RemovePokemon:: ; 7a0f (1:7a0f) - dr $7a0f,$7c18 -Func_7c18:: ; 7c18 (1:7c18) - dr $7c18,$8000 + dr $7a0f,$7abf +Func_7abf:: ; 7c18 (1:7abf) + dr $7abf,$8000 SECTION "bank02",ROMX,BANK[$02] @@ -175,7 +177,8 @@ CheckForceBikeOrSurf: ; c0d2 (3:40d2) ld a, $1 ld [wWalkBikeSurfState], a ld [wWalkBikeSurfStateCopy], a - jp ForceBikeOrSurf + call ForceBikeOrSurf + ret .incorrectMap inc hl .incorrectY @@ -185,8 +188,9 @@ CheckForceBikeOrSurf: ; c0d2 (3:40d2) ld a, $2 ld [wWalkBikeSurfState], a ld [wWalkBikeSurfStateCopy], a - jp ForceBikeOrSurf - + call ForceBikeOrSurf + ret + INCLUDE "data/force_bike_surf.asm" IsPlayerFacingEdgeOfMap: ; c148 (3:4148) @@ -1036,18 +1040,17 @@ CeladonPrizeMenu:: ; 5267d (14:667d) SECTION "bank15",ROMX,BANK[$15] - dr $54000,$567cd + dr $54000,$56745 +_GetSpritePosition1:: ; 56745 (15:6745) + dr $56745,$56765 +_GetSpritePosition2:: ; 56765 (15:6765) + dr $56765,$56789 +_SetSpritePosition1:: ; 56789 (15:6789) + dr $56789,$567a9 +_SetSpritePosition2:: ; 567a9 (15:67a9) + dr $567a9,$567cd TrainerWalkUpToPlayer:: ; 567cd (15:67cd) - dr $567cd,$57745 -_GetSpritePosition1:: ; 57745 (15:7745) - dr $57745,$57765 -_GetSpritePosition2:: ; 57765 (15:7765) - dr $57765,$57789 -_SetSpritePosition1:: ; 57789 (15:7789) - dr $57789,$577a9 -_SetSpritePosition2:: ; 577a9 (15:77a9) - dr $577a9,$58000 - + dr $567cd,$58000 SECTION "bank16",ROMX,BANK[$16] dr $58000,$58e8b |