diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/audio/music1.asm | 6 | ||||
| -rwxr-xr-x | src/audio/music2.asm | 6 | ||||
| -rwxr-xr-x | src/engine/bank1.asm | 50 | ||||
| -rwxr-xr-x | src/engine/bank1c.asm | 16 | ||||
| -rwxr-xr-x | src/engine/bank2.asm | 46 | ||||
| -rwxr-xr-x | src/engine/bank20.asm | 24 | ||||
| -rwxr-xr-x | src/engine/bank3.asm | 66 | ||||
| -rwxr-xr-x | src/engine/bank4.asm | 84 | ||||
| -rwxr-xr-x | src/engine/bank5.asm | 10 | ||||
| -rwxr-xr-x | src/engine/bank6.asm | 12 | ||||
| -rwxr-xr-x | src/engine/bank7.asm | 38 | ||||
| -rwxr-xr-x | src/engine/bank8.asm | 6 | ||||
| -rwxr-xr-x | src/engine/boosters.asm | 2 | ||||
| -rw-r--r-- | src/engine/effect_functions.asm | 16 | ||||
| -rwxr-xr-x | src/engine/home.asm | 144 | ||||
| -rw-r--r-- | src/gfx.asm | 16 | ||||
| -rw-r--r-- | src/macros/code.asm | 4 |
17 files changed, 275 insertions, 271 deletions
diff --git a/src/audio/music1.asm b/src/audio/music1.asm index aa4ef5c..11394a3 100755 --- a/src/audio/music1.asm +++ b/src/audio/music1.asm @@ -1853,10 +1853,10 @@ Music1_ChannelLoopStacks: ; f4c20 (3d:4c20) dw wMusicCh4Stack Unknown_f4c28: ; f4c28 (3d:4c28) -INCBIN "baserom.gbc",$f4c28,$f4c30 - $f4c28 + INCROM $f4c28, $f4c30 Unknown_f4c30: ; f4c30 (3d:4c30) -INCBIN "baserom.gbc",$f4c30,$f4cda - $f4c30 + INCROM $f4c30, $f4cda Music1_WaveInstruments: ; f4cda (3d:4cda) INCLUDE "audio/wave_instruments.asm" @@ -1868,7 +1868,7 @@ Music1_VibratoTypes: ; f4dde (3d:4dde) INCLUDE "audio/vibrato_types.asm" Unknown_f4e85: ; f4e85 (3d:4e85) -INCBIN "baserom.gbc",$f4e85,$f4ee5 - $f4e85 + INCROM $f4e85, $f4ee5 INCLUDE "audio/music1_headers.asm" diff --git a/src/audio/music2.asm b/src/audio/music2.asm index aac0de8..fd67ae2 100755 --- a/src/audio/music2.asm +++ b/src/audio/music2.asm @@ -1853,10 +1853,10 @@ Music2_ChannelLoopStacks: ; f8c20 (3e:4c20) dw wMusicCh4Stack Unknown_f8c28: ; f8c28 (3e:4c28) -INCBIN "baserom.gbc",$f8c28,$f8c30 - $f8c28 + INCROM $f8c28, $f8c30 Unknown_f8c30: ; f8c30 (3e:4c30) -INCBIN "baserom.gbc",$f8c30,$f8cda - $f8c30 + INCROM $f8c30, $f8cda Music2_WaveInstruments: ; f8cda (3e:4cda) INCLUDE "audio/wave_instruments.asm" @@ -1868,7 +1868,7 @@ Music2_VibratoTypes: ; f8dde (3e:4dde) INCLUDE "audio/vibrato_types.asm" Unknown_f8e85: ; f8e85 (3e:4e85) -INCBIN "baserom.gbc",$f8e85,$f8ee5 - $f8e85 + INCROM $f8e85, $f8ee5 INCLUDE "audio/music2_headers.asm" diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm index 3a3c6d6..a524905 100755 --- a/src/engine/bank1.asm +++ b/src/engine/bank1.asm @@ -39,10 +39,10 @@ Func_4050: ; 4050 (1:4050) ret Func_405a: ; 405a (1:405a) -INCBIN "baserom.gbc",$405a,$406f - $405a + INCROM $405a, $406f Func_406f: ; 406f (1:406f) -INCBIN "baserom.gbc",$406f,$409f - $406f + INCROM $406f, $409f ; this function begins the duel after the opponent's ; graphics, name and deck have been introduced @@ -231,7 +231,7 @@ StartDuel: ; 409f (1:409f) ret ; 0x420b -INCBIN "baserom.gbc",$420b,$4225 - $420b + INCROM $420b, $4225 HandleTurn: ; 4225 (1:4225) ld a, DUELVARS_DUELIST_TYPE @@ -344,7 +344,7 @@ BattleMenuFunctionTable: ; 42f1 (1:42f1) dw PlayerRetreat dw PlayerEndTurn -INCBIN "baserom.gbc",$42fd, $430b - $42fd + INCROM $42fd, $430b Func_430b: ; 430b (1:430b) call Func_4329 @@ -382,7 +382,7 @@ Func_4339: ; 4339 (1:4339) Func_4342: ; 4342 (1:4342) jp $5550 -INCBIN "baserom.gbc",$4345, $438e - $4345 + INCROM $4345, $438e OpenPokemonPowerMenu: ; 438e (1:438e) call $6431 @@ -467,7 +467,7 @@ OpenHandMenu: ; 4425 (1:4425) jp PrintDuelMenu Func_4436: ; 4436 (1:4436) -INCBIN "baserom.gbc",$4436, $4477 - $4436 + INCROM $4436, $4477 ; c contains the energy card being played PlayerUseEnergyCard: ; 4477 (1:4477) @@ -521,14 +521,14 @@ PlayerUseEnergyCard: ; 4477 (1:4477) jp $4447 ; 0x44db -INCBIN "baserom.gbc",$44db, $4585 - $44db + INCROM $44db, $4585 OpenBattleCheckMenu: ; 4585 (1:4585) call Func_3b31 call Func_3096 jp Func_426d -INCBIN "baserom.gbc",$458e, $46fc - $458e + INCROM $458e, $46fc OpenBattleAttackMenu: ; 46fc (1:46fc) call HandleCantAttackSubstatus @@ -929,7 +929,7 @@ CheckIfActiveCardParalyzedOrAsleep: ; 4918 (1:4918) scf ret -INCBIN "baserom.gbc",$4933, $4b60 - $4933 + INCROM $4933, $4b60 Func_4b60: ; 4b60 (1:4b60) call $7107 @@ -1058,7 +1058,7 @@ Func_4b60: ; 4b60 (1:4b60) ; 0x4c77 -INCBIN "baserom.gbc",$4c77, $4cd5 - $4c77 + INCROM $4c77, $4cd5 ; Select Basic Pokemon From Hand Func_4cd5: ; 4cd5 (1:4cd5) @@ -1163,13 +1163,13 @@ Func_4cd5: ; 4cd5 (1:4cd5) ; 0x4d97 -INCBIN "baserom.gbc",$4d97, $5aeb - $4d97 + INCROM $4d97, $5aeb Func_5aeb: ; 5aeb (1:5aeb) -INCBIN "baserom.gbc",$5aeb,$6785 - $5aeb + INCROM $5aeb, $6785 Func_6785: ; 6785 (1:6785) -INCBIN "baserom.gbc",$6785,$6793 - $6785 + INCROM $6785, $6793 ; loads player deck from SRAM to wPlayerDeck LoadPlayerDeck: ; 6793 (1:6793) @@ -1192,7 +1192,7 @@ LoadPlayerDeck: ; 6793 (1:6793) ret ; 0x67b2 -INCBIN "baserom.gbc",$67b2,$67be - $67b2 + INCROM $67b2, $67be ; related to ai taking their turn in a duel ; called multiple times during one ai turn @@ -1233,7 +1233,7 @@ AIMakeDecision: ; 67be (1:67be) ret ; 0x67fb -INCBIN "baserom.gbc",$67fb,$695e - $67fb + INCROM $67fb, $695e AIMoveTable: ; 695e (1:695e) dw Func_0f35 @@ -1260,7 +1260,7 @@ AIMoveTable: ; 695e (1:695e) dw $6b15 dw $6b20 -INCBIN "baserom.gbc",$698c,$69a5 - $698c + INCROM $698c, $69a5 AIUseEnergyCard: ; 69a5 (1:69a5) ld a, [$ffa1] @@ -1279,7 +1279,7 @@ AIUseEnergyCard: ; 69a5 (1:69a5) ret ; 0x69c5 -INCBIN "baserom.gbc",$69c5,$6d84 - $69c5 + INCROM $69c5, $6d84 ; converts clefairy doll/mysterious fossil at specified wLoadedCard to pokemon card ConvertTrainerCardToPokemon: @@ -1336,7 +1336,7 @@ ConvertTrainerCardToPokemon: db UNABLE_RETREAT ; retreat cost ds $0d ; PKMN_CARD_DATA_LENGTH - (wLoadedCard1RetreatCost + 1 - wLoadedCard1) -INCBIN "baserom.gbc",$6df1,$7107 - $6df1 + INCROM $6df1, $7107 ; initializes duel variables such as cards in deck and in hand, or Pokemon in play area ; player turn: [c200, c2ff] @@ -1381,7 +1381,7 @@ InitializeDuelVariables: ; 7107 (1:7107) ret ; 0x7133 -INCBIN "baserom.gbc",$7133,$71ad - $7133 + INCROM $7133, $71ad _TossCoin: ; 71ad (1:71ad) ld [wcd9c], a @@ -1577,29 +1577,29 @@ _TossCoin: ; 71ad (1:71ad) ret ; 0x72ff -INCBIN "baserom.gbc",$72ff,$7354 - $72ff + INCROM $72ff, $7354 BuildVersion: ; 7354 (1:7354) db "VER 12/20 09:36",TX_END -INCBIN "baserom.gbc",$7364,$7571 - $7364 + INCROM $7364, $7571 Func_7571: ; 7571 (1:7571) -INCBIN "baserom.gbc",$7571,$7576 - $7571 + INCROM $7571, $7576 Func_7576: ; 7576 (1:7576) farcallx $6, $591f ret ; 0x757b -INCBIN "baserom.gbc",$757b,$758f - $757b + INCROM $757b, $758f Func_758f: ; 758f (1:758f) -INCBIN "baserom.gbc",$758f,$7594 - $758f + INCROM $758f, $7594 Func_7594: ; 7594 (1:7594) farcallx $6, $661f ret ; 0x7599 -INCBIN "baserom.gbc",$7599,$8000 - $7599
\ No newline at end of file + INCROM $7599, $8000
\ No newline at end of file diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm index 9abadde..7ceb0dc 100755 --- a/src/engine/bank1c.asm +++ b/src/engine/bank1c.asm @@ -22,7 +22,7 @@ Func_70018: ; 70018 (1c:4018) ret ; 0x70024 -INCBIN "baserom.gbc",$70024,$70044 - $70024 + INCROM $70024, $70044 Func_70044: ; 70044 (1c:4044) push hl @@ -41,7 +41,7 @@ Func_70044: ; 70044 (1c:4044) ret Unknown_70057: ; 70057 (1c:4057) -INCBIN "baserom.gbc",$70057,$70082 - $70057 + INCROM $70057, $70082 Func_70082: ; 70082 (1c:4082) ld a, [wConsole] @@ -108,11 +108,11 @@ Func_700a3: ; 700a3 (1c:40a3) ; CHR_TRN: tiles $00-$7F, BG (border) tiles (from SNES $000-$FFF) SGB_700de: ; 700de (1c:40de) -INCBIN "baserom.gbc",$700de,$700ee - $700de + INCROM $700de, $700ee ; CHR_TRN: tiles $80-$FF, BG (border) tiles (from SNES $000-$FFF) SGB_700ee: ; 700ee (1c:40ee) -INCBIN "baserom.gbc",$700ee,$700fe - $700ee + INCROM $700ee, $700fe Func_700fe: ; 700fe (1c:40fe) push hl @@ -140,7 +140,7 @@ Func_700fe: ; 700fe (1c:40fe) ; PCT_TRN: read tile map & palette data into VRAM (from SNES $000-$87F) SGB_70126: ; 70126 (1c:4126) -INCBIN "baserom.gbc",$70126,$70136 - $70126 + INCROM $70126, $70136 Func_70136: ; 70136 (1c:4136) push hl @@ -200,11 +200,11 @@ Func_70177: ; 70177 (1c:4177) ; MASK_EN on SGB_MASK_EN_ON_701a0: ; 701a0 (1c:41a0) -INCBIN "baserom.gbc",$701a0,$701b0 - $701a0 + INCROM $701a0, $701b0 ; MASK_EN off SGB_MASK_EN_OFF_701b0: ; 701b0 (1c:41b0) -INCBIN "baserom.gbc",$701b0,$701c0 - $701b0 + INCROM $701b0, $701c0 Func_701c0: ; 701c0 (1c:41c0) push hl @@ -311,4 +311,4 @@ Func_70214: ; 70214 (1c:4214) ret Unknown_7024a: ; 7024a (1c:424a) -INCBIN "baserom.gbc",$7024a,$74000 - $7024a + INCROM $7024a, $74000 diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm index a721a74..a62d1ce 100755 --- a/src/engine/bank2.asm +++ b/src/engine/bank2.asm @@ -1,4 +1,4 @@ -INCBIN "baserom.gbc",$8000,$8cd4 - $8000 + INCROM $8000, $8cd4 Func_8cd4: ; 8cd4 (2:4cd4) push bc @@ -17,7 +17,7 @@ Func_8cd4: ; 8cd4 (2:4cd4) ret ; 0x8ce7 -INCBIN "baserom.gbc",$8ce7,$8cf9 - $8ce7 + INCROM $8ce7, $8cf9 Func_8cf9: ; 8cf9 (2:4cf9) call EnableExtRAM @@ -37,7 +37,7 @@ Func_8d0b: ; 8d0b (2:4d0b) ret Unknown_8d15: ; 8d15 (2:4d15) -INCBIN "baserom.gbc",$8d15,$8d56 - $8d15 + INCROM $8d15, $8d56 Func_8d56: ; 8d56 (2:4d56) xor a @@ -55,7 +55,7 @@ Func_8d56: ; 8d56 (2:4d56) ret ; 0x8d78 -INCBIN "baserom.gbc",$8d78,$8d9d - $8d78 + INCROM $8d78, $8d9d Func_8d9d: ; 8d9d (2:4d9d) ld de, $cfd1 @@ -69,7 +69,7 @@ Func_8d9d: ; 8d9d (2:4d9d) ret Unknown_8da9: ; 8da9 (2:4da9) -INCBIN "baserom.gbc",$8da9,$8db0 - $8da9 + INCROM $8da9, $8db0 Func_8db0: ; 8db0 (2:4db0) ld hl, Unknown_8da9 @@ -97,7 +97,7 @@ Func_8dbc: ; 8dbc (2:4dbc) jp Func_8e42 Unknown_8de2: ; 8de2 (2:4de2) -INCBIN "baserom.gbc",$8de2,$8dea - $8de2 + INCROM $8de2, $8dea Func_8dea: ; 8dea (2:4dea) ldh a, [hButtonsPressed2] @@ -372,13 +372,13 @@ Func_8ff2: ; 8ff2 (2:4ff2) ret ; 0x9001 -INCBIN "baserom.gbc",$9001,$9026 - $9001 + INCROM $9001, $9026 Func_9026: ; 9026 (2:5026) ret Unknown_9027: ; 9027 (2:5027) -INCBIN "baserom.gbc",$9027,$9038 - $9027 + INCROM $9027, $9038 Func_9038: ; 9038 (2:5038) ld a, [wceb1] @@ -540,7 +540,7 @@ Func_910a: ; 910a (2:510a) ret ; 0x9120 -INCBIN "baserom.gbc",$9120,$9152 - $9120 + INCROM $9120, $9152 Func_9152: ; 9152 (2:5152) push hl @@ -662,7 +662,7 @@ Func_9168: ; 9168 (2:5168) ret Unknown_9242: ; 9242 (2:5242) -INCBIN "baserom.gbc",$9242,$9253 - $9242 + INCROM $9242, $9253 Func_9253: ; 9253 (2:5253) ld de, wc590 @@ -709,7 +709,7 @@ Func_926e: ; 926e (2:526e) ret Unknown_92a7: ; 92a7 (2:52a7) -INCBIN "baserom.gbc",$92a7,$92ad - $92a7 + INCROM $92a7, $92ad Func_92ad: ; 92ad (2:52ad) ld a, [hli] @@ -726,7 +726,7 @@ Func_92b4: ; 92b4 (2:52b4) ret ; 0x92be -INCBIN "baserom.gbc",$92be,$9314 - $92be + INCROM $92be, $9314 Func_9314: ; 9314 (2:5314) ld bc, $0018 @@ -759,31 +759,31 @@ Func_9326: ; 9326 (2:5326) ret Func_9345: ; 9345 (2:5345) -INCBIN "baserom.gbc",$9345,$9843 - $9345 + INCROM $9345, $9843 Func_9843: ; 9843 (2:5843) -INCBIN "baserom.gbc",$9843,$9e41 - $9843 + INCROM $9843, $9e41 Func_9e41: ; 9e41 (2:5e41) -INCBIN "baserom.gbc",$9e41,$a288 - $9e41 + INCROM $9e41, $a288 Func_a288: ; a288 (2:6288) -INCBIN "baserom.gbc",$a288,$a763 - $a288 + INCROM $a288, $a763 Unknown_a763: ; a763 (2:6763) -INCBIN "baserom.gbc",$a763,$a76c - $a763 + INCROM $a763, $a76c Unknown_a76c: ; a76c (2:676c) -INCBIN "baserom.gbc",$a76c,$a775 - $a76c + INCROM $a76c, $a775 Unknown_a775: ; a775 (2:6775) -INCBIN "baserom.gbc",$a775,$a77e - $a775 + INCROM $a775, $a77e Unknown_a77e: ; a77e (2:677e) -INCBIN "baserom.gbc",$a77e,$b177 - $a77e + INCROM $a77e, $b177 Func_b177: ; b177 (2:7177) -INCBIN "baserom.gbc",$b177,$b19d - $b177 + INCROM $b177, $b19d Func_b19d: ; b19d (2:719d) xor a @@ -888,7 +888,7 @@ Func_b19d: ; b19d (2:719d) ret ; 0xb274 -INCBIN "baserom.gbc",$b274,$ba04 - $b274 + INCROM $b274, $ba04 Func_ba04: ; ba04 (2:7a04) ld a, [wd0a9] @@ -1071,4 +1071,4 @@ Func_ba04: ; ba04 (2:7a04) jp $7a25 ; 0xbb6e -INCBIN "baserom.gbc",$bb6e,$c000 - $bb6e + INCROM $bb6e, $c000 diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index 1b0bd9d..8405cbd 100755 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -1,5 +1,5 @@ Func_80000: ; 80000 (20:4000) -INCBIN "baserom.gbc",$80000,$80028 - $80000 + INCROM $80000, $80028 Func_80028: ; 80028 (20:4028) call Func_801f1 @@ -11,7 +11,7 @@ Func_80028: ; 80028 (20:4028) ret ; 0x8003d -INCBIN "baserom.gbc",$8003d,$80077 - $8003d + INCROM $8003d, $80077 Func_80077: ; 80077 (20:4077) ld a, $1 @@ -55,7 +55,7 @@ Func_80077: ; 80077 (20:4077) ret ; 0x800bd -INCBIN "baserom.gbc",$800bd,$801a1 - $800bd + INCROM $800bd, $801a1 Func_801a1: ; 801a1 (20:41a1) push hl @@ -157,7 +157,7 @@ Func_80229: ; 80229 (20:4229) ret ; 0x80238 -INCBIN "baserom.gbc",$80238,$8025b - $80238 + INCROM $80238, $8025b Func_8025b: ; 8025b (20:425b) push hl @@ -234,19 +234,19 @@ Func_802bb: ; 802bb (20:42bb) ret ; 0x802d4 -INCBIN "baserom.gbc",$802d4,$80418 - $802d4 + INCROM $802d4, $80418 Func_80418: ; 80418 (20:4418) -INCBIN "baserom.gbc",$80418,$80480 - $80418 + INCROM $80418, $80480 Func_80480: ; 80480 (20:4480) -INCBIN "baserom.gbc",$80480,$804d8 - $80480 + INCROM $80480, $804d8 Func_804d8: ; 804d8 (20:44d8) -INCBIN "baserom.gbc",$804d8,$80b7a - $804d8 + INCROM $804d8, $80b7a Func_80b7a: ; 80b7a (20:4b7a) -INCBIN "baserom.gbc",$80b7a,$80ba4 - $80b7a + INCROM $80b7a, $80ba4 Func_80ba4: ; 80ba4 (20:4ba4) push af @@ -327,10 +327,10 @@ Func_80ba4: ; 80ba4 (20:4ba4) ret ; 0x80c21 -INCBIN "baserom.gbc",$80c21,$80e5a - $80c21 + INCROM $80c21, $80e5a Unknown_80e5a: ; 80e5a (20:4e5a) -INCBIN "baserom.gbc",$80e5a,$80e5d - $80e5a + INCROM $80e5a, $80e5d MapDataPointers: ; 80e5d (20:4e5d) -INCBIN "baserom.gbc",$80e5d,$84000 - $80e5d + INCROM $80e5d, $84000 diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm index f8fb28d..ab9999b 100755 --- a/src/engine/bank3.asm +++ b/src/engine/bank3.asm @@ -336,7 +336,7 @@ Func_c268: ; c268 (3:4268) ret Unknown_c27c: ; c27c (3:427c) -INCBIN "baserom.gbc",$c27c,$c280 - $c27c + INCROM $c27c, $c280 Func_c280: ; c280 (3:4280) call Func_c228 @@ -467,7 +467,7 @@ Func_c36a: ; c36a (3:436a) ret ; 0xc37a -INCBIN "baserom.gbc",$c37a,$c41c - $c37a + INCROM $c37a, $c41c Func_c41c: ; c41c (3:441c) ld a, [wd332] @@ -1098,7 +1098,7 @@ PC_c7ea: ; c7ea (3:47ea) ret ; 0xc846 -INCBIN "baserom.gbc",$c846,$c891 - $c846 + INCROM $c846, $c891 Func_c891: ; c891 (3:4891) push hl @@ -1351,7 +1351,7 @@ Func_c9e8: ; c9e8 (3:49e8) ret Unknown_ca0a: ; ca0a (3:4a04) -INCBIN "baserom.gbc",$ca0a,$ca0e - $ca0a + INCROM $ca0a, $ca0e Func_ca0e: ; ca0e (3:4a0e) ld a, [wd32e] @@ -1430,7 +1430,7 @@ CheckIfEventFlagSet: ; ca6c (3:4a6c) ret ; 0xca84 -INCBIN "baserom.gbc",$ca84,$ca8f - $ca84 + INCROM $ca84, $ca8f Func_ca8f: ; ca8f (3:4a8f) call Func_cab3 @@ -1477,7 +1477,7 @@ Func_cab3: ; cab3 (3:4ab3) ret ; 0xcac2 -INCBIN "baserom.gbc",$cac2,$cac5 - $cac2 + INCROM $cac2, $cac5 SetEventFlags: ; cac5 (3:4ac5) push bc @@ -1487,7 +1487,7 @@ SetEventFlags: ; cac5 (3:4ac5) ret ; 0xcacd -INCBIN "baserom.gbc",$cacd,$cad0 - $cacd + INCROM $cacd, $cad0 Func_cad0: ; cad0 (3:4ad0) push bc @@ -1541,7 +1541,7 @@ Func_cad8: ; cad8 (3:4ad8) ret ; 0xcb15 -INCBIN "baserom.gbc",$cb15,$cb1d - $cb15 + INCROM $cb15, $cb1d GetEventFlagMod: ; cb1d (3:4b1d) push bc @@ -1563,7 +1563,7 @@ GetEventFlagMod: ; cb1d (3:4b1d) ; offset - bytes to set or reset EventFlagMods: ; cb37 (3:4b37) -INCBIN "baserom.gbc",$cb37,$cc32 - $cb37 + INCROM $cb37, $cc32 Func_cc32: ; cc32 (3:4c32) push hl @@ -1576,7 +1576,7 @@ Func_cc32: ; cc32 (3:4c32) ret ; 0xcc3e -INCBIN "baserom.gbc",$cc3e,$cc42 - $cc3e + INCROM $cc3e, $cc42 ; called when pressing a in front of an object. creates a pointer to the data right after an RST20 ; was called, then runs RunOverworldScript to handle that data @@ -1639,7 +1639,7 @@ SetOWScriptPointer: ; cc8b (3:4c8b) ret ; 0xcc92 -INCBIN "baserom.gbc",$cc92,$cc96 - $cc92 + INCROM $cc92, $cc96 GetOWSArgs1AfterPointer: ; cc96 (3:4c96) ld a, $1 @@ -1781,7 +1781,7 @@ Func_cd4f: ; cd4f (3:4d4f) jr asm_cd2f Unknown_dd63: ; cd4f (3:4d4f) -INCBIN "baserom.gbc",$cd63,$cd66 - $cd63 + INCROM $cd63, $cd66 Func_cd66: ; cd66 (3:4d66) ld a, c @@ -1999,7 +1999,7 @@ Func_ceba: ; ceba (3:4eba) jp IncreaseOWScriptPointerBy1 ; 0xcedd -INCBIN "baserom.gbc",$cedd,$cee2 - $cedd + INCROM $cedd, $cee2 Func_cee2: ; cee2 (3:4ee2) call Func_c2a3 @@ -2207,7 +2207,7 @@ Func_cfd4: ; cfd4 (3:4fd4) dec hl jp IncreaseOWScriptPointerBy1 -INCBIN "baserom.gbc",$d006,$d00b - $d006 + INCROM $d006, $d00b Func_d00b: ; d00b (3:500b) sla c @@ -2405,7 +2405,7 @@ Func_d135: ; d135 (3:5135) ld [hl], d jp IncreaseOWScriptPointerBy2 -INCBIN "baserom.gbc",$d153,$d16b - $d153 + INCROM $d153, $d16b Func_d16b: ; d16b (3:516b) ld hl, wd0c8 @@ -2477,7 +2477,7 @@ asm_d1c6 ld [wce40], a jp IncreaseOWScriptPointerBy1 -INCBIN "baserom.gbc",$d1dc,$d209 - $d1dc + INCROM $d1dc, $d209 Func_d209: ; d209 (3:5209) call Func_ca69 @@ -2510,7 +2510,7 @@ Func_d209: ; d209 (3:5209) ld a, c jr asm_d1c6 -INCBIN "baserom.gbc",$d234,$d244 - $d234 + INCROM $d234, $d244 Func_d244: ; d244 (3:5244) ld a, c @@ -2527,7 +2527,7 @@ Func_d24c: ; d24c (3:524c) halt jp IncreaseOWScriptPointerBy1 -INCBIN "baserom.gbc",$d25e,$d271 - $d25e + INCROM $d25e, $d271 Func_d271: ; d271 (3:5271) ld hl, $527b @@ -2536,7 +2536,7 @@ Func_d271: ; d271 (3:5271) jp IncreaseOWScriptPointerBy1 ; 0xd27b -INCBIN "baserom.gbc",$d27b,$d28c - $d27b + INCROM $d27b, $d28c Func_d28c: ; d28c (3:528c) ld [$d416], a @@ -2627,7 +2627,7 @@ Func_d2f6: ; d2f6 (3:52f6) jp IncreaseOWScriptPointerBy1 ; 0xd30c -INCBIN "baserom.gbc",$d30c,$d317 - $d30c + INCROM $d30c, $d317 Func_d317: ; d317 (3:5317) ld hl, $532b @@ -2640,7 +2640,7 @@ Func_d317: ; d317 (3:5317) jp IncreaseOWScriptPointerBy1 -INCBIN "baserom.gbc",$d32b,$d336 - $d32b + INCROM $d32b, $d336 DeckMachine_d336: ; d336 (3:5336) push bc @@ -2736,7 +2736,7 @@ Func_d3d4: ; d3d4 (3:53d4) bank1call Func_7576 jp IncreaseOWScriptPointerBy1 -INCBIN "baserom.gbc",$d3dd,$d3e0 - $d3dd + INCROM $d3dd, $d3e0 Func_d3e0: ; d3e0 (3:53e0) ld a, $1 @@ -2916,7 +2916,7 @@ asm_d4e6 jp IncreaseOWScriptPointerBy4 ; 0xd4ec -INCBIN "baserom.gbc",$d4ec,$d753 - $d4ec + INCROM $d4ec, $d753 OWSequence_d753: ; d753 (3:5753) start_script @@ -2965,7 +2965,7 @@ OWSequence_d753: ; d753 (3:5753) ; there's more to this script but it hasn't been disassembled yet -INCBIN "baserom.gbc",$d77e,$e13f - $d77e + INCROM $d77e, $e13f WaterClubMovePlayer: ; e13f (3:613f) ld a, [wPlayerYCoord] @@ -3080,7 +3080,7 @@ OWSequence_LostToAmanda: ; e1c1 (03:61c1) tx Text0439 OWSequence_NotReadyToSeeAmy: -INCBIN "baserom.gbc",$e1c5,$e21c - $e1c5 + INCROM $e1c5, $e21c OWSequence_Joshua: start_script @@ -3114,7 +3114,7 @@ OWSequence_Joshua: db $33 db $01 -INCBIN "baserom.gbc",$e23f,$e52c - $e23f + INCROM $e23f, $e52c FindEndOfBattleScript: ; e52c (3:652c) ld c, $0 @@ -3147,7 +3147,7 @@ FindEndOfBattleScript: ; e52c (3:652c) jp Func_c926 ; 0xe553 -INCBIN "baserom.gbc",$e553,$f580 - $e553 + INCROM $e553, $f580 Func_f580: ; f580 (3:7580) call Func_ca69 @@ -3183,7 +3183,7 @@ Func_f580: ; f580 (3:7580) ret ; 0xf5b3 -INCBIN "baserom.gbc",$f5b3,$fc2b - $f5b3 + INCROM $f5b3, $fc2b Func_fc2b: ; fc2b (3:7c2b) ld a, [wd0c3] @@ -3210,16 +3210,16 @@ PointerTable_fc4c: ; fc4c (3:7c4c) dw Unknown_fc68 dw Unknown_fc60 -INCBIN "baserom.gbc",$fc52,$fc60 - $fc52 + INCROM $fc52, $fc60 Unknown_fc60: ; fc60 (3:7c60) -INCBIN "baserom.gbc",$fc60,$fc64 - $fc60 + INCROM $fc60, $fc64 Unknown_fc64: ; fc64 (3:7c64) -INCBIN "baserom.gbc",$fc64,$fc68 - $fc64 + INCROM $fc64, $fc68 Unknown_fc68: ; fc68 (3:7c68) -INCBIN "baserom.gbc",$fc68,$fcad - $fc68 + INCROM $fc68, $fcad Func_fcad: ; fcad (3:7cad) -INCBIN "baserom.gbc",$fcad,$10000 - $fcad + INCROM $fcad, $10000 diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm index a69f96e..29fd949 100755 --- a/src/engine/bank4.asm +++ b/src/engine/bank4.asm @@ -42,10 +42,10 @@ Func_10031: ; 10031 (4:4031) ret Func_10059: ; 10059 (4:4059) -INCBIN "baserom.gbc",$10059,$100a2 - $10059 + INCROM $10059, $100a2 Func_100a2: ; 100a2 (4:40a2) -INCBIN "baserom.gbc",$100a2,$1029e - $100a2 + INCROM $100a2, $1029e Medal_1029e: ; 1029e (4:429e) sub $8 @@ -99,7 +99,7 @@ Medal_1029e: ; 1029e (4:429e) ret Unknown_1030b: ; 1030b (4:430b) -INCBIN "baserom.gbc",$1030b,$1031b - $1030b + INCROM $1030b, $1031b BoosterPack_1031b: ; 1031b (4:431b) ld c, a @@ -168,10 +168,10 @@ BoosterPack_1031b: ; 1031b (4:431b) ret ; 0x103a5 -INCBIN "baserom.gbc",$103a5,$103d2 - $103a5 + INCROM $103a5, $103d2 Func_103d2: ; 103d2 (4:43d2) -INCBIN "baserom.gbc",$103d2,$103d3 - $103d2 + INCROM $103d2, $103d3 Duel_Init: ; 103d3 (4:43d3) ld a, [wd291] @@ -231,13 +231,13 @@ Duel_Init: ; 103d3 (4:43d3) ret ; 0x10451 -INCBIN "baserom.gbc",$10451,$10548 - $10451 + INCROM $10451, $10548 Func_10548: ; 10548 (4:4548) -INCBIN "baserom.gbc",$10548,$10756 - $10548 + INCROM $10548, $10756 Func_10756: ; 10756 (4:4756) -INCBIN "baserom.gbc",$10756,$10a70 - $10756 + INCROM $10756, $10a70 Func_10a70: ; 10a70 (4:4a70) push hl @@ -277,13 +277,13 @@ Func_10a70: ; 10a70 (4:4a70) ret Func_10a9b: ; 10a9b (4:4a9b) -INCBIN "baserom.gbc",$10a9b,$10ab4 - $10a9b + INCROM $10a9b, $10ab4 Func_10ab4: ; 10ab4 (4:4ab4) -INCBIN "baserom.gbc",$10ab4,$10af9 - $10ab4 + INCROM $10ab4, $10af9 Func_10af9: ; 10af9 (4:4af9) -INCBIN "baserom.gbc",$10af9,$10c96 - $10af9 + INCROM $10af9, $10c96 Func_10c96: ; 10c96 (4:4c96) ld a, [$ff81] @@ -308,7 +308,7 @@ Func_10c96: ; 10c96 (4:4c96) ret ; 0x10cbb -INCBIN "baserom.gbc",$10cbb,$10dba - $10cbb + INCROM $10cbb, $10dba Func_10dba: ; 10dba (4:4dba) ld a, $1 @@ -338,10 +338,10 @@ Func_10dba: ; 10dba (4:4dba) ret ; 0x10df0 -INCBIN "baserom.gbc",$10df0,$10e28 - $10df0 + INCROM $10df0, $10e28 Func_10e28: ; 10e28 (4:4e28) -INCBIN "baserom.gbc",$10e28,$10e55 - $10e28 + INCROM $10e28, $10e55 Func_10e55: ; 10e55 (4:4e55) ld a, [wd336] @@ -406,7 +406,7 @@ Func_10e97: ; 10e97 (4:4e97) ret Unknown_10ebc: ; 10ebc (4:4ebc) -INCBIN "baserom.gbc",$10ebc,$10efd - $10ebc + INCROM $10ebc, $10efd Func_10efd: ; 10efd (4:4efd) push hl @@ -429,7 +429,7 @@ Func_10efd: ; 10efd (4:4efd) ret Unknown_10f14: ; 10f14 (4:4f14) -INCBIN "baserom.gbc",$10f14,$10f2e - $10f14 + INCROM $10f14, $10f2e Func_10f2e: ; 10f2e (4:4f2e) push hl @@ -789,22 +789,22 @@ Func_11184: ; 11184 (4:5184) ret ; 0x111b3 -INCBIN "baserom.gbc",$111b3,$111e9 - $111b3 + INCROM $111b3, $111e9 Func_111e9: ; 111e9 (4:51e9) -INCBIN "baserom.gbc",$111e9,$1124d - $111e9 + INCROM $111e9, $1124d Func_1124d: ; 1124d (4:524d) -INCBIN "baserom.gbc",$1124d,$11320 - $1124d + INCROM $1124d, $11320 Func_11320: ; 11320 (4:5320) -INCBIN "baserom.gbc",$11320,$11416 - $11320 + INCROM $11320, $11416 Func_11416: ; 11416 (4:5416) -INCBIN "baserom.gbc",$11416,$11430 - $11416 + INCROM $11416, $11430 Func_11430: ; 11430 (4:5430) -INCBIN "baserom.gbc",$11430,$1157c - $11430 + INCROM $11430, $1157c Func_1157c: ; 1157c (4:557c) ld a, c @@ -831,7 +831,7 @@ Func_1157c: ; 1157c (4:557c) ; 0x115a3 -INCBIN "baserom.gbc",$115a3,$1162a - $115a3 + INCROM $115a3, $1162a INCLUDE "data/map_scripts.asm" @@ -960,7 +960,7 @@ Func_118d3: ; 118d3 (4:58d3) INCLUDE "data/npcs.asm" -INCBIN "baserom.gbc",$11f4e,$1217b - $11f4e + INCROM $11f4e, $1217b OverworldScriptTable: ; 1217b (4:617b) dw OWScript_EndScriptLoop1 @@ -1068,10 +1068,10 @@ OverworldScriptTable: ; 1217b (4:617b) dw OWScript_EndScriptLoop9 dw OWScript_EndScriptLoop10 -INCBIN "baserom.gbc",$1224b,$1229f - $1224b + INCROM $1224b, $1229f Unknown_1229f: ; 1229f (4:629f) -INCBIN "baserom.gbc",$1229f,$126d1 - $1229f + INCROM $1229f, $126d1 Func_126d1: ; 126d1 (4:66d1) call Func_099c @@ -1164,19 +1164,19 @@ Func_1277e: ; 1277e (4:677e) ret ; 0x1279a -INCBIN "baserom.gbc",$1279a,$12871 - $1279a + INCROM $1279a, $12871 Func_12871: ; 12871 (4:6871) -INCBIN "baserom.gbc",$12871,$1288c - $12871 + INCROM $12871, $1288c Func_1288c: ; 1288c (4:688c) -INCBIN "baserom.gbc",$1288c,$128a9 - $1288c + INCROM $1288c, $128a9 Func_128a9: ; 128a9 (4:68a9) -INCBIN "baserom.gbc",$128a9,$1296e - $128a9 + INCROM $128a9, $1296e Func_1296e: ; 1296e (4:696e) -INCBIN "baserom.gbc",$1296e,$1299f - $1296e + INCROM $1296e, $1299f Func_1299f: ; 1299f (4:699f) push af @@ -1245,10 +1245,10 @@ Func_129d9: ; 129d9 (4:69d9) ret ; 0x129fa -INCBIN "baserom.gbc",$129fa,$12a21 - $129fa + INCROM $129fa, $12a21 Func_12a21: ; 12a21 (4:6a21) -INCBIN "baserom.gbc",$12a21,$12ab5 - $12a21 + INCROM $12a21, $12ab5 Func_12ab5: ; 12ab5 (4:6ab5) push hl @@ -1266,7 +1266,7 @@ Func_12ab5: ; 12ab5 (4:6ab5) ret ; 0x12ac9 -INCBIN "baserom.gbc",$12ac9,$12ae2 - $12ac9 + INCROM $12ac9, $12ae2 Func_12ae2: ; 12ae2 (4:6ae2) push bc @@ -1409,10 +1409,10 @@ Func_12b89: ; 12b89 (4:6b89) ret Func_12ba7: ; 12ba7 (4:6ba7) -INCBIN "baserom.gbc",$12ba7,$12bcd - $12ba7 + INCROM $12ba7, $12bcd Func_12bcd: ; 12bcd (4:6bcd) -INCBIN "baserom.gbc",$12bcd,$12c05 - $12bcd + INCROM $12bcd, $12c05 Func_12c05: ; 12c05 (4:6c05) push hl @@ -1487,16 +1487,16 @@ Func_12c4f: ; 12c4f (4:6c4f) ret Func_12c5e: ; 12c5e (4:6c5e) -INCBIN "baserom.gbc",$12c5e,$12c7f - $12c5e + INCROM $12c5e, $12c7f Func_12c7f: ; 12c7f (4:6c7f) -INCBIN "baserom.gbc",$12c7f,$131b3 - $12c7f + INCROM $12c7f, $131b3 Func_131b3: ; 131b3 (4:71b3) -INCBIN "baserom.gbc",$131b3,$131d3 - $131b3 + INCROM $131b3, $131d3 Func_131d3: ; 131d3 (4:71d3) -INCBIN "baserom.gbc",$131d3,$1344d - $131d3 + INCROM $131d3, $1344d Func_1344d: ; 1344d (4:744d) call Func_379b @@ -1509,7 +1509,7 @@ Func_1344d: ; 1344d (4:744d) ret ; 0x13462 -INCBIN "baserom.gbc",$13462,$13485 - $13462 + INCROM $13462, $13485 Func_13485: ; 13485 (4:7485) call EnableExtRAM @@ -1531,4 +1531,4 @@ Func_13485: ; 13485 (4:7485) ret ; 0x134b1 -INCBIN "baserom.gbc",$134b1,$14000 - $134b1 + INCROM $134b1, $14000 diff --git a/src/engine/bank5.asm b/src/engine/bank5.asm index d65c21b..d713f8f 100755 --- a/src/engine/bank5.asm +++ b/src/engine/bank5.asm @@ -54,7 +54,7 @@ PointerTable_14000: ; 14000 (05:4000) dw $48dc ; IMAKUNI_DECK
; 1406a
-INCBIN "baserom.gbc",$1406a,$14226 - $1406a
+ INCROM $1406a, $14226
Func_14226: ; 14226 (5:4226)
call CreateHandCardBuffer
@@ -78,7 +78,7 @@ Func_14226: ; 14226 (5:4226) jr .checkForNextPokemon
; 0x1424b
-INCBIN "baserom.gbc",$1424b,$14663 - $1424b
+ INCROM $1424b, $14663
Func_14663: ; 14663 (5:4663)
farcall Func_200e5
@@ -223,7 +223,7 @@ Func_1468b: ; 1468b (5:468b) ; 0x14786
-INCBIN "baserom.gbc",$14786,$15636 - $14786
+ INCROM $14786, $15636
Func_15636: ; 15636 (5:5636)
ld a, $10
ld hl, $cda5
@@ -301,7 +301,7 @@ Func_15649: ; 15649 (5:5649) ret
; 0x156c3
-INCBIN "baserom.gbc",$156c3,$1575e - $156c3
+ INCROM $156c3, $1575e
; zeroes a bytes starting at hl
ZeroData: ; 1575e (5:575e)
@@ -320,4 +320,4 @@ ZeroData: ; 1575e (5:575e) ret
; 0x1576b
-INCBIN "baserom.gbc",$1576b,$18000 - $1576b
+ INCROM $1576b, $18000
diff --git a/src/engine/bank6.asm b/src/engine/bank6.asm index c66e669..82fb589 100755 --- a/src/engine/bank6.asm +++ b/src/engine/bank6.asm @@ -1,8 +1,8 @@ -INCBIN "baserom.gbc",$18000,$186f7 - $18000 + INCROM $18000, $186f7 INCLUDE "data/effect_commands.asm" -INCBIN "baserom.gbc",$18f9c,$1996e - $18f9c + INCROM $18f9c, $1996e Func_1996e: ; 1996e (6:596e) call EnableExtRAM @@ -108,7 +108,7 @@ Func_19a12: ; 19a12 (6:5a12) ret ; 0x19a1f -INCBIN "baserom.gbc",$19a1f,$1a61f - $19a1f + INCROM $19a1f, $1a61f Func_1a61f: ; 1a61f (6:661f) push af @@ -167,13 +167,13 @@ Func_1a61f: ; 1a61f (6:661f) ret ; 0x1a68d -INCBIN "baserom.gbc",$1a68d,$1a6cc - $1a68d + INCROM $1a68d, $1a6cc Func_1a6cc: ; 1a6cc (6:66cc) ret ; 0x1a6cd -INCBIN "baserom.gbc",$1a6cd,$1ad89 - $1a6cd + INCROM $1a6cd, $1ad89 Func_1ad89: ; 1ad89 (6:6d89) -INCBIN "baserom.gbc",$1ad89,$1c000 - $1ad89 + INCROM $1ad89, $1c000 diff --git a/src/engine/bank7.asm b/src/engine/bank7.asm index c54b16f..6dd7fe7 100755 --- a/src/engine/bank7.asm +++ b/src/engine/bank7.asm @@ -1,4 +1,4 @@ -INCBIN "baserom.gbc",$1c000,$1c056 - $1c000 + INCROM $1c000, $1c056 Func_1c056: ; 1c056 (7:4056) push hl @@ -91,7 +91,7 @@ Func_1c33b: ; 1c33b (7:433b) INCLUDE "data/map_songs.asm" Func_1c440: ; 1c440 (7:4440) -INCBIN "baserom.gbc",$1c440,$1c455 - $1c440 + INCROM $1c440, $1c455 Func_1c455: ; 1c455 (7:4455) push hl @@ -129,7 +129,7 @@ Func_1c477: ; 1c477 (7:4477) ret Func_1c485: ; 1c485 (7:4485) -INCBIN "baserom.gbc",$1c485,$1c50a - $1c485 + INCROM $1c485, $1c50a Func_1c50a: ; 1c50a (7:450a) push hl @@ -224,16 +224,16 @@ Func_1c57b: ; 1c57b (7:457b) ret Func_1c58e: ; 1c58e (7:458e) -INCBIN "baserom.gbc",$1c58e,$1c5e9 - $1c58e + INCROM $1c58e, $1c5e9 Func_1c5e9: ; 1c5e9 (7:45e9) -INCBIN "baserom.gbc",$1c5e9,$1c610 - $1c5e9 + INCROM $1c5e9, $1c610 Func_1c610: ; 1c610 (7:4610) -INCBIN "baserom.gbc",$1c610,$1c6f8 - $1c610 + INCROM $1c610, $1c6f8 Func_1c6f8: ; 1c6f8 (7:46f8) -INCBIN "baserom.gbc",$1c6f8,$1c719 - $1c6f8 + INCROM $1c6f8, $1c719 Func_1c719: ; 1c719 (7:4719) push hl @@ -251,7 +251,7 @@ Func_1c719: ; 1c719 (7:4719) ret Func_1c72e: ; 1c72e (7:472e) -INCBIN "baserom.gbc",$1c72e,$1c768 - $1c72e + INCROM $1c72e, $1c768 Func_1c768: ; 1c768 (7:4768) push hl @@ -334,10 +334,10 @@ Func_1c7de: ; 1c7de (7:47de) ret ; 0x1c7e4 -INCBIN "baserom.gbc",$1c7e4,$1c82e - $1c7e4 + INCROM $1c7e4, $1c82e Func_1c82e: ; 1c82e (7:482e) -INCBIN "baserom.gbc",$1c82e,$1c83d - $1c82e + INCROM $1c82e, $1c83d Func_1c83d: ; 1c83d (7:483d) push hl @@ -367,7 +367,7 @@ Func_1c83d: ; 1c83d (7:483d) ret ; 0x1c858 -INCBIN "baserom.gbc",$1c858,$1d078 - $1c858 + INCROM $1c858, $1d078 Func_1d078: ; 1d078 (7:5078) ld a, [wd627] @@ -436,7 +436,7 @@ Func_1d078: ; 1d078 (7:5078) ret ; 0x1d0fa -INCBIN "baserom.gbc",$1d0fa,$1d11c - $1d0fa + INCROM $1d0fa, $1d11c Func_1d11c: ; 1d11c (7:511c) ld a, MUSIC_PCMAINMENU @@ -486,10 +486,10 @@ Func_1d11c: ; 1d11c (7:511c) ret ; 0x1d17f -INCBIN "baserom.gbc",$1d17f,$1d306 - $1d17f + INCROM $1d17f, $1d306 Func_1d306: ; 1d306 (7:5306) -INCBIN "baserom.gbc",$1d306,$1d386 - $1d306 + INCROM $1d306, $1d386 Titlescreen_1d386: ; 1d386 (7:5386) call Func_378a @@ -509,10 +509,10 @@ Titlescreen_1d386: ; 1d386 (7:5386) ret Func_1d3a9: ; 1d3a9 (7:53a9) -INCBIN "baserom.gbc",$1d3a9,$1d42e - $1d3a9 + INCROM $1d3a9, $1d42e Func_1d42e: ; 1d42e (7:542e) -INCBIN "baserom.gbc",$1d42e,$1d519 - $1d42e + INCROM $1d42e, $1d519 Titlescreen_1d519: ; 1d519 (7:5519) ld a, MUSIC_TITLESCREEN @@ -522,10 +522,10 @@ Titlescreen_1d519: ; 1d519 (7:5519) ret ; 0x1d523 -INCBIN "baserom.gbc",$1d523,$1d59c - $1d523 + INCROM $1d523, $1d59c Func_1d59c: ; 1d59c (7:559c) -INCBIN "baserom.gbc",$1d59c,$1d6ad - $1d59c + INCROM $1d59c, $1d6ad Credits_1d6ad: ; 1d6ad (7:56ad) ld a, MUSIC_STOP @@ -563,4 +563,4 @@ Credits_1d6ad: ; 1d6ad (7:56ad) ret ; 0x1d705 -INCBIN "baserom.gbc",$1d705,$1e1c4 - $1d705 + INCROM $1d705, $1e1c4 diff --git a/src/engine/bank8.asm b/src/engine/bank8.asm index fca29ba..d052c43 100755 --- a/src/engine/bank8.asm +++ b/src/engine/bank8.asm @@ -1,4 +1,4 @@ -INCBIN "baserom.gbc",$20000,$200e5 - $20000
+ INCROM $20000, $200e5
; 0 - e4 is a big set of data, seems to be one entry for each card
@@ -117,7 +117,7 @@ Func_200e5: ; 200e5 (8:40e5) jp .asm_4106
; 0x201b1
-INCBIN "baserom.gbc",$201b1,$2297b - $201b1
+ INCROM $201b1, $2297b
; copies $ff terminated buffer from hl to de
CopyBuffer: ; 2297b (8:697b)
@@ -129,4 +129,4 @@ CopyBuffer: ; 2297b (8:697b) jr CopyBuffer
; 0x22983
-INCBIN "baserom.gbc",$22983,$24000 - $22983
+ INCROM $22983, $24000
diff --git a/src/engine/boosters.asm b/src/engine/boosters.asm index 10866c2..d0c4ebc 100755 --- a/src/engine/boosters.asm +++ b/src/engine/boosters.asm @@ -990,4 +990,4 @@ PackRandomEnergies:: ; 1e634 (7:6634) db $00 ; Trainer Card Chance db $00 ; Energy Card Chance -INCBIN "baserom.gbc",$1e640,$20000 - $1e640 + INCROM $1e640, $20000 diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 9a4b63e..82198a2 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -128,7 +128,7 @@ Func_2c0a2: ; 2c0a2 (b:40a2) ret ; 0x2c0a8 -INCBIN "baserom.gbc",$2c0a8,$2c0d4 - $2c0a8 + INCROM $2c0a8, $2c0d4 ; Sets some flags for AI use ; if target double poisoned @@ -181,7 +181,7 @@ Func_2c0fb: ; 2c0fb (b:40fb) ret ; 0x2c10b -INCBIN "baserom.gbc",$2c10b,$2c140 - $2c10b + INCROM $2c10b, $2c140 ; apply a status condition of type 1 identified by register a to the target ApplySubstatus1ToDefendingCard: ; 2c140 (b:4140) @@ -218,7 +218,7 @@ ApplySubstatus2ToDefendingCard: ; 2c149 (b:4149) ret ; 0x2c166 -INCBIN "baserom.gbc",$2c166,$2c6f0 - $2c166 + INCROM $2c166, $2c6f0 SpitPoison_AIEffect: ; 2c6f0 (b:46f0) ld a, $5 @@ -236,7 +236,7 @@ SpitPoison_Poison50PercentEffect: ; 2c6f8 (b:46f8) ret ; 0x2c70a -INCBIN "baserom.gbc",$2c70a,$2c730 - $2c70a + INCROM $2c70a, $2c730 PoisonFang_AIEffect: ; 2c730 (b:4730) ld a, $a @@ -250,7 +250,7 @@ WeepinbellPoisonPowder_AIEffect: ; 2c738 (b:4738) jp Func_2c0d4 ; 0x2c740 -INCBIN "baserom.gbc",$2c740,$2c77e - $2c740 + INCROM $2c740, $2c77e AcidEffect: ; 2c77e (b:477e) text_de AcidCheckText @@ -293,7 +293,7 @@ KakunaPoisonPowder_AIEffect: ; 2c7b4 (b:47b4) jp Func_2c0d4 ; 0x2c7bc -INCBIN "baserom.gbc",$2c7bc,$2c7d0 - $2c7bc + INCROM $2c7bc, $2c7d0 SwordsDanceEffect: ; 2c7d0 (b:47d0) ld a, [wTempTurnDuelistCardId] @@ -310,7 +310,7 @@ ZubatSupersonicEffect: ; 2c7dc (b:47dc) ret ; 0x2c7e3 -INCBIN "baserom.gbc",$2c7e3,$2c836 - $2c7e3 + INCROM $2c7e3, $2c836 ; an exact copy of KakunaStiffenEffect MetapodStiffenEffect: ; 2c836 (b:4836) @@ -324,4 +324,4 @@ MetapodStiffenEffect: ; 2c836 (b:4836) ret ; 0x2c84a -INCBIN "baserom.gbc",$2c84a,$30000 - $2c84a + INCROM $2c84a, $30000 diff --git a/src/engine/home.asm b/src/engine/home.asm index 3ce079c..1b2ee82 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -844,7 +844,7 @@ Func_5c2: ; 5c2 (0:5c2) ret ; 0x5db -INCBIN "baserom.gbc",$05db,$0614 - $05db + INCROM $05db, $0614 Func_0614: ; 614 (0:614) push af @@ -862,7 +862,7 @@ Func_061b: ret ; 0x627 -INCBIN "baserom.gbc",$0627,$0663 - $0627 + INCROM $0627, $0663 Func_0663: ; 0663 (0:0663) push bc @@ -898,7 +898,7 @@ Func_0686: ; 0686 (0:0686) ret ; 0x695 -INCBIN "baserom.gbc",$0695,$06c3 - $0695 + INCROM $0695, $06c3 Func_06c3: ; 06c3 (0:06c3) push af @@ -935,7 +935,7 @@ Func_06c3: ; 06c3 (0:06c3) ret ; 0x6ee -INCBIN "baserom.gbc",$06ee,$06fc - $06ee + INCROM $06ee, $06fc ; memcpy(DE, HL, B) ; if LCD on, copy during h-blank only @@ -943,12 +943,12 @@ SafeCopyDataHLtoDE: ; 6fc (0:6fc) ld a, [wLCDC] rla jr c, JumpToHblankCopyDataHLtoDE -.lcd_off_copy_loop +.lcd_off_loop ld a, [hli] ld [de], a inc de dec b - jr nz, .lcd_off_copy_loop + jr nz, .lcd_off_loop ret JumpToHblankCopyDataHLtoDE: ; 0709 (0:0709) jp HblankCopyDataHLtoDE @@ -1157,7 +1157,7 @@ BankswitchVRAM: ; 07d6 (0:07d6) ret ; 0x7db -INCBIN "baserom.gbc",$07db,$07e7 - $07db + INCROM $07db, $07e7 Func_07e7: ; 07e7 (0:07e7) call CheckForCGB @@ -1442,7 +1442,7 @@ Func_08ef: ; 08ef (0:08ef) jr .asm_93c ; 0x950 -INCBIN "baserom.gbc",$0950,$099c - $0950 + INCROM $0950, $099c Func_099c: ; 099c (0:099c) xor a @@ -1504,7 +1504,7 @@ Func_09ce: ; 09ce (0:09ce) ret ; 0x9dc -INCBIN "baserom.gbc",$09dc,$09e9 - $09dc + INCROM $09dc, $09e9 ; this function affects the stack so that it returns ; to the three byte pointer following the rst call @@ -1711,7 +1711,7 @@ SGB_MLT_REQ_2: ; 0bbb (0:0bbb) sgb MLT_REQ, 1 ; sgb_command, length db $01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -INCBIN "baserom.gbc",$0bcb,$0c08 - $0bcb + INCROM $0bcb, $0c08 ; loops 63000 * bc cycles (~15 * bc ms) Wait: ; 0c08 (0:0c08) @@ -1755,27 +1755,27 @@ HblankCopyDataHLtoDE: ; 0c19 (0:0c19) ; memcpy(HL, DE, C), but only during hblank HblankCopyDataDEtoHL: ; 0c32 (0:0c32) push bc -.asm_c33 +.loop ei di ld a, [rSTAT] and $3 - jr nz, .asm_c33 + jr nz, .loop ld a, [de] ld [hl], a ld a, [rSTAT] and $3 - jr nz, .asm_c33 + jr nz, .loop ei inc hl inc de dec c - jr nz, .asm_c33 + jr nz, .loop pop bc ret ; 0xc4b -INCBIN "baserom.gbc",$0c4b,$0c91 - $0c4b + INCROM $0c4b, $0c91 ; called at roughly 240Hz by TimerHandler SerialTimerHandler: ; 0c91 (0:0c91) @@ -1815,7 +1815,7 @@ SerialTimerHandler: ; 0c91 (0:0c91) ret ; 0xcc5 -INCBIN "baserom.gbc",$0cc5,$0d26 - $0cc5 + INCROM $0cc5, $0d26 SerialHandler: ; 0d26 (0:0d26) push af @@ -2144,7 +2144,7 @@ Func_0ebf: ; 0ebf (0:0ebf) ret ; 0xed5 -INCBIN "baserom.gbc",$0ed5,$0f35 - $0ed5 + INCROM $0ed5, $0f35 Func_0f35: ; 0f35 (0:0f35) ld a, [wSerialFlags] @@ -2205,7 +2205,7 @@ Func_0f7f: ; 0f7f (0:0f7f) ret ; 0xf9b -INCBIN "baserom.gbc",$0f9b,$0fac - $0f9b + INCROM $0f9b, $0fac Func_0fac: ; 0fac (0:0fac) push hl @@ -2258,7 +2258,7 @@ Func_0fac: ; 0fac (0:0fac) ret ; 0xfe9 -INCBIN "baserom.gbc",$0fe9,$100b - $0fe9 + INCROM $0fe9, $100b Func_100b: ; 100b (0:100b) ld a, $2 @@ -2418,7 +2418,7 @@ DrawCardFromDeck: ; 10cf (0:10cf) ret ; 0x10e8 -INCBIN "baserom.gbc",$10e8,$1123 - $10e8 + INCROM $10e8, $1123 ; adds a card to the hand and increments the number of cards in the hand ; the card is identified by register a, which contains the card number within the deck (0-59) @@ -2446,7 +2446,7 @@ AddCardToHand: ; 1123 (0:1123) ret ; 0x1139 -INCBIN "baserom.gbc",$1139,$123b - $1139 + INCROM $1139, $123b CreateHandCardBuffer: ; 123b (0:123b) call FindLastCardInHand @@ -2476,7 +2476,7 @@ CreateHandCardBuffer: ; 123b (0:123b) ret ; 0x1258 -INCBIN "baserom.gbc",$1258,$1271 - $1258 + INCROM $1258, $1271 ; puts an index to the last (newest) card in current player's hand into hl. FindLastCardInHand: ; 1271 (0:1271) @@ -2530,7 +2530,7 @@ ShuffleCards: ; 127f (0:127f) ret ; 0x12a3 -INCBIN "baserom.gbc",$12a3,$1312 - $12a3 + INCROM $12a3, $1312 ; given a position in wDuelCardOrAttackList (c510), return: @@ -2563,7 +2563,7 @@ GetCardInDeckPosition: ; 1324 (0:1324) ret ; 0x132f -INCBIN "baserom.gbc",$132f,$1362 - $132f + INCROM $132f, $1362 ; returns, in register a, the id of the card in the deck position specified in register a _GetCardInDeckPosition: ; 1362 (0:1362) @@ -2614,7 +2614,7 @@ LoadDeckCardToBuffer2: ; 138c (0:138c) ret ; 0x13a2 -INCBIN "baserom.gbc",$13a2,$1485 - $13a2 + INCROM $13a2, $1485 Func_1485: ; 1485 (0:1485) push af @@ -2672,7 +2672,7 @@ Func_1485: ; 1485 (0:1485) ret ; 0x14d2 -INCBIN "baserom.gbc",$14d2,$159f - $14d2 + INCROM $14d2, $159f ; This function iterates through the card locations array to find out which and how many ; energy cards are in arena (i.e. attached to the active pokemon). @@ -2796,7 +2796,7 @@ GetNonTurnDuelistVariable: ; 1611 (0:1611) ret ; 0x161e -INCBIN "baserom.gbc",$161e,$16c0 - $161e + INCROM $161e, $16c0 CopyMoveDataAndDamageToBuffer: ; 16c0 (0:16c0) ld a, e @@ -3093,7 +3093,7 @@ CheckSelfConfusionDamage: ; 18d7 (0:18d7) ret ; 0x18f9 -INCBIN "baserom.gbc",$18f9,$195c - $18f9 + INCROM $18f9, $195c ; this function appears to apply several damage modifiers Func_195c: ; 195c (0:195c) @@ -3201,7 +3201,7 @@ Func_1a0e: ; 1a0e (0:1a0e) ret ; 0x1a1a -INCBIN "baserom.gbc",$1a1a,$1a22 - $1a1a + INCROM $1a1a, $1a22 Func_1a22: ; 1a22 (0:1a22) xor a @@ -3346,7 +3346,7 @@ Func_1ad3: ; 1ad3 (0:1ad3) ret ; 0x1af3 -INCBIN "baserom.gbc",$1af3,$1b8d - $1af3 + INCROM $1af3, $1b8d Func_1b8d: ; 1b8d (0:1b8d) bank1call $4f9d @@ -3412,7 +3412,7 @@ Func_1bca: ; 1bca (0:1bca) ret ; 0x1c05 -INCBIN "baserom.gbc",$1c05,$1c72 - $1c05 + INCROM $1c05, $1c72 ; returns [hWhoseTurn] <-- ([hWhoseTurn] ^ $1) ; As a side effect, this also returns a duelist variable in a similar manner to @@ -3647,22 +3647,22 @@ Func_1d91: ; 1d91 (0:1d91) ret ; 0x1da4 -INCBIN "baserom.gbc",$1da4,$1dca - $1da4 + INCROM $1da4, $1dca ; memcpy(HL, DE, C) ; if LCD on, copy during h-blank only SafeCopyDataDEtoHL: ; 1dca (0:1dca) ld a, [wLCDC] ; bit 7, a ; - jr nz, .asm_1dd8 ; assert that LCD is on -.asm_1dd1 + jr nz, .lcd_on ; assert that LCD is on +.lcd_off_loop ld a, [de] inc de ld [hli], a dec c - jr nz, .asm_1dd1 + jr nz, .lcd_off_loop ret -.asm_1dd8 +.lcd_on jp HblankCopyDataDEtoHL ; calculates $9800 + SCREEN_WIDTH * e + d to map the screen coordinates at de @@ -4003,7 +4003,7 @@ Func_1f5f: ; 1f5f (0:1f5f) ret ; 0x1f96 -INCBIN "baserom.gbc",$1f96,$20b0 - $1f96 + INCROM $1f96, $20b0 Func_20b0: ; 20b0 (0:20b0) ld hl, $2fe8 @@ -4077,7 +4077,7 @@ asm_2121 ret ; 0x212f -INCBIN "baserom.gbc",$212f,$2167 - $212f + INCROM $212f, $2167 Func_2167: ; 2167 (0:2167) ld l, a @@ -4097,7 +4097,7 @@ Func_2167: ; 2167 (0:2167) jp Func_1f5f ; 0x2189 -INCBIN "baserom.gbc",$2189,$21c5 - $2189 + INCROM $2189, $21c5 Func_21c5: ; 21c5 (0:21c5) push de @@ -4504,7 +4504,7 @@ Func_23d3: ; 23d3 (0:23d3) ret ; 0x23fd -INCBIN "baserom.gbc",$23fd,$245d - $23fd + INCROM $23fd, $245d Func_245d: ; 245d (0:245d) push de @@ -4724,7 +4724,7 @@ Func_256d: ; 256d (0:256d) ret ; 0x2589 -INCBIN "baserom.gbc",$2589,$2636 - $2589 + INCROM $2589, $2636 ; initializes cursor parameters given the 8 bytes starting at hl, ; which represent the following: @@ -4955,14 +4955,14 @@ Func_271a: ; 271a (0:271a) ret ; 0x278d -INCBIN "baserom.gbc",$278d,$29f5 - $278d + INCROM $278d, $29f5 Func_29f5: ; 29f5 (0:29f5) farcallx $6, $4000 ret ; 0x29fa -INCBIN "baserom.gbc",$29fa,$2a00 - $29fa + INCROM $29fa, $2a00 Func_2a00: ; 2a00 (0:2a00) call DoFrame @@ -4999,7 +4999,7 @@ Func_2a1a: ; 2a1a (0:2a1a) ret ; 0x2a30 -INCBIN "baserom.gbc",$2a30,$2a36 - $2a30 + INCROM $2a30, $2a36 Func_2a36: ; 2a36 (0:2a36) push hl @@ -5086,7 +5086,7 @@ WaitForWideTextBoxInput: ; 2aae (0:2aae) WideTextBoxPromptCursorData: ; 2ac8 (0:2ac8) db $12, $11, $1, $1, $2f, $1d, $0, $0 -INCBIN "baserom.gbc",$2ad0,$2af0 - $2ad0 + INCROM $2ad0, $2af0 Func_2af0: ; 2af0 (0:2af0) call DrawWideTextBox_PrintText @@ -5155,7 +5155,7 @@ Func_2b66: ; 2b66 (0:2b66) ret ; 0x2b70 -INCBIN "baserom.gbc",$2b70,$2b78 - $2b70 + INCROM $2b70, $2b78 ; loads opponent deck to wOpponentDeck LoadOpponentDeck: ; 2b78 (0:2b78) @@ -5300,7 +5300,7 @@ Func_2c29: ; 2c29 (0:2c29) ret ; 0x2c37 -INCBIN "baserom.gbc",$2c37,$2c73 - $2c37 + INCROM $2c37, $2c73 Func_2c73: ; 2c73 (0:2c73) xor a @@ -5668,7 +5668,7 @@ PrintTextBoxBorderLabel: ; 2e89 (0:2e89) jp PrintPlayerName ; 0x2ea9 -INCBIN "baserom.gbc",$2ea9,$2ebb - $2ea9 + INCROM $2ea9, $2ebb Func_2ebb: ; 2ebb (0:2ebb) ld a, l @@ -5685,7 +5685,7 @@ Func_2ec4: ; 2ec4 (0:2ec4) ret ; 0x2ecd -INCBIN "baserom.gbc",$2ecd,$2f0a - $2ecd + INCROM $2ecd, $2f0a ; load data of card with id at e to wLoadedCard1 or wLoadedCard2 LoadCardDataToBuffer2: ; 2f0a (0:2f0a) @@ -6434,7 +6434,7 @@ HandleDamageReductionExceptSubstatus2: ; 3269 (0:3269) ret ; 0x32f7 -INCBIN "baserom.gbc",$32f7,$33c1 - $32f7 + INCROM $32f7, $33c1 ; return carry if card is under a condition that makes it unable to attack ; also return in hl the text id to be displayed @@ -6726,7 +6726,7 @@ Func_3525: ; 3525 (0:3525) ret ; 0x356a -INCBIN "baserom.gbc",$356a,$35e6 - $356a + INCROM $356a, $35e6 ; if swords dance or focus energy was used this turn, ; mark that the base power of the next turn's attack has to be doubled @@ -6762,7 +6762,7 @@ UpdateSubstatusConditions: ; 35fa (0:35fa) ret ; 0x3615 -INCBIN "baserom.gbc",$3615,$363b - $3615 + INCROM $3615, $363b ; if the target card's HP is 0 and the attacking card's HP is not, ; the attacking card faints if it was affected by destiny bond @@ -6859,7 +6859,7 @@ ApplyStrikesBack: ; 36a2 (0:36a2) ret ; 0x36d9 -INCBIN "baserom.gbc",$36d9,$36f6 - $36d9 + INCROM $36d9, $36f6 Func_36f6: ; 36f6 (0:36f6) xor a @@ -6898,7 +6898,7 @@ Func_36f7: ; 36f7 (0:36f7) ret ; 0x3729 -INCBIN "baserom.gbc",$3729,$3730 - $3729 + INCROM $3729, $3730 Func_3730: ; 3730 (0:3730) ld a, DUELVARS_ARENA_CARD_SUBSTATUS3 @@ -6912,7 +6912,7 @@ Func_3730: ; 3730 (0:3730) ret ; 0x3743 -INCBIN "baserom.gbc",$3743,$374a - $3743 + INCROM $3743, $374a Func_374a: ; 374a (0:374a) ld a, DUELVARS_ARENA_CARD_SUBSTATUS4 @@ -6983,7 +6983,7 @@ Func_37a0: ; 37a0 (0:37a0) ret ; 0x37a5 -INCBIN "baserom.gbc",$37a5,$380e - $37a5 + INCROM $37a5, $380e Func_380e: ; 380e (0:380e) ld a, [wd0c1] @@ -7144,7 +7144,7 @@ GetFloorObjectFromPos: ; 3927 (0:3927) ret ; 0x392e -INCBIN "baserom.gbc",$392e,$3946 - $392e + INCROM $392e, $3946 ; puts a floor tile in hc given coords in bc (x,y. measured in tiles) FindFloorTileFromPos: ; 3946 (0:3946) @@ -7173,7 +7173,7 @@ Func_395a: ; 395a (0:395a) ret Unknown_396b: ; 396b (0:396b) -INCBIN "baserom.gbc",$396b,$3973 - $396b + INCROM $396b, $3973 ; Movement offsets for scripted movements ScriptedMovementOffsetTable: ; 3973 (0:3973) @@ -7183,7 +7183,7 @@ ScriptedMovementOffsetTable: ; 3973 (0:3973) db -$02, $00 ; move 2 tiles left Unknown_397b: ; 397b (0:397b) -INCBIN "baserom.gbc",$397b,$3997 - $397b + INCROM $397b, $3997 Func_3997: ; 3997 (0:3997) ldh a, [hBankROM] @@ -7251,7 +7251,7 @@ Func_39c3: ; 39c3 (0:39c3) ret ; 0x39ea -INCBIN "baserom.gbc",$39ea,$39fc - $39ea + INCROM $39ea, $39fc Func_39fc: ; 39fc (0:39fc) push hl @@ -7304,7 +7304,7 @@ Func_3a40: ; 3a40 (0:3a40) ret ; 0x3a45 -INCBIN "baserom.gbc",$3a45,$3a5e - $3a45 + INCROM $3a45, $3a5e Func_3a5e: ; 3a5e (0:3a5e) ldh a, [hBankROM] @@ -7398,7 +7398,7 @@ Func_3abd: ; 3abd (0:3abd) ret ; 0x3ae8 -INCBIN "baserom.gbc",$3ae8,$3aed - $3ae8 + INCROM $3ae8, $3aed ; finds an OWScript from the first byte and puts the next two bytes (usually arguments?) into cb RunOverworldScript: ; 3aed (0:3aed) @@ -7429,7 +7429,7 @@ RunOverworldScript: ; 3aed (0:3aed) jp hl ; 0x3b11 -INCBIN "baserom.gbc",$3b11,$3b21 - $3b11 + INCROM $3b11, $3b21 Func_3b21: ; 3b21 (0:3b21) ldh a, [hBankROM] @@ -7511,7 +7511,7 @@ Func_3b6a: ; 3b6a (0:3b6a) ret ; 0x3ba2 -INCBIN "baserom.gbc",$3ba2,$3bd2 - $3ba2 + INCROM $3ba2, $3bd2 ; writes from hl the pointer to the function to be called by DoFrame SetDoFrameFunction: ; 3bd2 (0:3bd2) @@ -7529,7 +7529,7 @@ ResetDoFrameFunction: ; 3bdb (0:3bdb) ret ; 0x3be4 -INCBIN "baserom.gbc",$3be4,$3bf5 - $3be4 + INCROM $3be4, $3bf5 Func_3bf5: ; 3bf5 (0:3bf5) ldh a, [hBankROM] @@ -7548,13 +7548,13 @@ Func_3bf5: ; 3bf5 (0:3bf5) ret ; 0x3c10 -INCBIN "baserom.gbc",$3c10,$3c45 - $3c10 + INCROM $3c10, $3c45 Func_3c45: ; 3c45 (0:3c45) jp hl ; 0x3c46 -INCBIN "baserom.gbc",$3c46,$3c48 - $3c46 + INCROM $3c46, $3c48 DoFrameIfLCDEnabled: ; 3c48 (0:3c48) push af @@ -7609,7 +7609,7 @@ Func_3c83: ; 3c83 (0:3c83) ret ; 0x3c87 -INCBIN "baserom.gbc",$3c87,$3c96 - $3c87 + INCROM $3c87, $3c96 Func_3c96: ; 3c96 (0:3c96) call DoFrameIfLCDEnabled @@ -7643,7 +7643,7 @@ Func_3cb4: ; 3cb4 (0:3cb4) ret ; 0x3cc4 -INCBIN "baserom.gbc",$3cc4,$3d72 - $3cc4 + INCROM $3cc4, $3d72 Func_3d72: ; 3d72 (0:3d72) ldh a, [hBankROM] @@ -7722,7 +7722,7 @@ ModifyUnknownOAMBufferProperty: ; 3dbf (0:3dbf) ret ; 0x3ddb -INCBIN "baserom.gbc",$3ddb,$3df3 - $3ddb + INCROM $3ddb, $3df3 Func_3df3: ; 3df3 (0:3df3) push af @@ -7743,7 +7743,7 @@ Func_3df3: ; 3df3 (0:3df3) ret ; 0x3e10 -INCBIN "baserom.gbc",$3e10,$3e17 - $3e10 + INCROM $3e10, $3e17 Func_3e17: ; 3e17 (0:3e17) ld [wd131], a @@ -7762,7 +7762,7 @@ Func_3e2a: ; 3e2a (0:3e2a) jr Func_3e17 ; 0x3e31 -INCBIN "baserom.gbc",$3e31,$3fe0 - $3e31 + INCROM $3e31, $3fe0 ; jumps to 3f:hl Bankswitch3dTo3f:: ; 3fe0 (0:3fe0) diff --git a/src/gfx.asm b/src/gfx.asm index 9714ff3..8004951 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -22,7 +22,7 @@ SECTION "bank1F",ROMX,BANK[$1F] emptybank SECTION "bank21",ROMX,BANK[$21] -INCBIN "baserom.gbc",$84000,$87828 - $84000 + INCROM $84000, $87828 IshiharaTilesetGfx: ; 87828 (21:7828) dw $4d @@ -48,7 +48,7 @@ Unnamed2Gfx: ; 87fe2 (21:7fe2) dw $1 INCBIN "gfx/unnamed/2.2bpp" -INCBIN "baserom.gbc",$87ff4,$88000 - $87ff4 + INCROM $87ff4, $88000 SECTION "bank22",ROMX,BANK[$22] OverworldMapTiles: ; 88000 (22:4000) @@ -91,7 +91,7 @@ Unnamed3Gfx: ; 8bfd2 (22:7fd2) dw $1 INCBIN "gfx/unnamed/3.2bpp" -INCBIN "baserom.gbc",$8bfe4,$8C000 - $8bfe4 + INCROM $8bfe4, $8C000 SECTION "bank23",ROMX,BANK[$23] LightningClubTilesetGfx: ; 8c000 (23:4000) @@ -155,7 +155,7 @@ PoisonGfx: ; 8ffa4 (23:7fa4) dw $4 INCBIN "gfx/duel/poison.2bpp" -INCBIN "baserom.gbc",$8ffe6,$90000 - $8ffe6 + INCROM $8ffe6, $90000 SECTION "bank24",ROMX,BANK[$24] CardPop1Gfx: ; 90000 (24:4000) @@ -267,7 +267,7 @@ RonaldOWGfx: ; 97ea6 (25:7ea6) dw $14 INCBIN "gfx/ow/ronald.2bpp" -INCBIN "baserom.gbc",$97fe8,$98000 - $97fe8 + INCROM $97fe8, $98000 SECTION "bank26",ROMX,BANK[$26] Titlescreen3Gfx: ; 98000 (26:4000) @@ -600,7 +600,7 @@ Unnamed11Gfx: ; a3fb4 (28:7fb4) dw $4 INCBIN "gfx/unnamed/11.2bpp" -INCBIN "baserom.gbc",$a3ff6,$a4000 - $a3ff6 + INCROM $a3ff6, $a4000 SECTION "bank29",ROMX,BANK[$29] OWSprite30: ; a4000 (29:4000) @@ -799,7 +799,7 @@ Duel45Gfx: ; a7fb0 (29:7fb0) dw $03 INCBIN "gfx/duel/45.2bpp" -INCBIN "baserom.gbc",$a7fe2,$a8000 - $a7fe2 + INCROM $a7fe2, $a8000 SECTION "bank2A",ROMX,BANK[$2A] Duel46Gfx: ; a8000 (2a:4000) @@ -874,7 +874,7 @@ FightingGfx: ; a8e12 (2a:4e12) dw $04 INCBIN "gfx/titlescreen/fighting.2bpp" -INCBIN "baserom.gbc",$a8e54,$ac000 - $a8e54 + INCROM $a8e54, $ac000 SECTION "bank2B",ROMX,BANK[$2B] INCBIN "baserom.gbc",$AC000,$4000 diff --git a/src/macros/code.asm b/src/macros/code.asm index b1a4fc0..7338e6e 100644 --- a/src/macros/code.asm +++ b/src/macros/code.asm @@ -1,3 +1,7 @@ +INCROM: MACRO +INCBIN "baserom.gbc", \1, \2 - \1 +ENDM + const_def: MACRO IF _NARG > 0 const_value = \1 |