diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/crystal_misc.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_40.asm | 8 | ||||
| -rwxr-xr-x | misc/mobile_41.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_45.asm | 4 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 4 | ||||
| -rwxr-xr-x | misc/mobile_5c.asm | 6 | ||||
| -rw-r--r-- | misc/mobile_5f.asm | 2 | ||||
| -rw-r--r-- | misc/unused_title.asm | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 66f0a92ae..fb9637d4c 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -1,7 +1,7 @@ INCLUDE "includes.asm" -SECTION "Misc Crystal", ROMX, BANK[MISC_CRYSTAL] +SECTION "Misc Crystal", ROMX MobileAdapterGFX:: INCBIN "gfx/misc/mobile_adapter.2bpp" diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 3c7a34710..9bece8265 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -1784,7 +1784,7 @@ Function100ae7: ; 100ae7 ; 100b0a -SECTION "tetsuji", ROMX, BANK[$40] +SECTION "tetsuji", ROMX charmap " ", $20 ; revert to ascii @@ -1793,7 +1793,7 @@ Unknown_100b0a: ; 100b0a ; 100b12 -SECTION "bank40_2", ROMX, BANK[$40] +SECTION "bank40_2", ROMX Function100b12: ; 100b12 call Function100dd8 @@ -3831,7 +3831,7 @@ Function101826: ; 101826 ; 10186f -SECTION "ascii 10186f", ROMX, BANK[$40] +SECTION "ascii 10186f", ROMX charmap " ", $20 ; revert to ascii @@ -3852,7 +3852,7 @@ Unknown_101895: ; 1018a8 -SECTION "bank40_3", ROMX, BANK[$40] +SECTION "bank40_3", ROMX Function1018a8: ; 1018a8 ld hl, wccb5 diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index ff661b1bc..169107978 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -1,4 +1,4 @@ -SECTION "bank41_2", ROMX, BANK[$41] +SECTION "bank41_2", ROMX ; These functions deal with miscellaneous statistics ; which were used for Trainer Rankings in Pokémon News. diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 41f106211..d871b5006 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -1,5 +1,5 @@ -SECTION "bank45", ROMX, BANK[$45] +SECTION "bank45", ROMX charmap " ", $20 ; revert to ascii @@ -6835,7 +6835,7 @@ Unknown_117356: ; 117356 ; 117656 -SECTION "Mobile Stadium", ROMX, BANK[$45] +SECTION "Mobile Stadium", ROMX Special_GiveOddEgg: ; 117656 callba GiveOddEgg diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 7d0003b13..7a76927cf 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -1,4 +1,4 @@ -SECTION "bank46", ROMX, BANK[$46] +SECTION "bank46", ROMX Function118000: ; 118000 ld a, $1 @@ -3014,7 +3014,7 @@ Unknown_1196b8: ; 1196b8 db "Sun" ; 1196cd -SECTION "bank46_2", ROMX, BANK[$46] +SECTION "bank46_2", ROMX ; A hack to use ascii above. Function1196cd: ; 1196cd (46:56cd) diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index 34bdb15ad..d181de745 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -858,7 +858,7 @@ Function172e78: ; 172e78 (5c:6e78) ld bc, $168 call ByteFill call DisableLCD - ld hl, GFX_172f1f + ld hl, GameBoyN64GFX ld de, VTiles2 tile $00 ld bc, $610 call CopyBytes @@ -929,8 +929,8 @@ Palette_172edf: RGB 0, 0, 0 RGB 0, 0, 0 -GFX_172f1f: -INCBIN "gfx/unknown/172f1f.2bpp" +GameBoyN64GFX: +INCBIN "gfx/trade/game_boy_n64.2bpp" Tilemap_1733af: IF DEF(CRYSTAL11) diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 47b85dcd8..fdb5ca8b4 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -1,5 +1,5 @@ -SECTION "bank5F", ROMX, BANK[$5F] +SECTION "bank5F", ROMX Function17c000: ; 17c000 diff --git a/misc/unused_title.asm b/misc/unused_title.asm index 0f25e8a52..92ac409b1 100644 --- a/misc/unused_title.asm +++ b/misc/unused_title.asm @@ -1,5 +1,5 @@ -SECTION "bank43", ROMX, BANK[$43] +SECTION "bank43", ROMX UnusedTitleScreen: ; 10c000 |