diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/bank3d/link_menu.asm | 8 | ||||
| -rw-r--r-- | engine/bank3d/main.asm | 8 | ||||
| -rw-r--r-- | engine/bank3f/main.asm | 6 | ||||
| -rw-r--r-- | engine/battle/get_trainer_name.asm | 1 | ||||
| -rw-r--r-- | engine/battle/moveEffects/reflect_light_screen_effect.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/safari_zone.asm | 4 | ||||
| -rwxr-xr-x | engine/give_pokemon.asm | 2 | ||||
| -rw-r--r-- | engine/joypad.asm | 12 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 6 | ||||
| -rwxr-xr-x | engine/palettes.asm | 8 | ||||
| -rwxr-xr-x | engine/town_map.asm | 17 |
11 files changed, 44 insertions, 30 deletions
diff --git a/engine/bank3d/link_menu.asm b/engine/bank3d/link_menu.asm index 5cf1dc8e..edd040b0 100644 --- a/engine/bank3d/link_menu.asm +++ b/engine/bank3d/link_menu.asm @@ -529,6 +529,7 @@ Func_f56bd:: ; f56bd (3d:56bd) ld e,l hlCoord 1,12 call PlaceString +.asm_f56e6 call Delay3 ld a,$1 ld [H_AUTOBGTRANSFERENABLED],a @@ -807,6 +808,7 @@ LinkMenu: ; f580c (3d:580c) ld d,$ec ld e,$7f call Func_f59ec +.asm_f5974 xor a ld [wBuffer], a ld a,$ff @@ -849,12 +851,12 @@ LinkMenu: ; f580c (3d:580c) ld d,$7f ld e,$ec call Func_f59ec - jp .chooseCancel + jp .choseCancel .asm_f59cd ld hl,Text_f5a11 call PrintText - jp .chooseCancel + jp .choseCancel .asm_f59d6 ld b,$7f @@ -863,7 +865,7 @@ LinkMenu: ; f580c (3d:580c) ld e,$7f call Func_f59ec call Func_f531b - jp c,.chooseCancel + jp c,.choseCancel ld a,$f0 jp .next diff --git a/engine/bank3d/main.asm b/engine/bank3d/main.asm index 7a2435a5..6e9788d1 100644 --- a/engine/bank3d/main.asm +++ b/engine/bank3d/main.asm @@ -39,6 +39,7 @@ Func_f42c2:: ; f42c2 (3d:f42c2) cp $31 jr nc,.asm_f42ce ld a,$7f +.asm_f42ce ld [hl],a ld bc,$14 add hl,bc @@ -68,6 +69,7 @@ Func_f430a:: ; f430a (3d:430a) callab Func_fcdb8 pop de ret nc +.asm_f432b push de ld e,$0 ld a,[wd470] @@ -77,6 +79,7 @@ Func_f430a:: ; f430a (3d:430a) cp $c8 jr c,.asm_f433b inc e +.asm_f433b ld c,d dec c ld b,$0 @@ -124,6 +127,7 @@ Func_f430a:: ; f430a (3d:430a) .asm_f4380 ld a,b ld [wd471],a +.asm_f4384 ret Pointer_f4385:: ; f4385 (3d:4385) @@ -271,7 +275,7 @@ HandleMenuInputDouble:: ; f5a40 (3d:5a40) xor a ld [wd09b],a -HandleMenuInputPokemonSelectionDouble:: ; 3aaf (0:3aaf) +HandleMenuInputPokemonSelectionDouble:: ; f5a44 (3d:5a44) ld a,[H_DOWNARROWBLINKCNT1] push af ld a,[H_DOWNARROWBLINKCNT2] @@ -280,6 +284,7 @@ HandleMenuInputPokemonSelectionDouble:: ; 3aaf (0:3aaf) ld [H_DOWNARROWBLINKCNT1],a ; blinking down arrow timing value 1 ld a,$06 ld [H_DOWNARROWBLINKCNT2],a ; blinking down arrow timing value 2 +.loop1 xor a ld [wPartyMonAnimCounter],a ; counter for pokemon shaking animation call Func_f5ab0 @@ -387,6 +392,7 @@ Func_f5ab0:: ; f5ab0 (3d:5ab0) cp "▶" jr z,.asm_f5af4 ld [wTileBehindCursor],a +.asm_f5af4 ld a,"▶" ld [hl],a ld a,l diff --git a/engine/bank3f/main.asm b/engine/bank3f/main.asm index 71362c2c..67ebd85b 100644 --- a/engine/bank3f/main.asm +++ b/engine/bank3f/main.asm @@ -250,7 +250,7 @@ Func_fc65b:: ; fc65b (3f:465b) ld a,[wSpriteStateData1 + $9] and a ; SPRITE_FACING_DOWN jr z,.asm_fc684 - jr asm_fc688 + jr .asm_fc688 .asm_fc684 ld a,$0 jr .asm_fc68a @@ -290,7 +290,9 @@ Func_fc69a:: ; fc69a (3f:469a) ld [wd431],a ret -INCBIN "baserom.gbc",$fc6c5,$fe66f - $fc6c5 +INCBIN "baserom.gbc",$fc6c5,$fcc08 - $fc6c5 +Func_fcc08:: ; fcc08 (3f:4c08) +INCBIN "baserom.gbc",$fcc08,$fe66f - $fcc08 OfficerJennySprite: INCBIN "gfx/sprites/officer_jenny.2bpp" PikachuSprite: INCBIN "gfx/sprites/pikachu.2bpp" diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index d32b80b9..d393b800 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -18,6 +18,7 @@ GetTrainerName_: ; f67a5 (3d:67a5) ld [wPredefBank], a call GetName ld hl, wcd6d +.foundName .rival ld de, W_TRAINERNAME ld bc, $d diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm index c12c6018..83a97486 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm @@ -41,5 +41,5 @@ ReflectGainedArmorText: ; f64a2 (3d:64a2) db "@" Bankswitch3DtoF: ; f64a7 (3d:64a7) - ld b, BANK(BattleCore) + ld b, $f ; BANK(BattleCore) jp Bankswitch diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index e195966d..00627d74 100755 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm @@ -5,7 +5,7 @@ PrintSafariZoneBattleText: ; 4111 (1:4111) jr z, .asm_411e dec [hl] ld hl, SafariZoneEatingText - jr .asm_429f + jr .asm_4138 .asm_411e dec hl ld a, [hl] @@ -13,7 +13,7 @@ PrintSafariZoneBattleText: ; 4111 (1:4111) ret z dec [hl] ld hl, SafariZoneAngryText - jr nz, .asm_4139 + jr nz, .asm_4138 push hl ld a, [wEnemyMonSpecies] ld [wd0b5], a diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index a74c756f..2bc23ce3 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -19,7 +19,7 @@ _GivePokemon: ; f66fa (3d:66fa) ld a, [wd5a0] and $7f cp 9 - jr c, .boxEightorLesser ; do not adjust box number to a 2 digit number + jr c, .boxEightOrLesser ; do not adjust box number to a 2 digit number sub 9 ld [hl], "1" inc hl diff --git a/engine/joypad.asm b/engine/joypad.asm index 791056ca..bca84b33 100644 --- a/engine/joypad.asm +++ b/engine/joypad.asm @@ -2,14 +2,16 @@ ReadJoypad_:: ; c000 (3:4000) ; Poll joypad input. ; Unlike the hardware register, button ; presses are indicated by a set bit. - + ld a, [hReadJoypad] + and a + ret nz + ld a, 1 << 5 ; select direction keys - ld c, 0 + ;ld c, 0 ld [rJOYP], a - rept 6 ld a, [rJOYP] - endr + ld a, [rJOYP] cpl and %1111 swap a @@ -17,7 +19,7 @@ ReadJoypad_:: ; c000 (3:4000) ld a, 1 << 4 ; select button keys ld [rJOYP], a - rept 10 + rept 6 ld a, [rJOYP] endr cpl diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index b2c8d94d..bd0a52b5 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -388,7 +388,7 @@ IsPlayerStandingOnWarpPadOrHole: ; 707e7 (1c:47e7) db INTERIOR, $55, 1 ; warp pad db $FF -Func_707b6: ; 70716 (1c:4716) +Func_70816: ; 70816 (1c:4816) ld c, $a call DelayFrames ld hl, wd736 @@ -414,7 +414,7 @@ Func_707b6: ; 70716 (1c:4716) ld a, [wWhichTrade] ; wWhichTrade and a ld hl, NoNibbleText - jr z, .asm_708a8 + jr z, .asm_70897 cp $2 ld hl, NothingHereText jr z, .asm_70897 @@ -445,7 +445,7 @@ Func_707b6: ; 70716 (1c:4716) ld [wOAMBuffer + $9c], a .asm_70894 ld hl, ItsABiteText -.asm_70836 +.asm_70897 call PrintText ld hl, wd736 res 6, [hl] diff --git a/engine/palettes.asm b/engine/palettes.asm index 5df64c7a..20dbdccb 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -310,14 +310,14 @@ DeterminePaletteIDOutOfBattle: ; 72094 (1c:6094) Func_720ad:: ; 720ad (1c:60ad) ld a,e and a - jr nz,.asm_720bd + jr nz,Func_720bd ld hl,Pointer_727e1 ld a,[hGBC] and a jp z,Func_721b4 jp Func_72346 -Func_720bd :: ; 720bd (1c:60bd) +Func_720bd:: ; 720bd (1c:60bd) ld hl,Func_72811 ld a,[hGBC] and a @@ -356,6 +356,7 @@ Func_720e3:: ; 720e3 (1c:60e3) jr .asm_7210c .asm_72109 call Func_72346 +.asm_7210c ld hl,UnknownPacket_72611 ld de,wcf2d ld bc,$10 @@ -379,7 +380,7 @@ Func_720e3:: ; 720e3 (1c:60e3) jr .asm_7213a .asm_72137 call Func_72346 -.asm_7231a +.asm_7213a ret Func_7213b:: ; 7213b (1c:613b) @@ -1110,6 +1111,7 @@ Func_725be:: ; 725be (1c:65be) ld hl,Pointer_725e2 ld a,[hli] ld c,a +.asm_725c5 ld a,e .loop cp [hl] diff --git a/engine/town_map.asm b/engine/town_map.asm index dafcd926..48e79d14 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -38,7 +38,7 @@ Func_70ef4: ; 70ef4 (1c:4ef4) add hl, bc ld a, [hl] -Func_70e92: ; 70f08 (1c:4f08) +Func_70f08: ; 70f08 (1c:4f08) ld de, wHPBarMaxHP call Func_712f1 ld a, [de] @@ -201,7 +201,7 @@ LoadTownMap_Fly: ; 71014 (1c:5014) ld b, a pop hl and D_DOWN | D_UP | B_BUTTON | A_BUTTON - jr z, .asm_7108b + jr z, .asm_7108d bit 0, b jr nz, .asm_710af ld a, (SFX_02_3c - SFX_Headers_02) / 3 @@ -320,8 +320,8 @@ LoadTownMap: ; 71126 (1c:5126) dec c jr nz, .loop inc de - jr .asm_7115d -.asm_71073 + jr .asm_710d3 +.asm_71173 call EnableLCD ld b, $2 call GoPAL_SET @@ -409,7 +409,7 @@ Func_71279: ; 711ef (1c:51ef) ld de, AreaUnknownText call PlaceString jr .asm_712c7 -.asm_71236 +.asm_712bf ld a, [W_CURMAP] ; W_CURMAP ld b, $0 call Func_7124e @@ -546,10 +546,9 @@ Func_71362: ; 71362 (1c:5362) jr nz, .asm_71377 xor a ld [hl], a -.asm_71277 +.asm_71377 inc hl - jr .asm_7126d - + jr .asm_7136d Func_7137a: ; 7137a (1c:537a) cp REDS_HOUSE_1F jr c, .asm_7138d @@ -559,7 +558,7 @@ Func_7137a: ; 7137a (1c:537a) cp [hl] jr c, .asm_7138a add hl, bc - jr .asm_71284 + jr .asm_71384 .asm_7138a inc hl jr .asm_71384 |