diff options
| -rw-r--r-- | engine/bank3c/main.asm | 3 | ||||
| -rw-r--r-- | engine/bank3d/link_menu.asm | 28 | ||||
| -rw-r--r-- | engine/bank3d/main.asm | 5 | ||||
| -rw-r--r-- | engine/battle/common_text.asm | 4 | ||||
| -rwxr-xr-x | engine/random.asm | 2 | ||||
| -rwxr-xr-x | wram.asm | 3 |
6 files changed, 30 insertions, 15 deletions
diff --git a/engine/bank3c/main.asm b/engine/bank3c/main.asm index b6231e3e..3c1966ff 100644 --- a/engine/bank3c/main.asm +++ b/engine/bank3c/main.asm @@ -88,6 +88,9 @@ BeachHouse_GFX:: ; f0314 (3c:4314) BeachHouse_Block:: ; f0914 (3c:4914) INCBIN "gfx/blocksets/beachhouse.bst" +Func_f0a54:: ; f0a54 (3c:4a54) + ret + Func_f0a55:: ; f0a55 (3c:4a55) ld hl,Pointer_f0a76 ; 3c:4a76 .loop diff --git a/engine/bank3d/link_menu.asm b/engine/bank3d/link_menu.asm index 62387a7b..f794c1e4 100644 --- a/engine/bank3d/link_menu.asm +++ b/engine/bank3d/link_menu.asm @@ -4,12 +4,12 @@ Func_f531b:: ; f531b (3d:531b) ld a,$1 ld [wBuffer],a xor a - ld [wUnknownSerialFlag_d49a],a + ld [wUnknownSerialFlag_d499],a hlCoord 0,0 ld bc,$405 call TextBoxBorder ld de,Text_f5791 - hlCoord 1,1 + hlCoord 0,1 call PlaceString hlCoord 8,0 ld bc,$80a @@ -145,7 +145,7 @@ Func_f531b:: ; f531b (3d:531b) cp $3 jr z,asm_f547f inc a - ld [wUnknownSerialFlag_d49a],a + ld [wUnknownSerialFlag_d499],a ld a,[wCurrentMenuItem] ld hl,PointerTable_f5488 ld c,a @@ -167,6 +167,9 @@ Func_f531b:: ; f531b (3d:531b) ld a,[wLinkMenuSelectionSendBuffer] and a jr nz,asm_f547c + ld a, [wLinkMenuSelectionReceiveBuffer] + and a + jr nz, Func_f5476 xor a ld [wUnknownSerialCounter],a ld [wUnknownSerialCounter+1],a @@ -637,7 +640,7 @@ LinkMenu: ; f580c (3d:580c) ld hl, TextTerminator_f5a16 call PrintText call SaveScreenTilesToBuffer1 - ld hl, ColosseumPleaseWaitText + ld hl, ColosseumWhereToText call PrintText hlCoord 5, 5 ld bc, $80d @@ -738,7 +741,6 @@ LinkMenu: ; f580c (3d:580c) ld a, [wCurrentMenuItem] cp $2 jp z, .asm_f5963 - jr z, .updateCursorPosition ld b, e ld e, c ld a, [wCurrentMenuItem] @@ -813,6 +815,8 @@ LinkMenu: ; f580c (3d:580c) ld [wBuffer], a ld a,$ff ld [wSerialExchangeNybbleReceiveData],a + ld a, $b + ld [wLinkMenuSelectionSendBuffer], a ld b,$78 .loop ld a,[hSerialConnectionStatus] @@ -825,8 +829,8 @@ LinkMenu: ; f580c (3d:580c) ld a,[wSerialExchangeNybbleReceiveData] inc a jr z,.loop -.loop2 ld b,$f +.loop2 call DelayFrame call Serial_ExchangeNybble dec b @@ -871,20 +875,26 @@ LinkMenu: ; f580c (3d:580c) Func_f59ec:: ; f59ec (3d:59ec) ld a, b - Coorda 6, 7 + Coorda 6, 5 ld a, c - Coorda 6, 9 + Coorda 6, 7 ld a, d + Coorda 6, 9 + ld a, e Coorda 6, 11 ld c, 40 call DelayFrames ret +ColosseumWhereToText: ; f5a02 (3d:5a02) + TX_FAR _ColosseumWhereToText + db "@" + ColosseumPleaseWaitText: ; f5a07 (3d:5a07) TX_FAR _ColosseumPleaseWaitText db "@" -_ColosseumCanceledText: ; f5a0c (3d:5a0c) +ColosseumCanceledText: ; f5a0c (3d:5a0c) TX_FAR _ColosseumCanceledText db "@" diff --git a/engine/bank3d/main.asm b/engine/bank3d/main.asm index bab20f05..78d314a7 100644 --- a/engine/bank3d/main.asm +++ b/engine/bank3d/main.asm @@ -132,7 +132,7 @@ Func_f430a:: ; f430a (3d:430a) Pointer_f4385:: ; f4385 (3d:4385) db $05,$03,$02,$05,$03,$02,$01,$01,$00,$03,$02,$01,$01,$01,$00,$02,$01,$01 - db $fd,$fb,$ff,$ff,$ff,$fb,$fb,$f6,$fb,$fb,$f6,$f6,$f6,$ec + db $fd,$fd,$fb,$ff,$ff,$ff,$fb,$fb,$f6,$fb,$fb,$f6,$f6,$f6,$ec Pointer_f43a6:: ; f43a6 (3d:43a6) db $8a,$83,$80,$80,$94,$80,$62,$6c,$62,$6c @@ -143,7 +143,7 @@ RedPicBack:: INCBIN "pic/trainer/redb.pic" OldManPic:: INCBIN "pic/trainer/oldman.pic" OakPicBack:: INCBIN "pic/ytrainer/prof.oakb.pic" -SECTION "bank3d Yellow Intro",ROMX[$453f],BANK[$3D] +;SECTION "bank3d Yellow Intro",ROMX[$453f],BANK[$3D] Func_f453f:: ; f453f (3d:453f) ld hl,PokemonLogoGraphics @@ -652,7 +652,6 @@ GenerateRandomFishingEncounter: ; f5ec1 (3d:5ec1) ret INCLUDE "data/super_rod.asm" - INCLUDE "engine/bank3d/bank3d_battle.asm" INCLUDE "engine/items/tm_prices.asm" INCLUDE "engine/multiply_divide.asm" diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index e1fbedc2..5d427e97 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -35,9 +35,13 @@ PrintBeginningBattleText: ; f4000 (3d:4000) call DelayFrames ld hl, TrainerWantsToFightText .wildBattle + ld a, [W_BATTLETYPE] + and a + jr nz, .doNotDrawPokeballs push hl callab DrawAllPokeballs pop hl +.doNotDrawPokeballs call PrintText jr .done .pokemonTower diff --git a/engine/random.asm b/engine/random.asm index b7fb0edd..2fc83f6f 100755 --- a/engine/random.asm +++ b/engine/random.asm @@ -1,5 +1,3 @@ -SECTION "bank3d",ROMX[$67DC],BANK[$3D] - Random_:: ; Generate a random 16-bit value. ld a, [rDIV] @@ -1666,8 +1666,9 @@ wd473:: ds 1 wd47a:: ds 1 - ds 31 + ds 30 +wUnknownSerialFlag_d499:: ds 1 ; d498 wUnknownSerialFlag_d49a:: ds 1 ; d499 wUnknownSerialFlag_d49b:: ds 1 ; d49a wd49c:: ds 1 ; d49b |