summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xengine/movement.asm2
-rw-r--r--engine/namingscreen.asm6
-rwxr-xr-xengine/pack.asm14
-rwxr-xr-xengine/sprite_anims.asm26
-rwxr-xr-xengine/title.asm4
-rw-r--r--home.asm6
-rw-r--r--home/farcall.asm2
-rw-r--r--home/menu.asm4
-rw-r--r--home/text.asm2
-rw-r--r--home/vblank.asm2
-rwxr-xr-xitems/item_effects.asm2
-rw-r--r--macros.asm2
-rwxr-xr-xpredef/cgb.asm4
-rwxr-xr-xpredef/sgb.asm2
-rw-r--r--rst.asm2
-rwxr-xr-xsram.asm14
-rw-r--r--wram.asm42
17 files changed, 72 insertions, 64 deletions
diff --git a/engine/movement.asm b/engine/movement.asm
index 98640db1..74e44cd3 100755
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -63,7 +63,7 @@ Function5006: ; 5006 (1:5006)
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
Function500d: ; 500d (1:500d)
ld a, $1
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index abc831b2..a250ade9 100644
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -64,7 +64,7 @@ Function11b09: ; 11b09 (4:5b09)
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable
dw Function11b2a
@@ -338,7 +338,7 @@ Function11d27: ; 11d27 (4:5d27)
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
dw Function11d3a
@@ -1046,7 +1046,7 @@ Function123d5: ; 123d5 (4:63d5)
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
dw Function123e8
diff --git a/engine/pack.asm b/engine/pack.asm
index 78f709aa..03349b34 100755
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -22,7 +22,7 @@ Function10456: ; 10456 (4:4456)
ld a, [wce63]
ld hl, .Jumptable ; $4460
call Function10c9b
- jp [hl]
+ jp hl
.Jumptable
dw Pack_InitGFX
@@ -141,7 +141,7 @@ Pack_TMHMPocketMenu:
ld a, [wMenuCursorY]
dec a
call Function10c9b
- jp [hl]
+ jp hl
TMHMPocketSubmenuDataHeader_NoGive:
db $40
@@ -294,7 +294,7 @@ Function105f5: ; 105f5 (4:45f5)
ld a, [wMenuCursorY]
dec a
call Function10c9b
- jp [hl]
+ jp hl
ItemSubmenuDataHeader_UseGiveTossSelQuit:
db $40 ; flags
@@ -639,7 +639,7 @@ Function108e9: ; 108e9 (4:48e9)
ld a, [wce63]
ld hl, .Jumptable
call Function10c9b
- jp [hl]
+ jp hl
.Jumptable
dw BattlePack_InitGFX
@@ -793,7 +793,7 @@ Function10a0c: ; 10a0c (4:4a0c)
ld a, [wMenuCursorY]
dec a
call Function10c9b
- jp [hl]
+ jp hl
BattlePackUseQuitMenuDataHeader:
db $40 ; flags
@@ -928,7 +928,7 @@ Function10af7: ; 10af7 (4:4af7)
ld a, [wce63]
ld hl, .Jumptable
call Function10c9b
- jp [hl]
+ jp hl
.Jumptable
dw DepositOrSell_ItemPocket
@@ -1071,7 +1071,7 @@ Function10c07: ; 10c07 (4:4c07)
ld a, [wce63]
ld hl, $4c11
call Function10c9b
- jp [hl]
+ jp hl
.Jumptable
dw TutorialItems
diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm
index 609cbc99..2877539d 100755
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -9,7 +9,7 @@ DoAnimFrame: ; 8d463
ld a, [hli] ; 23:546f
ld h, [hl] ; 23:5470
ld l, a ; 23:5471
- jp [hl] ; 23:5472
+ jp hl ; 23:5472
.Jumptable: ; 23:5473
dw Function8d4c7
@@ -166,7 +166,7 @@ Function8d54e: ; 8d54e
Function8d55d: ; 8d55d
call Function8dbdd ; 23:555d
- jp [hl] ; 23:5560
+ jp hl ; 23:5560
; anonymous jumptable
dw Function8d565
@@ -236,7 +236,7 @@ Function8d5bb: ; 8d5bb
Function8d5bf: ; 8d5bf
call Function8dbdd ; 23:55bf
- jp [hl] ; 23:55c2
+ jp hl ; 23:55c2
; anonymous jumptable
dw Function8d5c9
@@ -310,7 +310,7 @@ Function8d60b: ; 8d60b
Function8d623: ; 8d623
call Function8dbdd ; 23:5623
- jp [hl] ; 23:5626
+ jp hl ; 23:5626
; anonymous jumptable
dw Function8d62b
@@ -359,7 +359,7 @@ Function8d667: ; 8d667
Function8d66b: ; 8d66b
call Function8dbdd ; 23:566b
- jp [hl] ; 23:566e
+ jp hl ; 23:566e
; anonymous jumptable
dw Function8d673
@@ -388,7 +388,7 @@ Function8d68c: ; 8d68c
Function8d690: ; 8d690
call Function8dbdd ; 23:5690
- jp [hl] ; 23:5693
+ jp hl ; 23:5693
; anonymous jumptable
dw Function8d69c
@@ -472,7 +472,7 @@ Function8d6fe: ; 8d6fe
Function8d702: ; 8d702
call Function8dbdd ; 23:5702
- jp [hl] ; 23:5705
+ jp hl ; 23:5705
; anonymous jumptable
dw Function8d70c
@@ -545,7 +545,7 @@ Function8d761: ; 8d761
Function8d765: ; 8d765
call Function8dbdd ; 23:5765
- jp [hl] ; 23:5768
+ jp hl ; 23:5768
; anonymous jumptable
dw Function8d76d
@@ -600,7 +600,7 @@ Function8d786: ; 8d786
Function8d7b1: ; 8d7b1
call Function8dbdd ; 23:57b1
- jp [hl] ; 23:57b4
+ jp hl ; 23:57b4
; anonymous jumptable
dw Function8d7b9
@@ -643,7 +643,7 @@ Function8d7c9: ; 8d7c9
Function8d7ef: ; 8d7ef
call Function8dbdd ; 23:57ef
- jp [hl] ; 23:57f2
+ jp hl ; 23:57f2
; anonymous jumptable
dw Function8d7f7
@@ -686,7 +686,7 @@ Function8d807: ; 8d807
Function8d82d: ; 8d82d
call Function8dbdd ; 23:582d
- jp [hl] ; 23:5830
+ jp hl ; 23:5830
; anonymous jumptable
dw Function8d835
@@ -784,7 +784,7 @@ Function8d8b8: ; 8d8b8
Function8d8bf: ; 8d8bf
call Function8dbdd ; 23:58bf
- jp [hl] ; 23:58c2
+ jp hl ; 23:58c2
; anonymous jumptable
dw Function8d8c7
@@ -1038,7 +1038,7 @@ Function8da2a: ; 8da2a
Function8da31: ; 8da31
call Function8dbdd ; 23:5a31
- jp [hl] ; 23:5a34
+ jp hl ; 23:5a34
ld b, c ; 23:5a35
ld e, d ; 23:5a36
add e ; 23:5a37
diff --git a/engine/title.asm b/engine/title.asm
index c0c5006c..6f6a6d8c 100755
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -31,7 +31,7 @@ StartTitleScreen:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable
dw MainMenu_
@@ -271,7 +271,7 @@ Function640f: ; 640f (1:640f)
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable
dw Function6426
diff --git a/home.asm b/home.asm
index 1af9effd..027687de 100644
--- a/home.asm
+++ b/home.asm
@@ -4,12 +4,12 @@ INCLUDE "includes.asm"
INCLUDE "rst.asm"
INCLUDE "interrupts.asm"
-SECTION "start", HOME[$100]
+SECTION "start", ROM0[$100]
Start::
nop
jp _Start
-SECTION "bank0", HOME[$150]
+SECTION "bank0", ROM0[$150]
INCLUDE "home/vblank.asm"
INCLUDE "home/delay.asm"
INCLUDE "home/rtc.asm"
@@ -185,7 +185,7 @@ INCLUDE "home/random.asm"
INCLUDE "home/sram.asm"
jp_hl::
- jp [hl]
+ jp hl
jp_de::
push de
diff --git a/home/farcall.asm b/home/farcall.asm
index cff96439..e1d46449 100644
--- a/home/farcall.asm
+++ b/home/farcall.asm
@@ -19,4 +19,4 @@ FarCall_hl:: ; 2e27 (0:2e27)
ret
._hl_
- jp [hl]
+ jp hl
diff --git a/home/menu.asm b/home/menu.asm
index ee95bd50..91272113 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -290,7 +290,7 @@ RunMenuItemPrintingFunction:: ; 1d44 (0:1d44)
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
InitMenuCursorAndButtonPermissions:: ; 1d69 (0:1d69)
call InitVerticalMenuCursor
@@ -405,7 +405,7 @@ MenuJumptable::
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
GetMenuDataPointerTableEntry:: ; 1e1b (0:1e1b)
ld e, a
diff --git a/home/text.asm b/home/text.asm
index 4ea9b6db..5c749208 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -732,7 +732,7 @@ Text_TX_SCROLL:: ; 1342 (0:1342)
ret
Text_TX_ASM:: ; 1351 (0:1351)
- jp [hl]
+ jp hl
Text_TX_NUM:: ; 1352 (0:1352)
ld a, [hli]
diff --git a/home/vblank.asm b/home/vblank.asm
index 77e68b91..07113cd3 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -15,7 +15,7 @@ VBlank::
ld l, a
ld de, .return
push de
- jp [hl]
+ jp hl
.return
call GameTimer
pop hl
diff --git a/items/item_effects.asm b/items/item_effects.asm
index b276c1e8..d2d32ae4 100755
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -253,7 +253,7 @@ UltraBall: ; e926
ld l, a
ld de, .skip_or_return_from_ball_fn
push de
- jp [hl]
+ jp hl
.skip_or_return_from_ball_fn
ld a, [wd002]
diff --git a/macros.asm b/macros.asm
index 58496376..39e3f7d7 100644
--- a/macros.asm
+++ b/macros.asm
@@ -292,7 +292,7 @@ jumptable: MACRO
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
endm
maskbits: macro
diff --git a/predef/cgb.asm b/predef/cgb.asm
index e9273b7d..5935eb19 100755
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -22,7 +22,7 @@ Predef_LoadSGBLayoutCGB:
ld l, a
ld de, .return
push de
- jp [hl]
+ jp hl
.return
ret
@@ -444,7 +444,7 @@ Function96b7: ; 96b7 (2:56b7)
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
dw Function96c8
diff --git a/predef/sgb.asm b/predef/sgb.asm
index 6a239600..fc5747bf 100755
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -18,7 +18,7 @@ Predef_LoadSGBLayout: ; 8c2d (2:4c2d)
ld l, a
ld de, FinishSGBPredefFunction
push de
- jp [hl]
+ jp hl
.Jumptable
dw Function8c90
diff --git a/rst.asm b/rst.asm
index c54dc83e..24c00a03 100644
--- a/rst.asm
+++ b/rst.asm
@@ -28,7 +28,7 @@ SECTION "rst28",ROM0[JumpTable]
ld h, [hl]
ld l, a
pop de
- jp [hl]
+ jp hl
; SECTION "rst30",ROM0[$30]
; rst30 is midst rst28
diff --git a/sram.asm b/sram.asm
index 176d7a92..141d2f67 100755
--- a/sram.asm
+++ b/sram.asm
@@ -1,10 +1,10 @@
-SECTION "Scratch", SRAM, BANK[0]
+SECTION "Scratch", SRAM[$a000], BANK[0]
sScratch:: ds $188 ; a000
-SECTION "Decompress Buffer", SRAM, BANK[0]
+SECTION "Decompress Buffer", SRAM[$a188], BANK[0]
sDecompressBuffer:: ds 7 * 7 * $10 ; a188
-SECTION "SRAM0", SRAM, BANK[$0]
+SECTION "SRAM0", SRAM[$a498], BANK[$0]
s0_a498:: ds 1 ; 0:a498
s0_a499:: ds 1 ; 0:a499
s0_a49a:: ds 1 ; 0:a49a
@@ -7021,7 +7021,7 @@ s0_bffd:: ds 1 ; 0:bffd
s0_bffe:: ds 1 ; 0:bffe
sWindowStackTop:: ds 1 ; 0:bfff
-SECTION "SRAM1", SRAM, BANK[$1]
+SECTION "SRAM1", SRAM[$a000], BANK[$1]
s1_a000:: ds 1 ; 1:a000
s1_a001:: ds 1 ; 1:a001
s1_a002:: ds 1 ; 1:a002
@@ -10459,7 +10459,7 @@ s1_ad69:: ds 1 ; 1:ad69
s1_ad6a:: ds 1 ; 1:ad6a
s1_ad6b:: ds 1 ; 1:ad6b
-SECTION "Active Box", SRAM, BANK[1]
+SECTION "Active Box", SRAM[$ad6c], BANK[1]
; 1:ad6c
box sBox
; 1:b1bc
@@ -14117,7 +14117,7 @@ s1_bffd:: ds 1 ; 1:bffd
s1_bffe:: ds 1 ; 1:bffe
s1_bfff:: ds 1 ; 1:bfff
-SECTION "SRAM2", SRAM, BANK[$2]
+SECTION "SRAM2", SRAM[$a000], BANK[$2]
box sBox1
box sBox2
box sBox3
@@ -14126,7 +14126,7 @@ SECTION "SRAM2", SRAM, BANK[$2]
box sBox6
box sBox7
-SECTION "SRAM3", SRAM, BANK[$3]
+SECTION "SRAM3", SRAM[$a000], BANK[$3]
box sBox8
box sBox9
box sBox10
diff --git a/wram.asm b/wram.asm
index c7453be5..ac3646a0 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1,7 +1,7 @@
INCLUDE "includes.asm"
INCLUDE "macros/wram.asm"
-SECTION "Audio", WRAM0
+SECTION "Audio", WRAM0[$c000]
wc000::
wMusic::
wMusicPlaying:: ; c000
@@ -123,7 +123,7 @@ wMapMusic:: ; c1c0
wDontPlayMapMusicOnReload:: ds 1
wMusicEnd::
-SECTION "WRAM", WRAM0
+SECTION "WRAM", WRAM0[$c1c2]
wLZAddress:: dw ; c1c2
wLZBank:: ds 1 ; c1c4
wc1c5:: ds 1 ; c1c5
@@ -185,7 +185,7 @@ wc1fd:: ds 1 ; c1fd
wc1fe:: ds 1 ; c1fe
wc1ff:: ds 1 ; c1ff
-SECTION "GBC Palettes", WRAM0
+SECTION "GBC Palettes", WRAM0[$c200]
palbuffer: MACRO
\1Pal0:: ds 8
\1Pal1:: ds 8
@@ -202,16 +202,16 @@ wTempOBPals:: palbuffer wTempOB ; c240
wBGPals:: palbuffer wBG ; c280
wOBPals:: palbuffer wOB ; c2c0
-SECTION "OAM Buffer", WRAM0
+SECTION "OAM Buffer", WRAM0[$c300]
wOAMBuffer:: ; c300
ds 4 * 40
-SECTION "TileMap", WRAM0
+SECTION "TileMap", WRAM0[$c3a0]
wTileMap:: ; c3a0
ds SCREEN_HEIGHT * SCREEN_WIDTH
wTileMapEnd:: ; c508
-SECTION "Animated Objects", WRAM0
+SECTION "Animated Objects", WRAM0[$c508]
wMisc:: ; c508
wTileMapBackup:: ; c508
; ds SCREEN_HEIGHT * SCREEN_WIDTH
@@ -1812,7 +1812,7 @@ wcc1d:: ds 1 ; cc1d
wcc1e:: ds 1 ; cc1e
wcc1f:: ds 1 ; cc1f
-SECTION "Video", WRAM0
+SECTION "Video", WRAM0[$cc20]
wBGMapBuffer:: ds 1 ; cc20
wcc21:: ds 1 ; cc21
wcc22:: ds 1 ; cc22
@@ -2324,14 +2324,17 @@ wStringBuffer1:: ds 19 ; cf6b
wStringBuffer2:: ds 19 ; cf7e
wStringBuffer3:: ds 19 ; cf91
wStringBuffer4:: ds 19 ; cfa4
-wStringBuffer5:: ds 19 ; cfb7
-
- ds -4
+UNION
+wStringBuffer5:: ds 19 ; cfb7
+NEXTU
+ ds 15
wCurBattleMon:: ds 1 ; cfc6
wcfc7:: ds 1 ; cfc7
wcfc8:: ds 1 ; cfc8
wPartyMenuCursor:: ds 1 ; cfc9
+ENDU
+
wcfca:: ds 1 ; cfca
wcfcb:: ds 1 ; cfcb
wcfcc:: ds 1 ; cfcc
@@ -2384,7 +2387,7 @@ wcffd:: ds 1 ; cffd
wcffe:: ds 1 ; cffe
wcfff:: ds 1 ; cfff
-SECTION "WRAM1", WRAMX, BANK[$1]
+SECTION "WRAM1", WRAMX[$d000], BANK[$1]
wd000:: ds 1 ; d000
wd001:: ds 1 ; d001
wd002:: ds 1 ; d002
@@ -2526,6 +2529,7 @@ wTilesetPalettes:: dw ; d0cf
wd0d1:: ds 1 ; d0d1
wd0d2:: ds 1 ; d0d2
+UNION
wCurHPAnim::
wCurHPAnimMaxHP:: dw ; d0d3
wCurHPAnimOldHP:: dw ; d0d5
@@ -2537,7 +2541,7 @@ wCurHPAnimDeltaHP:: dw ; d0dc
wCurHPAnimLowHP:: db ; d0de
wCurHPAnimHighHP:: db ; d0df
wCurHPAnimEnd::
- ds wCurHPAnim - @
+NEXTU
wBuffer1:: ds 1 ; d0d3
wBuffer2:: ds 1 ; d0d4
@@ -2552,6 +2556,7 @@ wd0dc:: ds 1 ; d0dc
wd0dd:: ds 1 ; d0dd
wd0de:: ds 1 ; d0de
wd0df:: ds 1 ; d0df
+ENDU
wd0e0:: ds 1 ; d0e0
wd0e1:: ds 1 ; d0e1
wd0e2:: ds 1 ; d0e2
@@ -2643,7 +2648,7 @@ wd151:: ds 1 ; d151
wd152:: ds 1 ; d152
wd153:: ds 1 ; d153
wd154:: ds 1 ; d154
-wROMBankBackup:: ds 1
+wROMBankBackup:: ds 1 ; d155
wBuffer:: ds 1 ; d156
wTimeOfDay:: ds 1 ; d157
wd158:: ds 1 ; d158
@@ -2721,7 +2726,7 @@ wd19e:: ds 1 ; d19e
wd19f:: ds 1 ; d19f
wd1a0:: ds 1 ; d1a0
-SECTION "Game Data", WRAMX, BANK[1]
+SECTION "Game Data", WRAMX[$d1a1], BANK[1]
wGameData::
wPlayerID:: dw ; d1a1
@@ -3627,7 +3632,7 @@ wda1f:: ds 1 ; da1f
wda20:: ds 1 ; da20
wda21:: ds 1 ; da21
-SECTION "Party", WRAMX, BANK[1]
+SECTION "Party", WRAMX[$da22], BANK[1]
wPokemonData::
wPartyCount:: ds 1 ; da22
@@ -3862,7 +3867,7 @@ wdd52:: ds 1 ; dd52
wdd53:: ds 1 ; dd53
wdd54:: ds 1 ; dd54
-SECTION "OT Party", WRAMX, BANK[1]
+SECTION "OT Party", WRAMX[$dd55], BANK[1]
wOTPartyCount:: ds 1 ; dd55
wOTPartySpecies:: ds PARTY_LENGTH ; dd56
@@ -3871,6 +3876,8 @@ wOTPartySpeciesEnd:: ds 1 ; dd5c
; The tutorial pack uses the OT party space.
; It's placed here rather than at wOTPartyCount
; to avoid confusing the game.
+
+UNION
wDudePack::
wDudeNumItems:: ds 1 ; dd5d
wDudeItems:: ds 2 * 4 ; dd5e
@@ -3884,7 +3891,7 @@ wDudeNumBalls:: ds 1 ; dd7b
wDudeBalls:: ds 2 * 4 ; dd7c
wDudeBallsEnd:: ds 1 ; dd84
wDudePackEnd::
- ds wDudePack - @
+NEXTU
wOTPartyMons::
wOTPartyMon1:: party_struct wOTPartyMon1 ; dd5d
@@ -3909,6 +3916,7 @@ wOTPartyMon3Nickname:: ds PKMN_NAME_LENGTH ; ded5
wOTPartyMon4Nickname:: ds PKMN_NAME_LENGTH ; dee0
wOTPartyMon5Nickname:: ds PKMN_NAME_LENGTH ; deeb
wOTPartyMon6Nickname:: ds PKMN_NAME_LENGTH ; def6
+ENDU
wGameDataEnd::
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 20:18:32 +0000