diff options
| -rw-r--r-- | charmap.asm | 1 | ||||
| -rw-r--r-- | data/map_header_banks.asm (renamed from engine/bank3f/data/map_header_banks.asm) | 0 | ||||
| -rw-r--r-- | data/map_header_pointers.asm (renamed from engine/bank3f/data/map_header_pointers.asm) | 0 | ||||
| -rw-r--r-- | data/map_songs.asm (renamed from engine/bank3f/data/map_songs.asm) | 0 | ||||
| -rw-r--r-- | engine/bank3c.asm (renamed from engine/bank3c/main.asm) | 2 | ||||
| -rw-r--r-- | engine/bank3d.asm (renamed from engine/bank3d/main.asm) | 6 | ||||
| -rw-r--r-- | engine/bank3d/random.asm | 13 | ||||
| -rw-r--r-- | engine/bank3f.asm (renamed from engine/bank3f/main.asm) | 6 | ||||
| -rw-r--r-- | engine/battle/bank3d_battle.asm (renamed from engine/bank3d/bank3d_battle.asm) | 0 | ||||
| -rw-r--r-- | engine/menu/link_menu.asm (renamed from engine/bank3d/link_menu.asm) | 50 | ||||
| -rw-r--r-- | engine/overworld/advance_player_sprite.asm (renamed from engine/bank3c/overworld.asm) | 0 | ||||
| -rwxr-xr-x | engine/random.asm | 2 | ||||
| -rwxr-xr-x | yellow/main.asm | 6 |
13 files changed, 37 insertions, 49 deletions
diff --git a/charmap.asm b/charmap.asm index 65919932..c794549f 100644 --- a/charmap.asm +++ b/charmap.asm @@ -236,6 +236,7 @@ charmap "'m", $E5 charmap "?", $E6 charmap "!", $E7 charmap ".", $E8 +charmap "▷", $EC charmap "▶", $ED charmap "♂", $EF charmap "¥", $F0 diff --git a/engine/bank3f/data/map_header_banks.asm b/data/map_header_banks.asm index eeff1974..eeff1974 100644 --- a/engine/bank3f/data/map_header_banks.asm +++ b/data/map_header_banks.asm diff --git a/engine/bank3f/data/map_header_pointers.asm b/data/map_header_pointers.asm index c7dd0c9f..c7dd0c9f 100644 --- a/engine/bank3f/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm diff --git a/engine/bank3f/data/map_songs.asm b/data/map_songs.asm index b65822e7..b65822e7 100644 --- a/engine/bank3f/data/map_songs.asm +++ b/data/map_songs.asm diff --git a/engine/bank3c/main.asm b/engine/bank3c.asm index 468a6412..fa661614 100644 --- a/engine/bank3c/main.asm +++ b/engine/bank3c.asm @@ -152,7 +152,7 @@ PikachuCriesPointerTable: ; f008e (3c:408e) dbw BANK(PikachuCry41), PikachuCry41 ; 36:6746 dbw BANK(PikachuCry42), PikachuCry42 ; 38:6976 -INCLUDE "engine/bank3c/overworld.asm" +INCLUDE "engine/overworld/advance_player_sprite.asm" ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) ; Reset player status on blackout. diff --git a/engine/bank3d/main.asm b/engine/bank3d.asm index cc78a114..ef848679 100644 --- a/engine/bank3d/main.asm +++ b/engine/bank3d.asm @@ -303,7 +303,7 @@ Pointer_f468f:: ; f468f (3d:468f) PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" YellowLogoGraphics: INCBIN "gfx/yellow_titlescreen.2bpp" -INCLUDE "engine/bank3d/link_menu.asm" +INCLUDE "engine/menu/link_menu.asm" HandleMenuInputDouble:: ; f5a40 (3d:5a40) xor a @@ -684,10 +684,10 @@ GenerateRandomFishingEncounter: ; f5ec1 (3d:5ec1) ret INCLUDE "data/super_rod.asm" -INCLUDE "engine/bank3d/bank3d_battle.asm" +INCLUDE "engine/battle/bank3d_battle.asm" INCLUDE "engine/items/tm_prices.asm" INCLUDE "engine/multiply_divide.asm" INCLUDE "engine/give_pokemon.asm" INCLUDE "engine/battle/get_trainer_name.asm" -INCLUDE "engine/bank3d/random.asm" +INCLUDE "engine/random.asm" INCLUDE "engine/predefs.asm"
\ No newline at end of file diff --git a/engine/bank3d/random.asm b/engine/bank3d/random.asm deleted file mode 100644 index ddf042df..00000000 --- a/engine/bank3d/random.asm +++ /dev/null @@ -1,13 +0,0 @@ -Random_:: ; f67dc (3d:67dc) -; Generate a random 16-bit value. - ld a, [rDIV] - ld b, a - ld a, [hRandomAdd] - adc b - ld [hRandomAdd], a - ld a, [rDIV] - ld b, a - ld a, [hRandomSub] - sbc b - ld [hRandomSub], a - ret diff --git a/engine/bank3f/main.asm b/engine/bank3f.asm index 9552e07a..1bc32483 100644 --- a/engine/bank3f/main.asm +++ b/engine/bank3f.asm @@ -1,6 +1,6 @@ -INCLUDE "engine/bank3f/data/map_songs.asm" -INCLUDE "engine/bank3f/data/map_header_pointers.asm" -INCLUDE "engine/bank3f/data/map_header_banks.asm" +INCLUDE "data/map_songs.asm" +INCLUDE "data/map_header_pointers.asm" +INCLUDE "data/map_header_banks.asm" Func_fc4dd:: ; fc4dd (3f:44dd) ; possibly to test if pika should be out? diff --git a/engine/bank3d/bank3d_battle.asm b/engine/battle/bank3d_battle.asm index b9713cec..b9713cec 100644 --- a/engine/bank3d/bank3d_battle.asm +++ b/engine/battle/bank3d_battle.asm diff --git a/engine/bank3d/link_menu.asm b/engine/menu/link_menu.asm index a7b4ea9e..73e19038 100644 --- a/engine/bank3d/link_menu.asm +++ b/engine/menu/link_menu.asm @@ -6,19 +6,19 @@ Func_f531b:: ; f531b (3d:531b) xor a ld [wUnknownSerialFlag_d499],a coord hl, 0,0 - ld bc,$405 + lb bc, 4, 5 call TextBoxBorder ld de,Text_f5791 coord hl, 1,2 call PlaceString coord hl, 8,0 - ld bc,$80a + lb bc, 8, 10 call TextBoxBorder coord hl, 10,2 ld de,Text_f579c call PlaceString coord hl, 0,10 - ld bc,$612 + lb bc, 6, 18 call TextBoxBorder call UpdateSprites xor a @@ -514,7 +514,7 @@ Func_f56bd:: ; f56bd (3d:56bd) xor a ld [H_AUTOBGTRANSFERENABLED],a coord hl, 1,11 - ld bc,$612 + lb bc, 6, 18 call ClearScreenArea ld a,[wCurrentMenuItem] cp $3 @@ -643,7 +643,7 @@ LinkMenu: ; f580c (3d:580c) ld hl, ColosseumWhereToText call PrintText coord hl, 5, 3 - ld bc, $80d + lb bc, 8, 13 call TextBoxBorder call UpdateSprites coord hl, 7, 5 @@ -690,13 +690,13 @@ LinkMenu: ; f580c (3d:580c) ld b, a and $f0 cp $d0 - jr z, .asm_5c7d + jr z, .asm_f5c7d ld a, [wLinkMenuSelectionReceiveBuffer + 1] ld b, a and $f0 cp $d0 jr nz, .exchangeMenuSelectionLoop -.asm_5c7d +.asm_f5c7d ld a, b and $c ; did the enemy press A or B? jr nz, .enemyPressedAOrB @@ -730,10 +730,10 @@ LinkMenu: ; f580c (3d:580c) ld a, START_TRANSFER_INTERNAL_CLOCK ld [rSC], a .skipStartingTransfer - ld b, $7f - ld c, $7f - ld d, $7f - ld e, $ec + ld b, " " + ld c, " " + ld d, " " + ld e, "▷" ld a, [wLinkMenuSelectionSendBuffer] and (B_BUTTON << 2) ; was B button pressed? jr nz, .updateCursorPosition @@ -772,14 +772,14 @@ LinkMenu: ; f580c (3d:580c) ld [wd72d], a ld hl, ColosseumPleaseWaitText call PrintText - ld c, $32 + ld c, 50 call DelayFrames ld hl, wd732 res 1, [hl] ld a, [wAnimationID] ld [wDestinationMap], a callab SpecialWarpIn - ld c, $14 + ld c, 20 call DelayFrames xor a ld [wMenuJoypadPollCount], a @@ -803,10 +803,10 @@ LinkMenu: ; f580c (3d:580c) ld a,[wd11e] and a jr nz,.asm_f5974 - ld b,$7f - ld c,$7f - ld d,$ec - ld e,$7f + ld b," " + ld c," " + ld d,"▷" + ld e," " call Func_f59ec .asm_f5974 xor a @@ -848,10 +848,10 @@ LinkMenu: ; f580c (3d:580c) ld a,[wd11e] and a jr z,.asm_f59cd - ld b,$7f - ld c,$7f - ld d,$7f - ld e,$ec + ld b," " + ld c," " + ld d," " + ld e,"▷" call Func_f59ec jp .choseCancel @@ -861,10 +861,10 @@ LinkMenu: ; f580c (3d:580c) jp .choseCancel .asm_f59d6 - ld b,$7f - ld c,$7f - ld d,$ec - ld e,$7f + ld b," " + ld c," " + ld d,"▷" + ld e," " call Func_f59ec call Func_f531b jp c,.choseCancel diff --git a/engine/bank3c/overworld.asm b/engine/overworld/advance_player_sprite.asm index e02fb129..e02fb129 100644 --- a/engine/bank3c/overworld.asm +++ b/engine/overworld/advance_player_sprite.asm diff --git a/engine/random.asm b/engine/random.asm index 2fc83f6f..ddf042df 100755 --- a/engine/random.asm +++ b/engine/random.asm @@ -1,4 +1,4 @@ -Random_:: +Random_:: ; f67dc (3d:67dc) ; Generate a random 16-bit value. ld a, [rDIV] ld b, a diff --git a/yellow/main.asm b/yellow/main.asm index 39f39df5..ccdb4240 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -4283,11 +4283,11 @@ FreezeEnemyTrainerSprite: ; eaa02 (3a:6a02) SECTION "bank3C",ROMX,BANK[$3C] -INCLUDE "engine/bank3c/main.asm" +INCLUDE "engine/bank3c.asm" SECTION "bank3D",ROMX,BANK[$3D] -INCLUDE "engine/bank3d/main.asm" +INCLUDE "engine/bank3d.asm" SECTION "bank3E",ROMX,BANK[$3E] @@ -4301,4 +4301,4 @@ YellowIntroGraphics: INCBIN "gfx/yellow_intro.2bpp" SECTION "bank3F",ROMX,BANK[$3F] -INCLUDE "engine/bank3f/main.asm" +INCLUDE "engine/bank3f.asm" |