diff options
72 files changed, 827 insertions, 329 deletions
@@ -50,11 +50,11 @@ tools: rgbasm -o $@ $< pokecrystal11.gbc: $(crystal11_obj) - rgblink -n pokecrystal11.sym -m pokecrystal11.map -o $@ $^ + rgblink -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.ld -o $@ $^ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ pokecrystal.gbc: $(crystal_obj) - rgblink -n pokecrystal.sym -m pokecrystal.map -o $@ $^ + rgblink -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.ld -o $@ $^ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ @@ -1,7 +1,7 @@ INCLUDE "includes.asm" -SECTION "Audio", ROMX, BANK[AUDIO] +SECTION "Audio", ROMX INCLUDE "audio/engine.asm" @@ -21,7 +21,7 @@ INCLUDE "audio/sfx_pointers.asm" -SECTION "Songs 1", ROMX, BANK[SONGS_1] +SECTION "Songs 1", ROMX INCLUDE "audio/music/route36.asm" INCLUDE "audio/music/rivalbattle.asm" @@ -40,7 +40,7 @@ INCLUDE "audio/music/lookpokemaniac.asm" INCLUDE "audio/music/trainervictory.asm" -SECTION "Songs 2", ROMX, BANK[SONGS_2] +SECTION "Songs 2", ROMX INCLUDE "audio/music/route1.asm" INCLUDE "audio/music/route3.asm" @@ -76,7 +76,7 @@ INCLUDE "audio/music/contestresults.asm" INCLUDE "audio/music/route30.asm" -SECTION "Songs 3", ROMX, BANK[SONGS_3] +SECTION "Songs 3", ROMX INCLUDE "audio/music/violetcity.asm" INCLUDE "audio/music/route29.asm" @@ -86,7 +86,7 @@ INCLUDE "audio/music/evolution.asm" INCLUDE "audio/music/printer.asm" -SECTION "Songs 4", ROMX, BANK[SONGS_4] +SECTION "Songs 4", ROMX INCLUDE "audio/music/viridiancity.asm" INCLUDE "audio/music/celadoncity.asm" @@ -127,7 +127,7 @@ INCLUDE "audio/music/pokeflutechannel.asm" INCLUDE "audio/music/bugcatchingcontest.asm" -SECTION "Songs 5", ROMX, BANK[SONGS_5] +SECTION "Songs 5", ROMX INCLUDE "audio/music/mobileadaptermenu.asm" INCLUDE "audio/music/buenaspassword.asm" @@ -140,31 +140,31 @@ INCLUDE "audio/music/mobilecenter.asm" -SECTION "Extra Songs 1", ROMX, BANK[EXTRA_SONGS_1] +SECTION "Extra Songs 1", ROMX INCLUDE "audio/music/credits.asm" INCLUDE "audio/music/clair.asm" INCLUDE "audio/music/mobileadapter.asm" -SECTION "Extra Songs 2", ROMX, BANK[EXTRA_SONGS_2] +SECTION "Extra Songs 2", ROMX INCLUDE "audio/music/postcredits.asm" -SECTION "Sound Effects", ROMX, BANK[SOUND_EFFECTS] +SECTION "Sound Effects", ROMX INCLUDE "audio/sfx.asm" -SECTION "Crystal Sound Effects", ROMX, BANK[CRYSTAL_SOUND_EFFECTS] +SECTION "Crystal Sound Effects", ROMX INCLUDE "audio/sfx_crystal.asm" -SECTION "Cries", ROMX, BANK[CRIES] +SECTION "Cries", ROMX CryHeaders:: INCLUDE "audio/cry_headers.asm" diff --git a/audio/engine.asm b/audio/engine.asm index 2cc921bd0..57418246b 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -229,7 +229,7 @@ UpdateChannels: ; e8125 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .ChannelFnPtrs: dw .Channel1 @@ -1389,7 +1389,7 @@ ParseMusicCommand: ; e870f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e8720 diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 4405ae756..f8c97578a 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -211,7 +211,7 @@ AI_TryItem: ; 38105 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .callback pop de pop hl diff --git a/battle/ai/redundant.asm b/battle/ai/redundant.asm index da71d0ece..e3dda8c4b 100755 --- a/battle/ai/redundant.asm +++ b/battle/ai/redundant.asm @@ -11,7 +11,7 @@ AI_Redundant: ; 2c41a ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Moves: ; 2c42c dbw EFFECT_DREAM_EATER, .DreamEater diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 957b2a066..958dcfe40 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -347,7 +347,7 @@ RunBattleAnimCommand: ; cc25f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; cc2a4 diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index b7f415770..22807f77d 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -75,7 +75,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BattleBGEffects: ; c805a (32:405a) dw BattleBGEffect_End @@ -161,7 +161,7 @@ BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BattleBGEffects_IncrementJumptable: ; c80e5 (32:40e5) ld hl, BG_EFFECT_STRUCT_JT_INDEX @@ -2059,7 +2059,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00) .cgb ld de, .Jumptable call BatttleBGEffects_GetNamedJumptablePointer - jp [hl] + jp hl .Jumptable: dw .cgb_zero @@ -2421,7 +2421,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) ld de, .Jumptable_DMG call BatttleBGEffects_GetNamedJumptablePointer pop de - jp [hl] + jp hl .Jumptable_DMG: dw .zero_dmg @@ -2484,7 +2484,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) ld de, .Jumptable_CGB call BatttleBGEffects_GetNamedJumptablePointer pop de - jp [hl] + jp hl .Jumptable_CGB: ; c8ddd (32:4ddd) dw .zero_cgb diff --git a/battle/core.asm b/battle/core.asm index dec315ab8..be6e24eca 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -4331,7 +4331,7 @@ SpikesDamage: ; 3dc23 jp WaitBGMap .hl - jp [hl] + jp hl ; 3dc5b PursuitSwitch: ; 3dc5b diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index a74dea632..54af56a10 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -113,7 +113,7 @@ DoMove: ; 3402c jr .ReadMoveEffectCommand .DoMoveEffectCommand: - jp [hl] + jp hl ; 34084 diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 4ed9b67b7..debfcf04d 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -9,7 +9,7 @@ DoBattleAnimFrame: ; ccfbe ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; ccfce .Jumptable: @@ -4085,7 +4085,7 @@ BattleAnim_AnonJumptable: ; ce71e (33:671e) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c) ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX diff --git a/data/egg_moves.asm b/data/egg_moves.asm index d48f36989..2fcf47232 100644 --- a/data/egg_moves.asm +++ b/data/egg_moves.asm @@ -1,7 +1,7 @@ INCLUDE "includes.asm" -SECTION "Egg Moves", ROMX, BANK[EGG_MOVES] +SECTION "Egg Moves", ROMX ; All instances of Charm, Steel Wing, Sweet Scent, and Lovely Kiss were ; removed from egg move lists in Crystal, because they are also TMs. diff --git a/data/evos_attacks.asm b/data/evos_attacks.asm index 0a0bba542..749731812 100644 --- a/data/evos_attacks.asm +++ b/data/evos_attacks.asm @@ -1,7 +1,7 @@ INCLUDE "includes.asm" -SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS] +SECTION "Evolutions and Attacks", ROMX INCLUDE "data/evos_attacks_pointers.asm" diff --git a/data/pokedex/entries.asm b/data/pokedex/entries.asm index e77469d9d..c54f5e245 100644 --- a/data/pokedex/entries.asm +++ b/data/pokedex/entries.asm @@ -1,25 +1,25 @@ INCLUDE "includes.asm" -SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1] +SECTION "Pokedex Entries 001-064", ROMX PokedexEntries1:: INCLUDE "data/pokedex/entries_1.asm" -SECTION "Pokedex Entries 065-128", ROMX, BANK[POKEDEX_ENTRIES_2] +SECTION "Pokedex Entries 065-128", ROMX PokedexEntries2:: INCLUDE "data/pokedex/entries_2.asm" -SECTION "Pokedex Entries 129-192", ROMX, BANK[POKEDEX_ENTRIES_3] +SECTION "Pokedex Entries 129-192", ROMX PokedexEntries3:: INCLUDE "data/pokedex/entries_3.asm" -SECTION "Pokedex Entries 193-251", ROMX, BANK[POKEDEX_ENTRIES_4] +SECTION "Pokedex Entries 193-251", ROMX PokedexEntries4:: INCLUDE "data/pokedex/entries_4.asm" diff --git a/engine/billspc.asm b/engine/billspc.asm index b9b51f850..4d8bf1c48 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -39,7 +39,7 @@ _DepositPKMN: ; e2391 (38:6391) ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl .Jumptable: ; e23df (38:63df) @@ -147,7 +147,7 @@ _DepositPKMN: ; e2391 (38:6391) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BillsPCDepositJumptable: ; e24a1 (38:64a1) @@ -306,7 +306,7 @@ _WithdrawPKMN: ; e2583 (38:6583) ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl .Jumptable: ; e25d2 (38:65d2) @@ -415,7 +415,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .dw ; e2699 (38:6699) #mark dw .withdraw ; Withdraw @@ -556,7 +556,7 @@ _MovePKMNWithoutMail: ; e2759 ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl ; e27ac .Jumptable: ; e27ac @@ -678,7 +678,7 @@ _MovePKMNWithoutMail: ; e2759 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e2881 .Jumptable2: ; e2881 @@ -2014,7 +2014,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld l, a ld de, .dw_return push de - jp [hl] + jp hl ; e322a .dw_return ; e322a diff --git a/engine/card_flip.asm b/engine/card_flip.asm index 0479e8248..cdf2be010 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -76,7 +76,7 @@ _CardFlip: ; e00ee (38:40ee) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e01a0 (38:41a0) .Jumptable: ; e01a0 @@ -652,7 +652,7 @@ CardFlip_BlankDiscardedCardSlot: ; e0534 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e0553 .Jumptable: ; e0553 @@ -829,7 +829,7 @@ CardFlip_CheckWinCondition: ; e0637 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e0643 .Jumptable: ; e0643 diff --git a/engine/credits.asm b/engine/credits.asm index fad8a615e..1888ef27d 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -1,6 +1,6 @@ INCLUDE "includes.asm" -SECTION "Credits", ROMX, BANK[CREDITS] +SECTION "Credits", ROMX const_def const SATOSHI_TAJIRI @@ -263,7 +263,7 @@ Credits_Jumptable: ; 109926 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 109937 diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 29bb0934f..e324ed476 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -125,7 +125,7 @@ PlaceGameFreakPresents: ; e4670 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e467f .dw ; e467f @@ -222,7 +222,7 @@ GameFreakLogoJumper: ; e46ed (39:46ed) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl GameFreakLogoScenes: ; e46fd (39:46fd) dw GameFreakLogoScene1 @@ -438,7 +438,7 @@ IntroSceneJumper: ; e490f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e491e IntroScenes: ; e491e (39:491e) diff --git a/engine/debug.asm b/engine/debug.asm index 78fc52489..9c2bb35c2 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -305,7 +305,7 @@ Function81a74: ; 81a74 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .asm_81a9a call Function81eca @@ -611,7 +611,7 @@ Function81cc2: ; 81cc2 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .asm_81cdf ld a, $4 @@ -1353,7 +1353,7 @@ Function822f0: ; 822f0 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 82301 .dw ; 82301 diff --git a/engine/events.asm b/engine/events.asm index e7598b595..b8d57118e 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -1,6 +1,6 @@ INCLUDE "includes.asm" -SECTION "Events", ROMX, BANK[EVENTS] +SECTION "Events", ROMX OverworldLoop:: ; 966b0 xor a @@ -609,7 +609,7 @@ TryObjectEvent: ; 969b5 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .nope_bugged ; pop bc diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 3e4257ab7..8e3c90204 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1064,7 +1064,7 @@ StartTitleScreen: ; 6219 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 626a .dw @@ -1117,7 +1117,7 @@ TitleScreenScene: ; 62a3 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 62af .scenes diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 3f63030ec..d5fa84642 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1955,7 +1955,7 @@ JumpMovementPointer: ; 505e ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 5065 ContinueReadingMovement: ; 5065 diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 7e8136235..d66ea6fac 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -33,7 +33,7 @@ LoadMenuMonIcon: ; 8e83f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8e854 diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index d80b4717b..4a7ca301a 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -70,7 +70,7 @@ NamingScreen: ; 116c1 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1172e @@ -405,7 +405,7 @@ NamingScreenJoypadLoop: ; 11915 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 11977 @@ -1166,7 +1166,7 @@ INCBIN "gfx/icon/mail2.2bpp" ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 12017 (4:6017) dw .init_blinking_cursor diff --git a/engine/options_menu.asm b/engine/options_menu.asm index 68c1883ee..ec41288ff 100755 --- a/engine/options_menu.asm +++ b/engine/options_menu.asm @@ -90,7 +90,7 @@ GetOptionPointer: ; e42d6 ld a, [hli] ld h, [hl] ld l, a - jp [hl] ; jump to the code of the current highlighted item + jp hl ; jump to the code of the current highlighted item ; e42e5 .Pointers: diff --git a/engine/pack.asm b/engine/pack.asm index 19b7fccbf..8a63d22e5 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -23,7 +23,7 @@ Pack: ; 10000 ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10030 @@ -144,7 +144,7 @@ Pack: ; 10000 ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10124 (4:4124) .MenuDataHeader1: ; 0x10124 @@ -306,7 +306,7 @@ Pack: ; 10000 ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10249 (4:4249) MenuDataHeader_UsableKeyItem: ; 0x10249 @@ -689,7 +689,7 @@ BattlePack: ; 10493 ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 104c3 @@ -846,7 +846,7 @@ TMHMSubmenu: ; 105dc (4:45dc) ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10601 (4:4601) .UsableMenuDataHeader: ; 0x10601 @@ -997,7 +997,7 @@ DepositSellPack: ; 106be ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 106d1 @@ -1144,7 +1144,7 @@ TutorialPack: ; 107bb ld a, [wJumptableIndex] ld hl, .dw call Pack_GetJumptablePointer - jp [hl] + jp hl ; 107e1 diff --git a/engine/pokedex.asm b/engine/pokedex.asm index e61a24964..569bdbb0b 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -182,7 +182,7 @@ Pokedex_RunJumptable: ; 4010b ld a, [wJumptableIndex] ld hl, .Jumptable call Pokedex_LoadPointer - jp [hl] + jp hl .Jumptable: ; 40115 (10:4115) @@ -366,7 +366,7 @@ Pokedex_UpdateDexEntryScreen: ; 40258 (10:4258) ld a, [wDexArrowCursorPosIndex] ld hl, DexEntryScreen_MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .return_to_prev_screen ld a, [LastVolume] @@ -545,7 +545,7 @@ Pokedex_UpdateOptionScreen: ; 403be (10:43be) ld a, [wDexArrowCursorPosIndex] ld hl, .MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .return_to_main_screen call Pokedex_BlackOutBG @@ -647,7 +647,7 @@ Pokedex_UpdateSearchScreen: ; 40471 (10:4471) ld a, [wDexArrowCursorPosIndex] ld hl, .MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .cancel call Pokedex_BlackOutBG @@ -1621,7 +1621,7 @@ Pokedex_OrderMonsByMode: ; 40bdc ld a, [wCurrentDexMode] ld hl, .Jumptable call Pokedex_LoadPointer - jp [hl] + jp hl .Jumptable: ; 40bf0 (10:4bf0) diff --git a/engine/pokegear.asm b/engine/pokegear.asm index d180ee875..c6ea8ed4f 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -235,7 +235,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8) ld l, a ld de, .return_from_jumptable push de - jp [hl] + jp hl .return_from_jumptable call Pokegear_FinishTilemap @@ -431,7 +431,7 @@ PokegearJumptable: ; 90f04 (24:4f04) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 90f13 (24:4f13) dw PokegearClock_Init @@ -1217,7 +1217,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Cancel: ; 913f1 ld hl, PokegearText_WhomToCall @@ -1484,7 +1484,7 @@ UpdateRadioStation: ; 9166f (24:566f) ld l, a ld de, .returnafterstation push de - jp [hl] + jp hl .returnafterstation ld a, [wPokegearRadioChannelBank] @@ -2043,7 +2043,7 @@ PlayRadio: ; 91a53 ld l, a ld de, .jump_return push de - jp [hl] + jp hl .jump_return push de diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm index da1c334ed..37ed2990b 100755 --- a/engine/printer/serial.asm +++ b/engine/printer/serial.asm @@ -26,7 +26,7 @@ PrinterJumptableIteration: ; 84022 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 84031 @@ -468,7 +468,7 @@ _PrinterReceive:: ; 842db ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 842ea diff --git a/engine/radio.asm b/engine/radio.asm index ce3bc7942..99408af48 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -25,7 +25,7 @@ PlayRadioShow: ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl RadioJumptable: dw OaksPkmnTalk1 ; $00 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index ea842ea9c..93be28d9a 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -796,7 +796,7 @@ Function92bd4: ; 92bd4 (24:6bd4) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 92be4 (24:6be4) @@ -1311,7 +1311,7 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94 ld l, a ld de, .return push de - jp [hl] + jp hl .return ld a, [wFirstTwoReelsMatching] @@ -1422,7 +1422,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d ld l, a ld de, .return push de - jp [hl] + jp hl .return ld a, [wSlotMatched] @@ -1855,7 +1855,7 @@ SlotPayoutText: ; 93158 (24:7158) ld l, a ld de, .return push de - jp [hl] + jp hl .return ld hl, .Text_PrintPayout @@ -1958,7 +1958,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 9322d (24:722d) @@ -2059,7 +2059,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 932bc (24:72bc) diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 0e25cafdf..132c0fb5a 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -9,7 +9,7 @@ DoAnimFrame: ; 8d24b ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8d25b .Jumptable: ; 8d25b (23:525b) @@ -134,7 +134,7 @@ DoAnimFrame: ; 8d24b .four ; 8d302 (23:5302) call .AnonymousJumptable - jp [hl] + jp hl ; 8d306 (23:5306) ; Anonymous dw (see .AnonymousJumptable) @@ -418,7 +418,7 @@ DoAnimFrame: ; 8d24b .sixteen ; 8d483 (23:5483) call .AnonymousJumptable - jp [hl] + jp hl ; 8d487 (23:5487) ; Anonymous dw (see .AnonymousJumptable) @@ -855,7 +855,7 @@ DoAnimFrame: ; 8d24b ret .AnonymousJumptable: ; 8d6c5 (23:56c5) - ld hl, [sp+$0] + ld hl, sp+$0 ld e, [hl] inc hl ld d, [hl] diff --git a/engine/startmenu.asm b/engine/startmenu.asm index fa61d99cb..a935b8a07 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -55,7 +55,7 @@ StartMenu:: ; 125cd ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .MenuReturns: dw .Reopen @@ -227,7 +227,7 @@ StartMenu:: ; 125cd ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 127ef .MenuString: ; 127ef @@ -701,7 +701,7 @@ PokemonActionSubmenu: ; 12a88 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .nothing ld a, 0 diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index e9b19c6f7..263a83fc1 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -250,7 +250,7 @@ GetTimePalette: ; 8c117 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8c126 .TimePalettes: diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm index d90f45a82..fa351ba3d 100755 --- a/engine/trade/animation.asm +++ b/engine/trade/animation.asm @@ -232,7 +232,7 @@ DoTradeAnimation: ; 29082 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 290af .JumpTable: ; 290af @@ -549,7 +549,7 @@ TradeAnim_TubeAnimJumptable: ; 29281 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 2928f .Jumptable: ; 2928f @@ -1173,7 +1173,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 29686 .Jumptable: ; 29686 (a:5686) diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 8d46a02a6..a1fed2520 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -183,7 +183,7 @@ UnownPuzzleJumptable: ; e12ca ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e12d9 .Jumptable: ; e12d9 diff --git a/event/field_moves.asm b/event/field_moves.asm index c1b3bc236..82660da2f 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -169,7 +169,7 @@ OWCutJumptable: ; 8ca0c ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8ca1b diff --git a/event/magnet_train.asm b/event/magnet_train.asm index ccc41a59d..75bd12cd7 100755 --- a/event/magnet_train.asm +++ b/event/magnet_train.asm @@ -299,7 +299,7 @@ MagnetTrain_Jumptable: ; 8cdf7 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8ce06 .Jumptable: ; 8ce06 diff --git a/event/mom.asm b/event/mom.asm index 4002f69d2..80513e5fb 100644 --- a/event/mom.asm +++ b/event/mom.asm @@ -28,7 +28,7 @@ Special_BankOfMom: ; 16218 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 16242 .dw ; 16242 diff --git a/gfx/mail.asm b/gfx/mail.asm index fa0736ca6..575fe9ef5 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -107,7 +107,7 @@ ReadAnyMail: ; b9237 ld de, .done pop bc push de - jp [hl] + jp hl .done ret ; b92f8 diff --git a/gfx/pics.asm b/gfx/pics.asm index 8439e164d..0aea68ed8 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -3,19 +3,19 @@ INCLUDE "includes.asm" ; Unown pic pointers are assumed to start at the same address in a different bank. -SECTION "Pic Pointers", ROMX[$4000], BANK[PIC_POINTERS] +SECTION "Pic Pointers", ROMX PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm" -SECTION "Unown Pic Pointers", ROMX[$4000], BANK[UNOWN_PIC_POINTERS] +SECTION "Unown Pic Pointers", ROMX UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm" -SECTION "Trainer Pic Pointers", ROMX, BANK[TRAINER_PIC_POINTERS] +SECTION "Trainer Pic Pointers", ROMX TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm" -SECTION "Pics 1", ROMX, BANK[PICS_1] +SECTION "Pics 1", ROMX HoOhFrontpic: INCBIN "gfx/pics/ho_oh/front.animated.2bpp.lz" MachampFrontpic: INCBIN "gfx/pics/machamp/front.animated.2bpp.lz" @@ -33,7 +33,7 @@ TyphlosionFrontpic: INCBIN "gfx/pics/typhlosion/front.animated.2bpp.lz" ; 123ffa -SECTION "Pics 2", ROMX, BANK[PICS_2] +SECTION "Pics 2", ROMX BlastoiseFrontpic: INCBIN "gfx/pics/blastoise/front.animated.2bpp.lz" RapidashFrontpic: INCBIN "gfx/pics/rapidash/front.animated.2bpp.lz" @@ -54,7 +54,7 @@ QuilavaFrontpic: INCBIN "gfx/pics/quilava/front.animated.2bpp.lz" ; 127ffe -SECTION "Pics 3", ROMX, BANK[PICS_3] +SECTION "Pics 3", ROMX SteelixFrontpic: INCBIN "gfx/pics/steelix/front.animated.2bpp.lz" AlakazamFrontpic: INCBIN "gfx/pics/alakazam/front.animated.2bpp.lz" @@ -77,7 +77,7 @@ OmastarBackpic: INCBIN "gfx/pics/omastar/back.2bpp.lz" ; 12bffe -SECTION "Pics 4", ROMX, BANK[PICS_4] +SECTION "Pics 4", ROMX DodrioFrontpic: INCBIN "gfx/pics/dodrio/front.animated.2bpp.lz" SlowkingFrontpic: INCBIN "gfx/pics/slowking/front.animated.2bpp.lz" @@ -102,7 +102,7 @@ UnownEFrontpic: INCBIN "gfx/pics/unown_e/front.animated.2bpp.lz" ; 130000 -SECTION "Pics 5", ROMX, BANK[PICS_5] +SECTION "Pics 5", ROMX GolbatFrontpic: INCBIN "gfx/pics/golbat/front.animated.2bpp.lz" KinglerFrontpic: INCBIN "gfx/pics/kingler/front.animated.2bpp.lz" @@ -128,7 +128,7 @@ HeracrossFrontpic: INCBIN "gfx/pics/heracross/front.animated.2bpp.lz" ; 133fff -SECTION "Pics 6", ROMX, BANK[PICS_6] +SECTION "Pics 6", ROMX AriadosFrontpic: INCBIN "gfx/pics/ariados/front.animated.2bpp.lz" NoctowlFrontpic: INCBIN "gfx/pics/noctowl/front.animated.2bpp.lz" @@ -156,7 +156,7 @@ DunsparceFrontpic: INCBIN "gfx/pics/dunsparce/front.animated.2bpp.lz" ; 137fff -SECTION "Pics 7", ROMX, BANK[PICS_7] +SECTION "Pics 7", ROMX VaporeonFrontpic: INCBIN "gfx/pics/vaporeon/front.animated.2bpp.lz" GirafarigFrontpic: INCBIN "gfx/pics/girafarig/front.animated.2bpp.lz" @@ -186,7 +186,7 @@ KangaskhanBackpic: INCBIN "gfx/pics/kangaskhan/back.2bpp.lz" ; 13c000 -SECTION "Pics 8", ROMX, BANK[PICS_8] +SECTION "Pics 8", ROMX SeelFrontpic: INCBIN "gfx/pics/seel/front.animated.2bpp.lz" CrobatFrontpic: INCBIN "gfx/pics/crobat/front.animated.2bpp.lz" @@ -218,7 +218,7 @@ QuagsireFrontpic: INCBIN "gfx/pics/quagsire/front.animated.2bpp.lz" ; 13fff7 -SECTION "Pics 9", ROMX, BANK[PICS_9] +SECTION "Pics 9", ROMX EkansFrontpic: INCBIN "gfx/pics/ekans/front.animated.2bpp.lz" SudowoodoFrontpic: INCBIN "gfx/pics/sudowoodo/front.animated.2bpp.lz" @@ -254,7 +254,7 @@ ParasectBackpic: INCBIN "gfx/pics/parasect/back.2bpp.lz" ; 144000 -SECTION "Pics 10", ROMX, BANK[PICS_10] +SECTION "Pics 10", ROMX MisdreavusFrontpic: INCBIN "gfx/pics/misdreavus/front.animated.2bpp.lz" HoundourFrontpic: INCBIN "gfx/pics/houndour/front.animated.2bpp.lz" @@ -294,7 +294,7 @@ UnownFBackpic: INCBIN "gfx/pics/unown_f/back.2bpp.lz" ; 148000 -SECTION "Pics 11", ROMX, BANK[PICS_11] +SECTION "Pics 11", ROMX DodrioBackpic: INCBIN "gfx/pics/dodrio/back.2bpp.lz" ClefairyFrontpic: INCBIN "gfx/pics/clefairy/front.animated.2bpp.lz" @@ -337,7 +337,7 @@ SnorlaxBackpic: INCBIN "gfx/pics/snorlax/back.2bpp.lz" ; 14bffb -SECTION "Pics 12", ROMX, BANK[PICS_12] +SECTION "Pics 12", ROMX VenusaurBackpic: INCBIN "gfx/pics/venusaur/back.2bpp.lz" MoltresBackpic: INCBIN "gfx/pics/moltres/back.2bpp.lz" @@ -383,7 +383,7 @@ StarmieBackpic: INCBIN "gfx/pics/starmie/back.2bpp.lz" ; 150000 -SECTION "Pics 13", ROMX, BANK[PICS_13] +SECTION "Pics 13", ROMX OmanyteBackpic: INCBIN "gfx/pics/omanyte/back.2bpp.lz" PidgeyBackpic: INCBIN "gfx/pics/pidgey/back.2bpp.lz" @@ -431,7 +431,7 @@ ElectrodeFrontpic: INCBIN "gfx/pics/electrode/front.animated.2bpp.lz" ; 153fe3 -SECTION "Pics 14", ROMX, BANK[PICS_14] +SECTION "Pics 14", ROMX SudowoodoBackpic: INCBIN "gfx/pics/sudowoodo/back.2bpp.lz" FlaaffyBackpic: INCBIN "gfx/pics/flaaffy/back.2bpp.lz" @@ -482,7 +482,7 @@ SwinubBackpic: INCBIN "gfx/pics/swinub/back.2bpp.lz" ; 158000 -SECTION "Pics 15", ROMX, BANK[PICS_15] +SECTION "Pics 15", ROMX MewtwoBackpic: INCBIN "gfx/pics/mewtwo/back.2bpp.lz" PokemonProfPic: INCBIN "gfx/trainers/oak.2bpp.lz" @@ -536,7 +536,7 @@ MagnemiteBackpic: INCBIN "gfx/pics/magnemite/back.2bpp.lz" ; 15bffa -SECTION "Pics 16", ROMX, BANK[PICS_16] +SECTION "Pics 16", ROMX HoothootBackpic: INCBIN "gfx/pics/hoothoot/back.2bpp.lz" NoctowlBackpic: INCBIN "gfx/pics/noctowl/back.2bpp.lz" @@ -594,7 +594,7 @@ UnownHBackpic: INCBIN "gfx/pics/unown_h/back.2bpp.lz" ; 15ffff -SECTION "Pics 17", ROMX, BANK[PICS_17] +SECTION "Pics 17", ROMX ParasBackpic: INCBIN "gfx/pics/paras/back.2bpp.lz" VaporeonBackpic: INCBIN "gfx/pics/vaporeon/back.2bpp.lz" @@ -660,7 +660,7 @@ UnownDBackpic: INCBIN "gfx/pics/unown_d/back.2bpp.lz" ; 163ffc -SECTION "Pics 18", ROMX, BANK[PICS_18] +SECTION "Pics 18", ROMX SpinarakBackpic: INCBIN "gfx/pics/spinarak/back.2bpp.lz" RaikouBackpic: INCBIN "gfx/pics/raikou/back.2bpp.lz" @@ -725,7 +725,7 @@ UnownRBackpic: INCBIN "gfx/pics/unown_r/back.2bpp.lz" ; 1669d3 -SECTION "Pics 19", ROMX, BANK[PICS_19] +SECTION "Pics 19", ROMX ; Seems to be an accidental copy of the previous bank @@ -1,18 +1,18 @@ INCLUDE "includes.asm" -SECTION "NULL", ROM0[0] +SECTION "NULL", ROM0 NULL:: INCLUDE "rst.asm" INCLUDE "interrupts.asm" -SECTION "Header", ROM0[$100] +SECTION "Header", ROM0 Start:: nop jp _Start -SECTION "Home", ROM0[$150] +SECTION "Home", ROM0 INCLUDE "home/init.asm" INCLUDE "home/vblank.asm" @@ -152,7 +152,7 @@ INCLUDE "home/sram.asm" ; Register aliases _hl_:: ; 2fec - jp [hl] + jp hl ; 2fed _de_:: ; 2fed diff --git a/home/farcall.asm b/home/farcall.asm index 944087465..27649f30e 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -50,5 +50,5 @@ ReturnFarCall:: ; 2d6e ; 2d82 FarJump_hl:: ; 2d82 - jp [hl] + jp hl ; 2d83 diff --git a/home/menu.asm b/home/menu.asm index 563ee9f99..53e4457e3 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -337,7 +337,7 @@ RunMenuItemPrintingFunction:: ; 1eda ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1eff InitMenuCursorAndButtonPermissions:: ; 1eff @@ -470,7 +470,7 @@ MenuJumptable:: ; 1fa7 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1fb1 GetMenuDataPointerTableEntry:: ; 1fb1 diff --git a/home/text.asm b/home/text.asm index a5ddf43c9..f7730319a 100644 --- a/home/text.asm +++ b/home/text.asm @@ -943,7 +943,7 @@ Text_START_ASM:: ; 14c9 bit 7, h jr nz, .not_rom - jp [hl] + jp hl .not_rom ld a, "@" diff --git a/interrupts.asm b/interrupts.asm index c5e357780..ba09578ea 100644 --- a/interrupts.asm +++ b/interrupts.asm @@ -1,16 +1,16 @@ ; Game Boy hardware interrupts -SECTION "vblank",ROM0[$40] +SECTION "vblank",ROM0 jp VBlank -SECTION "lcd",ROM0[$48] +SECTION "lcd",ROM0 jp LCD -SECTION "timer",ROM0[$50] +SECTION "timer",ROM0 jp Timer -SECTION "serial",ROM0[$58] +SECTION "serial",ROM0 jp Serial -SECTION "joypad",ROM0[$60] +SECTION "joypad",ROM0 jp JoypadInt diff --git a/items/item_effects.asm b/items/item_effects.asm index 7061909f6..c13568a5d 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -263,7 +263,7 @@ ParkBall: ; e8a2 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, [CurItem] diff --git a/macros.asm b/macros.asm index c4fd73b3e..13aff261d 100644 --- a/macros.asm +++ b/macros.asm @@ -281,7 +281,7 @@ jumptable: MACRO ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl endm maskbits: macro @@ -1,6 +1,6 @@ INCLUDE "includes.asm" -SECTION "bank1", ROMX, BANK[$1] +SECTION "bank1", ROMX PlaceWaitingText:: ; 4000 hlcoord 3, 10 @@ -246,14 +246,14 @@ Predef1: ; 747a ; not used ret -SECTION "bank2", ROMX, BANK[$2] +SECTION "bank2", ROMX INCLUDE "engine/player_object.asm" INCLUDE "engine/sine.asm" INCLUDE "engine/predef.asm" INCLUDE "engine/color.asm" -SECTION "bank3", ROMX, BANK[$3] +SECTION "bank3", ROMX CheckTime:: ; c000 ld a, [TimeOfDay] @@ -380,7 +380,7 @@ KnowsMove: ; f9ea text_jump UnknownText_0x1c5ea8 db "@" -SECTION "bank4", ROMX, BANK[$4] +SECTION "bank4", ROMX INCLUDE "engine/pack.asm" INCLUDE "engine/time.asm" @@ -603,7 +603,7 @@ root set 1 root set root+1 endr -SECTION "bank5", ROMX, BANK[$5] +SECTION "bank5", ROMX INCLUDE "engine/rtc.asm" INCLUDE "engine/overworld.asm" @@ -620,27 +620,27 @@ INCLUDE "event/daycare.asm" INCLUDE "event/photo.asm" INCLUDE "engine/breeding/egg.asm" -SECTION "Tileset Data 1", ROMX, BANK[TILESETS_1] +SECTION "Tileset Data 1", ROMX INCLUDE "tilesets/data_1.asm" -SECTION "Roofs", ROMX, BANK[ROOFS] +SECTION "Roofs", ROMX INCLUDE "tilesets/roofs.asm" -SECTION "Tileset Data 2", ROMX, BANK[TILESETS_2] +SECTION "Tileset Data 2", ROMX INCLUDE "tilesets/data_2.asm" -SECTION "bank8", ROMX, BANK[$8] +SECTION "bank8", ROMX INCLUDE "engine/clock_reset.asm" -SECTION "Tileset Data 3", ROMX, BANK[TILESETS_3] +SECTION "Tileset Data 3", ROMX INCLUDE "tilesets/data_3.asm" -SECTION "bank9", ROMX, BANK[$9] +SECTION "bank9", ROMX StringBufferPointers:: ; 24000 dw StringBuffer3 @@ -1159,7 +1159,7 @@ Kurt_SelectQuantity_InterpretJoypad: ; 27a28 ld b, a ret -SECTION "bankA", ROMX, BANK[$A] +SECTION "bankA", ROMX INCLUDE "engine/link.asm" @@ -1183,7 +1183,7 @@ INCBIN "gfx/misc/player.6x6.2bpp.lz" DudeBackpic: ; 2bbaa INCBIN "gfx/misc/dude.6x6.2bpp.lz" -SECTION "bankB", ROMX, BANK[$B] +SECTION "bankB", ROMX INCLUDE "battle/trainer_huds.asm" @@ -1618,15 +1618,15 @@ PlaceGraphic: ; 2ef6e jr nz, .x2 ret -SECTION "Tileset Data 4", ROMX, BANK[TILESETS_4] +SECTION "Tileset Data 4", ROMX INCLUDE "tilesets/data_4.asm" -SECTION "Effect Commands", ROMX, BANK[$D] +SECTION "Effect Commands", ROMX INCLUDE "battle/effect_commands.asm" -SECTION "Enemy Trainers", ROMX, BANK[$E] +SECTION "Enemy Trainers", ROMX INCLUDE "battle/ai/items.asm" @@ -1706,13 +1706,13 @@ INCLUDE "trainers/trainer_pointers.asm" INCLUDE "trainers/trainers.asm" -SECTION "Battle Core", ROMX, BANK[$F] +SECTION "Battle Core", ROMX INCLUDE "battle/core.asm" INCLUDE "battle/effect_command_pointers.asm" -SECTION "bank10", ROMX, BANK[$10] +SECTION "bank10", ROMX INCLUDE "engine/pokedex.asm" @@ -1720,7 +1720,7 @@ INCLUDE "battle/moves/moves.asm" INCLUDE "engine/evolve.asm" -SECTION "bank11", ROMX, BANK[$11] +SECTION "bank11", ROMX INCLUDE "engine/fruit_trees.asm" @@ -1852,7 +1852,7 @@ DisplayDexEntry: ; 4424d jr z, .skip_height push hl push de - ld hl, [sp+$0] + ld hl, sp+$0 ld d, h ld e, l hlcoord 12, 7 @@ -1876,7 +1876,7 @@ DisplayDexEntry: ; 4424d or d jr z, .skip_weight push de - ld hl, [sp+$0] + ld hl, sp+$0 ld d, h ld e, l hlcoord 11, 9 @@ -1946,7 +1946,7 @@ INCLUDE "data/pokedex/entry_pointers.asm" INCLUDE "engine/mail.asm" -SECTION "Crystal Unique", ROMX, BANK[$12] +SECTION "Crystal Unique", ROMX INCLUDE "engine/init_gender.asm" @@ -2153,7 +2153,7 @@ Buena_ExitMenu: ; 4ae5e ld [hOAMUpdate], a ret -SECTION "bank13", ROMX, BANK[$13] +SECTION "bank13", ROMX SwapTextboxPalettes:: ; 4c000 hlcoord 0, 0 @@ -3214,7 +3214,7 @@ CatchTutorial:: ; 4e554 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .dw ; 4e564 (13:6564) dw .DudeTutorial @@ -3538,7 +3538,7 @@ INCLUDE "misc/gbc_only.asm" INCLUDE "event/poke_seer.asm" -SECTION "bank14", ROMX, BANK[$14] +SECTION "bank14", ROMX INCLUDE "engine/party_menu.asm" INCLUDE "event/poisonstep.asm" @@ -4666,11 +4666,11 @@ UnknownEggPic:: ; 53d9c ; Another egg pic. This is shifted up a few pixels. INCBIN "gfx/misc/unknown_egg.5x5.2bpp.lz" -SECTION "bank19", ROMX, BANK[$19] +SECTION "bank19", ROMX INCLUDE "text/phone/extra.asm" -SECTION "bank20", ROMX, BANK[$20] +SECTION "bank20", ROMX INCLUDE "engine/player_movement.asm" @@ -4683,7 +4683,7 @@ INCLUDE "text/battle.asm" INCLUDE "engine/debug.asm" -SECTION "bank21", ROMX, BANK[$21] +SECTION "bank21", ROMX INCLUDE "engine/printer.asm" @@ -4691,7 +4691,7 @@ INCLUDE "battle/anim_gfx.asm" INCLUDE "event/halloffame.asm" -SECTION "bank22", ROMX, BANK[$22] +SECTION "bank22", ROMX INCLUDE "event/kurt.asm" @@ -4969,7 +4969,7 @@ INCLUDE "event/dratini.asm" INCLUDE "event/battle_tower.asm" INCLUDE "misc/mobile_22_2.asm" -SECTION "bank23", ROMX, BANK[$23] +SECTION "bank23", ROMX Predef35: ; 8c000 Predef36: @@ -4998,7 +4998,7 @@ INCLUDE "engine/sprites.asm" INCLUDE "engine/mon_icons.asm" -SECTION "bank24", ROMX, BANK[$24] +SECTION "bank24", ROMX INCLUDE "engine/phone.asm" INCLUDE "engine/timeset.asm" @@ -5007,12 +5007,12 @@ INCLUDE "engine/pokegear.asm" INCLUDE "engine/fish.asm" INCLUDE "engine/slot_machine.asm" -SECTION "Phone Engine", ROMX, BANK[$28] +SECTION "Phone Engine", ROMX INCLUDE "engine/more_phone_scripts.asm" INCLUDE "engine/buena_phone_scripts.asm" -SECTION "Phone Text", ROMX, BANK[$29] +SECTION "Phone Text", ROMX INCLUDE "text/phone/anthony_overworld.asm" INCLUDE "text/phone/todd_overworld.asm" @@ -5032,11 +5032,11 @@ INCLUDE "text/phone/kenji_overworld.asm" INCLUDE "text/phone/parry_overworld.asm" INCLUDE "text/phone/erin_overworld.asm" -SECTION "Tileset Data 5", ROMX, BANK[TILESETS_5] +SECTION "Tileset Data 5", ROMX INCLUDE "tilesets/data_5.asm" -SECTION "bank2E", ROMX, BANK[$2E] +SECTION "bank2E", ROMX INCLUDE "engine/events_3.asm" @@ -5044,7 +5044,7 @@ INCLUDE "engine/radio.asm" INCLUDE "gfx/mail.asm" -SECTION "bank2F", ROMX, BANK[$2F] +SECTION "bank2F", ROMX INCLUDE "engine/std_scripts.asm" @@ -5082,15 +5082,15 @@ StartBattleWithMapTrainerScript: ; 0xbe68a AlreadyBeatenTrainerScript: scripttalkafter -SECTION "bank30", ROMX, BANK[$30] +SECTION "bank30", ROMX INCLUDE "gfx/overworld/sprites_1.asm" -SECTION "bank31", ROMX, BANK[$31] +SECTION "bank31", ROMX INCLUDE "gfx/overworld/sprites_2.asm" -SECTION "bank32", ROMX, BANK[$32] +SECTION "bank32", ROMX INCLUDE "battle/bg_effects.asm" @@ -5148,7 +5148,7 @@ LoadPoisonBGPals: ; cbcdd TheEndGFX:: ; cbd2e INCBIN "gfx/credits/theend.2bpp" -SECTION "bank33", ROMX, BANK[$33] +SECTION "bank33", ROMX DisplayCaughtContestMonStats: ; cc000 @@ -5263,7 +5263,7 @@ INCLUDE "battle/anim_commands.asm" INCLUDE "battle/anim_objects.asm" -SECTION "Pic Animations 1", ROMX, BANK[$34] +SECTION "Pic Animations 1", ROMX INCLUDE "gfx/pics/animation.asm" @@ -5303,26 +5303,26 @@ INCLUDE "gfx/pics/bitmasks.asm" INCLUDE "gfx/pics/unown_bitmask_pointers.asm" INCLUDE "gfx/pics/unown_bitmasks.asm" -SECTION "Pic Animations 2", ROMX, BANK[$35] +SECTION "Pic Animations 2", ROMX INCLUDE "gfx/pics/frame_pointers.asm" INCLUDE "gfx/pics/kanto_frames.asm" -SECTION "bank36", ROMX, BANK[$36] +SECTION "bank36", ROMX FontInversed: INCBIN "gfx/misc/font_inversed.1bpp" -SECTION "Pic Animations 3", ROMX, BANK[$36] +SECTION "Pic Animations 3", ROMX INCLUDE "gfx/pics/johto_frames.asm" INCLUDE "gfx/pics/unown_frame_pointers.asm" INCLUDE "gfx/pics/unown_frames.asm" -SECTION "Tileset Data 6", ROMX, BANK[TILESETS_6] +SECTION "Tileset Data 6", ROMX INCLUDE "tilesets/data_6.asm" -SECTION "bank38", ROMX, BANK[$38] +SECTION "bank38", ROMX RotateUnownFrontpic: ; e0000 ; something to do with Unown printer @@ -5449,7 +5449,7 @@ INCLUDE "engine/unown_puzzle.asm" INCLUDE "engine/dummy_game.asm" INCLUDE "engine/billspc.asm" -SECTION "bank39", ROMX, BANK[$39] +SECTION "bank39", ROMX CopyrightGFX:: ; e4000 INCBIN "gfx/misc/copyright.2bpp" @@ -5457,7 +5457,7 @@ INCBIN "gfx/misc/copyright.2bpp" INCLUDE "engine/options_menu.asm" INCLUDE "engine/crystal_intro.asm" -SECTION "bank3E", ROMX, BANK[$3E] +SECTION "bank3E", ROMX INCLUDE "gfx/font.asm" INCLUDE "engine/time_capsule/conversion.asm" @@ -5468,7 +5468,7 @@ INCLUDE "battle/hidden_power.asm" INCLUDE "battle/misc.asm" -SECTION "bank3F", ROMX, BANK[$3F] +SECTION "bank3F", ROMX INCLUDE "tilesets/animations.asm" @@ -5476,11 +5476,11 @@ INCLUDE "engine/npctrade.asm" INCLUDE "event/mom_phone.asm" -SECTION "bank40", ROMX, BANK[$40] +SECTION "bank40", ROMX INCLUDE "misc/mobile_40.asm" -SECTION "bank41", ROMX, BANK[$41] +SECTION "bank41", ROMX INCLUDE "misc/gfx_41.asm" @@ -5492,11 +5492,11 @@ INCLUDE "battle/used_move_text.asm" INCLUDE "misc/mobile_41.asm" -SECTION "bank42", ROMX, BANK[$42] +SECTION "bank42", ROMX INCLUDE "misc/mobile_42.asm" -SECTION "Intro Logo", ROMX, BANK[$42] +SECTION "Intro Logo", ROMX IntroLogoGFX: ; 109407 INCBIN "gfx/intro/logo.2bpp.lz" @@ -5508,24 +5508,24 @@ INCLUDE "engine/title.asm" INCLUDE "misc/mobile_45.asm" INCLUDE "misc/mobile_46.asm" -SECTION "bank47", ROMX, BANK[$47] +SECTION "bank47", ROMX INCLUDE "misc/battle_tower_47.asm" -SECTION "bank5B", ROMX, BANK[$5B] +SECTION "bank5B", ROMX INCLUDE "misc/mobile_5b.asm" INCLUDE "engine/link_trade.asm" -SECTION "bank5C", ROMX, BANK[$5C] +SECTION "bank5C", ROMX INCLUDE "misc/mobile_5c.asm" -SECTION "bank5D", ROMX, BANK[$5D] +SECTION "bank5D", ROMX INCLUDE "text/phone/extra3.asm" -SECTION "bank5E", ROMX, BANK[$5E] +SECTION "bank5E", ROMX _UpdateBattleHUDs: callba DrawPlayerHUD @@ -5539,7 +5539,7 @@ _UpdateBattleHUDs: INCLUDE "misc/mobile_5f.asm" -SECTION "Common Text 1", ROMX, BANK[$6C] +SECTION "Common Text 1", ROMX INCLUDE "text/stdtext.asm" INCLUDE "text/phone/jack_overworld.asm" @@ -5554,14 +5554,14 @@ INCLUDE "text/phone/wade_overworld.asm" INCLUDE "text/phone/ralph_overworld.asm" INCLUDE "text/phone/liz_overworld.asm" -SECTION "bank6D", ROMX, BANK[$6D] +SECTION "bank6D", ROMX INCLUDE "text/phone/mom.asm" INCLUDE "text/phone/bill.asm" INCLUDE "text/phone/elm.asm" INCLUDE "text/phone/trainers1.asm" -SECTION "bank72", ROMX, BANK[$72] +SECTION "bank72", ROMX ItemNames:: INCLUDE "items/item_names.asm" @@ -5573,7 +5573,7 @@ INCLUDE "battle/move_names.asm" INCLUDE "engine/landmarks.asm" -SECTION "bank77", ROMX, BANK[$77] +SECTION "bank77", ROMX UnownFont: ; 1dc000 INCBIN "gfx/misc/unown_font.2bpp" @@ -5586,11 +5586,11 @@ INCBIN "gfx/mobile/hp.1bpp" MobileLvIcon: ; 1dc599 INCBIN "gfx/mobile/lv.1bpp" -SECTION "Tileset Data 7", ROMX, BANK[TILESETS_7] +SECTION "Tileset Data 7", ROMX INCLUDE "tilesets/data_7.asm" -SECTION "bank77_2", ROMX, BANK[$77] +SECTION "bank77_2", ROMX Function1dd6a9: ; 1dd6a9 ; XXX @@ -5599,7 +5599,7 @@ Function1dd6a9: ; 1dd6a9 ld c, a push bc push de - ld hl, [sp+$2] + ld hl, sp+$2 ld d, h ld e, l pop hl @@ -5625,7 +5625,7 @@ PrintHoursMins ; 1dd6bb (77:56bb) ld b, a ; Crazy stuff happening with the stack push bc - ld hl, [sp+$1] + ld hl, sp+$1 push de push hl pop de @@ -5637,7 +5637,7 @@ PrintHoursMins ; 1dd6bb (77:56bb) inc hl ld d, h ld e, l - ld hl, [sp+$0] + ld hl, sp+$0 push de push hl pop de @@ -6021,19 +6021,19 @@ LeggiPostaInglese: jr nz, .loop ret -SECTION "Tileset Data 8", ROMX, BANK[TILESETS_8] +SECTION "Tileset Data 8", ROMX INCLUDE "tilesets/data_8.asm" -SECTION "bank7B", ROMX, BANK[$7B] +SECTION "bank7B", ROMX INCLUDE "text/battle_tower.asm" -SECTION "bank7C", ROMX, BANK[$7C] +SECTION "bank7C", ROMX INCLUDE "data/battle_tower_2.asm" -SECTION "bank7D", ROMX, BANK[$7D] +SECTION "bank7D", ROMX db $cc, $6b, $1e ; XXX @@ -6078,14 +6078,14 @@ Function1f5d9f: ; 1f5d9f .unknown_data INCBIN "unknown/1f5db4.bin" -SECTION "bank7E", ROMX, BANK[$7E] +SECTION "bank7E", ROMX INCLUDE "data/battle_tower.asm" INCLUDE "data/odd_eggs.asm" -SECTION "bank7F", ROMX, BANK[$7F] +SECTION "bank7F", ROMX -SECTION "stadium2", ROMX[$8000-$220], BANK[$7F] +SECTION "stadium2", ROMX IF DEF(CRYSTAL11) INCBIN "misc/stadium2_2.bin" @@ -1,30 +1,30 @@ INCLUDE "includes.asm" -SECTION "Map Headers", ROMX, BANK[MAP_HEADERS] +SECTION "Map Headers", ROMX INCLUDE "maps/map_headers.asm" INCLUDE "maps/second_map_headers.asm" -SECTION "Map Blockdata 1", ROMX, BANK[MAPS_1] +SECTION "Map Blockdata 1", ROMX INCLUDE "maps/blockdata_1.asm" -SECTION "Map Blockdata 2", ROMX, BANK[MAPS_2] +SECTION "Map Blockdata 2", ROMX INCLUDE "maps/blockdata_2.asm" -SECTION "Map Blockdata 3", ROMX, BANK[MAPS_3] +SECTION "Map Blockdata 3", ROMX INCLUDE "maps/blockdata_3.asm" -SECTION "Map Scripts 1", ROMX, BANK[MAP_SCRIPTS_1] +SECTION "Map Scripts 1", ROMX INCLUDE "maps/GoldenrodGym.asm" INCLUDE "maps/GoldenrodBikeShop.asm" @@ -45,7 +45,7 @@ INCLUDE "maps/GoldenrodDeptStoreRoof.asm" INCLUDE "maps/GoldenrodGameCorner.asm" -SECTION "Map Scripts 2", ROMX, BANK[MAP_SCRIPTS_2] +SECTION "Map Scripts 2", ROMX INCLUDE "maps/RuinsofAlphOutside.asm" INCLUDE "maps/RuinsofAlphHoOhChamber.asm" @@ -73,7 +73,7 @@ INCLUDE "maps/OlivineLighthouse3F.asm" INCLUDE "maps/OlivineLighthouse4F.asm" -SECTION "Map Scripts 3", ROMX, BANK[MAP_SCRIPTS_3] +SECTION "Map Scripts 3", ROMX INCLUDE "maps/NationalPark.asm" INCLUDE "maps/NationalParkBugContest.asm" @@ -83,7 +83,7 @@ INCLUDE "maps/RadioTower3F.asm" INCLUDE "maps/RadioTower4F.asm" -SECTION "Map Scripts 4", ROMX, BANK[MAP_SCRIPTS_4] +SECTION "Map Scripts 4", ROMX INCLUDE "maps/RadioTower5F.asm" INCLUDE "maps/OlivineLighthouse5F.asm" @@ -95,7 +95,7 @@ INCLUDE "maps/Route34IlexForestGate.asm" INCLUDE "maps/DayCare.asm" -SECTION "Map Scripts 5", ROMX, BANK[MAP_SCRIPTS_5] +SECTION "Map Scripts 5", ROMX INCLUDE "maps/Route11.asm" INCLUDE "maps/VioletMart.asm" @@ -112,7 +112,7 @@ INCLUDE "maps/Route36RuinsofAlphgate.asm" INCLUDE "maps/Route36NationalParkgate.asm" -SECTION "Map Scripts 6", ROMX, BANK[MAP_SCRIPTS_6] +SECTION "Map Scripts 6", ROMX INCLUDE "maps/Route8.asm" INCLUDE "maps/MahoganyMart1F.asm" @@ -122,7 +122,7 @@ INCLUDE "maps/TeamRocketBaseB3F.asm" INCLUDE "maps/IlexForest.asm" -SECTION "Map Scripts 7", ROMX, BANK[MAP_SCRIPTS_7] +SECTION "Map Scripts 7", ROMX INCLUDE "maps/LakeofRage.asm" INCLUDE "maps/CeladonDeptStore1F.asm" @@ -149,7 +149,7 @@ INCLUDE "maps/Route7SaffronGate.asm" INCLUDE "maps/Route1718Gate.asm" -SECTION "Map Scripts 8", ROMX, BANK[MAP_SCRIPTS_8] +SECTION "Map Scripts 8", ROMX INCLUDE "maps/DiglettsCave.asm" INCLUDE "maps/MountMoon.asm" @@ -173,7 +173,7 @@ INCLUDE "maps/MountMoonGiftShop.asm" INCLUDE "maps/TinTowerRoof.asm" -SECTION "Map Scripts 9", ROMX, BANK[MAP_SCRIPTS_9] +SECTION "Map Scripts 9", ROMX INCLUDE "maps/Route34.asm" INCLUDE "maps/ElmsLab.asm" @@ -187,7 +187,7 @@ INCLUDE "maps/Route27SandstormHouse.asm" INCLUDE "maps/Route2946Gate.asm" -SECTION "Map Scripts 10", ROMX, BANK[MAP_SCRIPTS_10] +SECTION "Map Scripts 10", ROMX INCLUDE "maps/Route22.asm" INCLUDE "maps/WarehouseEntrance.asm" @@ -215,7 +215,7 @@ INCLUDE "maps/Route8SaffronGate.asm" INCLUDE "maps/Route12SuperRodHouse.asm" -SECTION "Map Scripts 11", ROMX, BANK[MAP_SCRIPTS_11] +SECTION "Map Scripts 11", ROMX INCLUDE "maps/EcruteakHouse.asm" INCLUDE "maps/WiseTriosRoom.asm" @@ -237,7 +237,7 @@ INCLUDE "maps/Route2Gate.asm" INCLUDE "maps/VictoryRoadGate.asm" -SECTION "Map Scripts 12", ROMX, BANK[MAP_SCRIPTS_12] +SECTION "Map Scripts 12", ROMX INCLUDE "maps/OlivinePokeCenter1F.asm" INCLUDE "maps/OlivineGym.asm" @@ -265,7 +265,7 @@ INCLUDE "maps/Route40BattleTowerGate.asm" INCLUDE "maps/BattleTowerOutside.asm" -SECTION "Map Scripts 13", ROMX, BANK[MAP_SCRIPTS_13] +SECTION "Map Scripts 13", ROMX INCLUDE "maps/IndigoPlateauPokeCenter1F.asm" INCLUDE "maps/WillsRoom.asm" @@ -276,7 +276,7 @@ INCLUDE "maps/LancesRoom.asm" INCLUDE "maps/HallOfFame.asm" -SECTION "Map Scripts 14", ROMX, BANK[MAP_SCRIPTS_14] +SECTION "Map Scripts 14", ROMX INCLUDE "maps/CeruleanCity.asm" INCLUDE "maps/SproutTower1F.asm" @@ -295,7 +295,7 @@ INCLUDE "maps/BurnedTower1F.asm" INCLUDE "maps/BurnedTowerB1F.asm" -SECTION "Map Scripts 15", ROMX, BANK[MAP_SCRIPTS_15] +SECTION "Map Scripts 15", ROMX INCLUDE "maps/CeruleanGymBadgeSpeechHouse.asm" INCLUDE "maps/CeruleanPoliceStation.asm" @@ -323,7 +323,7 @@ INCLUDE "maps/Route5SaffronCityGate.asm" INCLUDE "maps/Route5CleanseTagSpeechHouse.asm" -SECTION "Map Scripts 16", ROMX, BANK[MAP_SCRIPTS_16] +SECTION "Map Scripts 16", ROMX INCLUDE "maps/PewterCity.asm" INCLUDE "maps/WhirlIslandNW.asm" @@ -351,7 +351,7 @@ INCLUDE "maps/KurtsHouse.asm" INCLUDE "maps/AzaleaGym.asm" -SECTION "Map Scripts 17", ROMX, BANK[MAP_SCRIPTS_17] +SECTION "Map Scripts 17", ROMX INCLUDE "maps/MahoganyTown.asm" INCLUDE "maps/Route32.asm" @@ -373,7 +373,7 @@ INCLUDE "maps/MobileTradeRoomMobile.asm" INCLUDE "maps/MobileBattleRoom.asm" -SECTION "Map Scripts 18", ROMX, BANK[MAP_SCRIPTS_18] +SECTION "Map Scripts 18", ROMX INCLUDE "maps/Route36.asm" INCLUDE "maps/FuchsiaCity.asm" @@ -402,7 +402,7 @@ INCLUDE "maps/MrPokemonsHouse.asm" INCLUDE "maps/Route31VioletGate.asm" -SECTION "Map Scripts 19", ROMX, BANK[MAP_SCRIPTS_19] +SECTION "Map Scripts 19", ROMX INCLUDE "maps/AzaleaTown.asm" INCLUDE "maps/GoldenrodCity.asm" @@ -421,7 +421,7 @@ INCLUDE "maps/BluesHouse.asm" INCLUDE "maps/OaksLab.asm" -SECTION "Map Scripts 20", ROMX, BANK[MAP_SCRIPTS_20] +SECTION "Map Scripts 20", ROMX INCLUDE "maps/CherrygroveCity.asm" INCLUDE "maps/Route35.asm" @@ -432,7 +432,7 @@ INCLUDE "maps/Route19.asm" INCLUDE "maps/Route25.asm" -SECTION "Map Scripts 21", ROMX, BANK[MAP_SCRIPTS_21] +SECTION "Map Scripts 21", ROMX INCLUDE "maps/CianwoodCity.asm" INCLUDE "maps/Route27.asm" @@ -448,7 +448,7 @@ INCLUDE "maps/PewterPokeCEnter2FBeta.asm" INCLUDE "maps/PewterSnoozeSpeechHouse.asm" -SECTION "Map Scripts 22", ROMX, BANK[MAP_SCRIPTS_22] +SECTION "Map Scripts 22", ROMX INCLUDE "maps/EcruteakCity.asm" INCLUDE "maps/BlackthornCity.asm" @@ -461,7 +461,7 @@ INCLUDE "maps/Route41.asm" INCLUDE "maps/Route12.asm" -SECTION "Map Scripts 23", ROMX, BANK[MAP_SCRIPTS_23] +SECTION "Map Scripts 23", ROMX INCLUDE "maps/NewBarkTown.asm" INCLUDE "maps/VioletCity.asm" @@ -480,7 +480,7 @@ INCLUDE "maps/Route19FuchsiaGate.asm" INCLUDE "maps/SeafoamGym.asm" -SECTION "Map Scripts 24", ROMX, BANK[MAP_SCRIPTS_24] +SECTION "Map Scripts 24", ROMX INCLUDE "maps/Route33.asm" INCLUDE "maps/Route2.asm" @@ -506,7 +506,7 @@ INCLUDE "maps/SilverCavePokeCenter1F.asm" INCLUDE "maps/Route28FamousSpeechHouse.asm" -SECTION "Map Scripts 25", ROMX, BANK[MAP_SCRIPTS_25] +SECTION "Map Scripts 25", ROMX INCLUDE "maps/SilverCaveOutside.asm" INCLUDE "maps/Route10North.asm" diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index 09c827146..4d996167f 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -222,7 +222,7 @@ _BattleTowerBattle: ; 17022c ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 170249 .dw ; 170249 @@ -692,7 +692,7 @@ Function1704e1: ; 1704e1 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 17051f .dw ; 17051f @@ -947,7 +947,7 @@ BattleTowerAction: ; 170687 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 170696 @@ -1443,7 +1443,7 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .invalid ld a, $5 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/fixed_words.asm b/misc/fixed_words.asm index 14ef91e9d..b471ff013 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -2516,7 +2516,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: dw .zero diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index e3a1a0375..952742ec1 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -240,7 +240,7 @@ CallInSafeGFXMode: ; 104177 ; 10419c ._hl_ ; 10419c - jp [hl] + jp hl ; 10419d 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 331242d88..6a38e67c2 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_42.asm b/misc/mobile_42.asm index 60f9e6d66..d08bc8882 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -377,7 +377,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 10828a .Jumptable: ; 10828a diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 10242b77e..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 @@ -146,7 +146,7 @@ Function114243:: ; 114243 ld h, [hl] ld l, a pop de - jp [hl] + jp hl ; 11425c @@ -5397,7 +5397,7 @@ Function11659d: ; 11659d ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1165af @@ -6835,7 +6835,7 @@ Unknown_117356: ; 117356 ; 117656 -SECTION "Mobile Stadium", ROMX, BANK[$45] +SECTION "Mobile Stadium", ROMX Special_GiveOddEgg: ; 117656 callba GiveOddEgg @@ -6931,7 +6931,7 @@ Function117719: ; 117719 (45:7719) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl Jumptable_117728: ; 117728 (45:7728) dw Function117738 @@ -7419,7 +7419,7 @@ Function117ae9: ; 0x117ae9 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 0x117af8 dw Function117b06 diff --git a/misc/mobile_45_sprite_engine.asm b/misc/mobile_45_sprite_engine.asm index d0183b2ca..57c45e43c 100755 --- a/misc/mobile_45_sprite_engine.asm +++ b/misc/mobile_45_sprite_engine.asm @@ -380,7 +380,7 @@ Function1161b8: ; 1161b8 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1161c7 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 644989872..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) @@ -5874,7 +5874,7 @@ Function11ad6e: ; 11ad6e ld a, [wJumptableIndex] ld hl, Jumptable_11ad78 call Function11b239 - jp [hl] + jp hl ; 11ad78 Jumptable_11ad78: ; 11ad78 diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index 5f72f32c7..ef9db89a8 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -373,7 +373,7 @@ Function171a36: ; 171a36 (5c:5a36) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl Jumptable_171a45: ; 171a45 (5c:5a45) dw Function171a95 diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 2ce71049f..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 @@ -1146,7 +1146,7 @@ Function17d711: ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl asm_17d721 call Function17e5af @@ -3746,7 +3746,7 @@ Function17f047: ; 17f047 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .finished scf 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 diff --git a/pokecrystal.ld b/pokecrystal.ld new file mode 100644 index 000000000..a7100882d --- /dev/null +++ b/pokecrystal.ld @@ -0,0 +1,498 @@ +ROM0 + org $0000 + "NULL" + "rst0" + org $0008 + "rst8" + org $0010 + "rst10" + org $0018 + "rst18" + org $0020 + "rst20" + org $0028 + "rst28" + org $0038 + "rst38" + org $0040 + "vblank" + org $0048 + "lcd" + org $0050 + "timer" + org $0058 + "serial" + org $0060 + "joypad" + org $0100 + "Header" + org $0150 + "Home" +ROMX $01 + org $4000 + "bank1" +ROMX $02 + org $4000 + "bank2" +ROMX $03 + org $4000 + "bank3" +ROMX $04 + org $4000 + "bank4" +ROMX $05 + org $4000 + "bank5" +ROMX $06 + org $4000 + "Tileset Data 1" +ROMX $07 + org $4000 + "Roofs" + "Tileset Data 2" + "Extra Songs 1" +ROMX $08 + org $4000 + "bank8" + "Tileset Data 3" + "Egg Moves" +ROMX $09 + org $4000 + "bank9" +ROMX $0a + org $4000 + "bankA" +ROMX $0b + org $4000 + "bankB" +ROMX $0c + org $4000 + "Tileset Data 4" +ROMX $0d + org $4000 + "Effect Commands" +ROMX $0e + org $4000 + "Enemy Trainers" +ROMX $0f + org $4000 + "Battle Core" +ROMX $10 + org $4000 + "bank10" + "Evolutions and Attacks" +ROMX $11 + org $4000 + "bank11" +ROMX $12 + org $4000 + "Crystal Unique" +ROMX $13 + org $4000 + "bank13" +ROMX $14 + org $4000 + "bank14" +ROMX $15 + org $4000 + "Map Scripts 1" +ROMX $16 + org $4000 + "Map Scripts 2" +ROMX $17 + org $4000 + "Map Scripts 3" +ROMX $18 + org $4000 + "Map Scripts 4" +ROMX $19 + org $4000 + "bank19" +ROMX $1a + org $4000 + "Map Scripts 5" +ROMX $1b + org $4000 + "Map Scripts 6" +ROMX $1c + org $4000 + "Map Scripts 7" +ROMX $1d + org $4000 + "Map Scripts 8" +ROMX $1e + org $4000 + "Map Scripts 9" +ROMX $1f + org $4000 + "Map Scripts 10" +ROMX $20 + org $4000 + "bank20" +ROMX $21 + org $4000 + "bank21" +ROMX $22 + org $4000 + "bank22" +ROMX $23 + org $4000 + "bank23" +ROMX $24 + org $4000 + "bank24" +ROMX $25 + org $4000 + "Map Headers" + "Events" +ROMX $26 + org $4000 + "Map Scripts 11" +ROMX $27 + org $4000 + "Map Scripts 12" +ROMX $28 + org $4000 + "Phone Engine" +ROMX $29 + org $4000 + "Phone Text" +ROMX $2a + org $4000 + "Map Blockdata 1" +ROMX $2b + org $4000 + "Map Blockdata 2" +ROMX $2c + org $4000 + "Map Blockdata 3" +ROMX $2d + org $4000 + "Tileset Data 5" +ROMX $2e + org $4000 + "bank2E" +ROMX $2f + org $4000 + "bank2F" +ROMX $30 + org $4000 + "bank30" +ROMX $31 + org $4000 + "bank31" +ROMX $32 + org $4000 + "bank32" +ROMX $33 + org $4000 + "bank33" + "Extra Songs 2" +ROMX $34 + org $4000 + "Pic Animations 1" +ROMX $35 + org $4000 + "Pic Animations 2" +ROMX $36 + org $4000 + "bank36" + "Pic Animations 3" +ROMX $37 + org $4000 + "Tileset Data 6" +ROMX $38 + org $4000 + "bank38" +ROMX $39 + org $4000 + "bank39" +ROMX $3a + org $4000 + "Audio" + "Songs 1" +ROMX $3b + org $4000 + "Songs 2" +ROMX $3c + org $4000 + "Songs 3" + "Sound Effects" + "Cries" +ROMX $3d + org $4000 + "Songs 4" +ROMX $3e + org $4000 + "bank3E" +ROMX $3f + org $4000 + "bank3F" +ROMX $40 + org $4000 + "bank40" + "tetsuji" + "bank40_2" + "ascii 10186f" + "bank40_3" +ROMX $41 + org $4000 + "bank41" + "bank41_2" +ROMX $42 + org $4000 + "bank42" + "Intro Logo" + "Credits" +ROMX $43 + org $4000 + "bank43" +ROMX $44 + org $4000 + "Main" +ROMX $45 + org $4000 + "bank45" + "Mobile Stadium" +ROMX $46 + org $4000 + "bank46" + "bank46_2" +ROMX $47 + org $4000 + "bank47" +ROMX $48 + org $4000 + "Pic Pointers" + "Pics 1" +ROMX $49 + org $4000 + "Unown Pic Pointers" + "Pics 2" +ROMX $4a + org $4000 + "Trainer Pic Pointers" + "Pics 3" +ROMX $4b + org $4000 + "Pics 4" +ROMX $4c + org $4000 + "Pics 5" +ROMX $4d + org $4000 + "Pics 6" +ROMX $4e + org $4000 + "Pics 7" +ROMX $4f + org $4000 + "Pics 8" +ROMX $50 + org $4000 + "Pics 9" +ROMX $51 + org $4000 + "Pics 10" +ROMX $52 + org $4000 + "Pics 11" +ROMX $53 + org $4000 + "Pics 12" +ROMX $54 + org $4000 + "Pics 13" +ROMX $55 + org $4000 + "Pics 14" +ROMX $56 + org $4000 + "Pics 15" +ROMX $57 + org $4000 + "Pics 16" +ROMX $58 + org $4000 + "Pics 17" +ROMX $59 + org $4000 + "Pics 18" +ROMX $5a + org $4000 + "Pics 19" +ROMX $5b + org $4000 + "bank5B" +ROMX $5c + org $4000 + "bank5C" +ROMX $5d + org $4000 + "bank5D" +ROMX $5e + org $4000 + "bank5E" + "Songs 5" + "Crystal Sound Effects" + "Misc Crystal" +ROMX $5f + org $4000 + "bank5F" +ROMX $60 + org $4000 + "Map Scripts 13" + "Pokedex Entries 001-064" +ROMX $61 + org $4000 + "Map Scripts 14" +ROMX $62 + org $4000 + "Map Scripts 15" +ROMX $63 + org $4000 + "Map Scripts 16" +ROMX $64 + org $4000 + "Map Scripts 17" +ROMX $65 + org $4000 + "Map Scripts 18" +ROMX $66 + org $4000 + "Map Scripts 19" +ROMX $67 + org $4000 + "Map Scripts 20" +ROMX $68 + org $4000 + "Map Scripts 21" +ROMX $69 + org $4000 + "Map Scripts 22" +ROMX $6a + org $4000 + "Map Scripts 23" +ROMX $6b + org $4000 + "Map Scripts 24" +ROMX $6c + org $4000 + "Common Text 1" + "Map Scripts 25" +ROMX $6d + org $4000 + "bank6D" +ROMX $6e + org $4000 + "Pokedex Entries 065-128" +ROMX $6f + org $4000 + "Text 1" +ROMX $70 + org $4000 + "Text 2" +ROMX $71 + org $4000 + "Text 3" +ROMX $72 + org $4000 + "bank72" +ROMX $73 + org $4000 + "Pokedex Entries 129-192" +ROMX $74 + org $4000 + "Pokedex Entries 193-251" +ROMX $75 +ROMX $76 +ROMX $77 + org $4000 + "bank77" + "Tileset Data 7" + "bank77_2" +ROMX $78 + org $4000 + "Tileset Data 8" +ROMX $79 +ROMX $7a +ROMX $7b + org $4000 + "bank7B" +ROMX $7c + org $4000 + "bank7C" +ROMX $7d + org $4000 + "bank7D" +ROMX $7e + org $4000 + "bank7E" +ROMX $7f + org $4000 + "bank7F" + org $7de0 + "stadium2" +WRAM0 + org $c000 + "Stack" + "Audio RAM" + "WRAM" + "wSpriteAnims" + "Sprites" + "Tilemap" + "Battle" + "Overworld Map" + "Video" +WRAMX 1 + org $d000 + "WRAM 1" + "Enemy Party" + "Party" +WRAMX 2 + org $d000 + "Pic Animations" +WRAMX 3 + org $d000 + "Battle Tower" +WRAMX 4 +WRAMX 5 + org $d000 + "GBC Video" + org $d300 + "Battle Animations" + org $d800 + "WRAM 5 MOBILE" +WRAMX 6 + org $d000 + "WRAM 6" +WRAMX 7 + org $d000 + "WRAM 7" +VRAM $00 + org $8000 + "VRAM0" +VRAM $01 + org $8000 + "VRAM1" +SRAM $00 + org $a000 + "Scratch" + org $a600 + "SRAM Bank 0" + org $b200 + "Backup Save" +SRAM $01 + org $a000 + "Save" + "Active Box" + "Link Battle Data" + "SRAM Hall of Fame" + "SRAM Crystal Data" + "SRAM Battle Tower" +SRAM $02 + org $a000 + "Boxes 1-7" +SRAM $03 + org $a000 + "Boxes 8-14" diff --git a/predef/cgb.asm b/predef/cgb.asm index b0c3fdb46..5ac243963 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -25,7 +25,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59 ld l, a ld de, .ReturnFromJumpTable push de - jp [hl] + jp hl ; 8d79 .ReturnFromJumpTable: ; 8d79 @@ -491,7 +491,7 @@ _CGB07: ; 9122 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 912d Jumptable_912d: ; 912d diff --git a/predef/crystal.asm b/predef/crystal.asm index 8f542e5dd..9aa0fbdf2 100755 --- a/predef/crystal.asm +++ b/predef/crystal.asm @@ -17,7 +17,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile) ld l, a ld de, .done push de - jp [hl] + jp hl .done ret ; 49330 (12:5330) diff --git a/predef/sgb.asm b/predef/sgb.asm index 65a09756d..1d8184cc2 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -20,7 +20,7 @@ Predef_LoadSGBLayout: ; 864c ld l, a ld de, .Finish push de - jp [hl] + jp hl ; 866f .Jumptable: ; 866f @@ -1,24 +1,24 @@ ; rst vectors -SECTION "rst0",ROM0[0] +SECTION "rst0",ROM0 di jp Start -SECTION "rst8",ROM0[FarCall] +SECTION "rst8",ROM0 jp FarCall_hl -SECTION "rst10",ROM0[Bankswitch] +SECTION "rst10",ROM0 ld [hROMBank], a ld [MBC3RomBank], a ret -SECTION "rst18",ROM0[$18] +SECTION "rst18",ROM0 rst $38 -SECTION "rst20",ROM0[$20] +SECTION "rst20",ROM0 rst $38 -SECTION "rst28",ROM0[JumpTable] +SECTION "rst28",ROM0 push de ld e, a ld d, 0 @@ -28,10 +28,10 @@ SECTION "rst28",ROM0[JumpTable] ld h, [hl] ld l, a pop de - jp [hl] + jp hl -; SECTION "rst30",ROM0[$30] +; SECTION "rst30",ROM0 ; rst30 is midst rst28 -SECTION "rst38",ROM0[$38] +SECTION "rst38",ROM0 rst $38 @@ -3,11 +3,11 @@ SRAM_End EQU $c000 GLOBAL SRAM_Begin, SRAM_End -SECTION "Scratch", SRAM, BANK [0] +SECTION "Scratch", SRAM sScratch:: -SECTION "SRAM Bank 0", SRAM [$a600], BANK [0] +SECTION "SRAM Bank 0", SRAM ; a600 sPartyMail:: @@ -78,7 +78,7 @@ sRTCStatusFlags:: ds 8 sLuckyNumberDay:: ds 1 sLuckyIDNumber:: ds 2 -SECTION "Backup Save", SRAM [$b200], BANK [0] +SECTION "Backup Save", SRAM sBackupOptions:: ds OptionsEnd - Options s0_b208:: ds 1 ; loaded with 99, used to check save corruption @@ -98,7 +98,7 @@ s0_bf0f:: ds 1 ; loaded with 0x7f, used to check save corruption sStackTop:: ds 2 -SECTION "Save", SRAM, BANK [1] +SECTION "Save", SRAM sOptions:: ds OptionsEnd - Options @@ -117,13 +117,13 @@ sGameDataEnd:: sChecksum:: ds 2 s1_ad0f:: ds 1 ; loaded with 0x7f, used to check save corruption -SECTION "Active Box", SRAM, BANK [1] +SECTION "Active Box", SRAM ; ad10 box sBox ; b160 ds $f4 -SECTION "Link Battle Data", SRAM, BANK [1] +SECTION "Link Battle Data", SRAM sLinkBattleResults:: ds $c sLinkBattleStats:: ; b260 @@ -145,7 +145,7 @@ sLinkBattleRecord4:: link_battle_record sLinkBattleRecord4 sLinkBattleRecord5:: link_battle_record sLinkBattleRecord5 sLinkBattleStatsEnd:: -SECTION "SRAM Hall of Fame", SRAM, BANK [1] +SECTION "SRAM Hall of Fame", SRAM sHallOfFame:: ; b2c0 ; temporary until I can find a way to macrofy it hall_of_fame sHallOfFame01 @@ -193,14 +193,14 @@ sHallOfFame:: ; b2c0 ; endr sHallOfFameEnd:: -SECTION "SRAM Crystal Data", SRAM, BANK [1] +SECTION "SRAM Crystal Data", SRAM sMobileEventIndex:: ds 1 ; be3c sCrystalData:: ds wCrystalDataEnd - wCrystalData sMobileEventIndexBackup:: ds 1 -SECTION "SRAM Battle Tower", SRAM, BANK [1] +SECTION "SRAM Battle Tower", SRAM ; data of the BattleTower must be in SRAM because you can save and leave between battles sBattleTowerChallengeState:: ds 1 ; 0: normal @@ -235,7 +235,7 @@ SECTION "Boxes 1-7", SRAM, BANK [2] box sBox6 box sBox7 -SECTION "Boxes 8-14", SRAM, BANK [3] +SECTION "Boxes 8-14", SRAM box sBox8 box sBox9 box sBox10 diff --git a/text/common_text.asm b/text/common_text.asm index 66a142849..c4891ab15 100644 --- a/text/common_text.asm +++ b/text/common_text.asm @@ -1,12 +1,12 @@ INCLUDE "includes.asm" -SECTION "Text 1", ROMX, BANK[$6F] +SECTION "Text 1", ROMX INCLUDE "text/common_1.asm" -SECTION "Text 2", ROMX, BANK[$70] +SECTION "Text 2", ROMX INCLUDE "text/common_2.asm" INCLUDE "text/common_3.asm" -SECTION "Text 3", ROMX, BANK[$71] +SECTION "Text 3", ROMX INCLUDE "text/common_4.asm" INCLUDE "text/common_5.asm" diff --git a/tilesets/animations.asm b/tilesets/animations.asm index a3b0c4f06..76b3c65f8 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -32,7 +32,7 @@ _AnimateTileset:: ; fc000 ld h, [hl] ld l, a - jp [hl] + jp hl ; fc01b Tileset00Anim: ; 0xfc01b @@ -420,7 +420,7 @@ ScrollTileDown: ; fc36a AnimateFountain: ; fc387 - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l ld hl, .frames @@ -462,7 +462,7 @@ AnimateWaterTile: ; fc402 ; Draw a water tile for the current frame in VRAM tile at de. ; Save sp in bc (see WriteTile). - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l @@ -497,7 +497,7 @@ WaterTileFrames: ; fc41c ForestTreeLeftAnimation: ; fc45c - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l @@ -539,7 +539,7 @@ ForestTreeRightFrames: ; fc4a4 ForestTreeRightAnimation: ; fc4c4 - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l @@ -574,7 +574,7 @@ ForestTreeRightAnimation: ; fc4c4 ForestTreeLeftAnimation2: ; fc4f2 - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l @@ -606,7 +606,7 @@ ForestTreeLeftAnimation2: ; fc4f2 ForestTreeRightAnimation2: ; fc51c - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l @@ -671,7 +671,7 @@ AnimateFlowerTile: ; fc56d ; No parameters. ; Save sp in bc (see WriteTile). - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l @@ -707,7 +707,7 @@ FlowerTileFrames: ; fc58c SafariFountainAnim1: ; fc5cc ; Splash in the bottom-right corner of the fountain. - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l ld a, [TileAnimationTimer] @@ -729,7 +729,7 @@ SafariFountainAnim1: ; fc5cc SafariFountainAnim2: ; fc5eb ; Splash in the top-left corner of the fountain. - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l ld a, [TileAnimationTimer] @@ -760,7 +760,7 @@ AnimateSproutPillarTile: ; fc645 ; Destination (VRAM) ; Address of the first tile in the frame array - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l @@ -820,7 +820,7 @@ AnimateWhirlpoolTile: ; fc678 ; Only does one of 4 tiles at a time. ; Save sp in bc (see WriteTile). - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l @@ -860,7 +860,7 @@ WriteTileFromBuffer: ; fc696 ; Write tiledata at wTileAnimBuffer to de. ; wTileAnimBuffer is loaded to sp for WriteTile. - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l @@ -877,7 +877,7 @@ WriteTileToBuffer: ; fc6a2 ; Write tiledata de to wTileAnimBuffer. ; de is loaded to sp for WriteTile. - ld hl, [sp+0] + ld hl, sp+0 ld b, h ld c, l diff --git a/trainers/read_party.asm b/trainers/read_party.asm index c74d4c6dc..9b7727a84 100755 --- a/trainers/read_party.asm +++ b/trainers/read_party.asm @@ -68,7 +68,7 @@ ReadTrainerParty: ; 39771 ld l, a ld bc, .done push bc - jp [hl] + jp hl .done jp ComputeTrainerReward @@ -11,7 +11,7 @@ StackTop:: ds 1 -SECTION "Audio", WRAM0 +SECTION "Audio RAM", WRAM0 wMusic:: MusicPlaying:: ; c100 ; nonzero if playing @@ -216,7 +216,7 @@ TilePermissions:: ; c2fe ds 1 -SECTION "wSpriteAnims", WRAM0 [$c300] +SECTION "wSpriteAnims", WRAM0 ; wc300 - wc313 is a 10x2 dictionary. ; keys: taken from third column of SpriteAnimSeqData ; values: VTiles @@ -310,7 +310,7 @@ wc3fb:: ds 1 wc3fc:: ds 4 -SECTION "Sprites", WRAM0 [$c400] +SECTION "Sprites", WRAM0 Sprites:: ; c400 ; 4 bytes per sprite @@ -898,7 +898,7 @@ wMiscEnd:: wc7e8:: ds 24 ; ???? -SECTION "Overworld Map", WRAM0 [$c800] +SECTION "Overworld Map", WRAM0 OverworldMap:: ; c800 ds 1300 @@ -1514,7 +1514,7 @@ wDaysSince:: ds 1 wRAM0End:: ; cfd8 -SECTION "WRAM 1", WRAMX, BANK [1] +SECTION "WRAM 1", WRAMX wd000:: ds 1 DefaultSpawnpoint:: @@ -2193,7 +2193,7 @@ TimeOfDay:: ; d269 ds 1 -SECTION "Enemy Party", WRAMX, BANK [1] +SECTION "Enemy Party", WRAMX wPokedexShowPointerAddr:: wd26b:: ds 1 wd26c:: ds 1 @@ -2204,7 +2204,7 @@ wd271:: ds 5 ds wd26b - @ -; SECTION "Enemy Party", WRAMX, BANK [1] +; SECTION "Enemy Party", WRAMX OTPlayerName:: ds NAME_LENGTH ; d26b OTPlayerID:: ds 2 ; d276 ds 8 @@ -2530,7 +2530,7 @@ FarfetchdPosition:: ; d964 ds 13 -;SECTION "Map Triggers", WRAMX, BANK [1] +;SECTION "Map Triggers", WRAMX wPokecenter2FTrigger:: ds 1 ; d972 wTradeCenterTrigger:: ds 1 ; d973 @@ -2615,7 +2615,7 @@ wMobileBattleRoomTrigger:: ds 1 ; d9c0 ds 49 -;SECTION "Events", WRAMX, BANK [1] +;SECTION "Events", WRAMX wJackFightCount:: ds 1 ; d9f2 wBeverlyFightCount:: ds 1 ; unused @@ -2808,7 +2808,7 @@ wScreenSave:: ds 6 * 5 wMapDataEnd:: -SECTION "Party", WRAMX, BANK [1] +SECTION "Party", WRAMX wPokemonData:: @@ -2907,7 +2907,7 @@ wMagikarpRecordHoldersName:: ds NAME_LENGTH wPokemonDataEnd:: wGameDataEnd:: -SECTION "Pic Animations", WRAMX, BANK [2] +SECTION "Pic Animations", WRAMX TempTileMap:: ; 20x18 grid of 8x8 tiles @@ -2946,7 +2946,7 @@ wPokeAnimBitmaskBuffer:: ds 7 wPokeAnimStructEnd:: -SECTION "Battle Tower", WRAMX, BANK [3] +SECTION "Battle Tower", WRAMX w3_d000:: ds 1 ; d000 w3_d001:: ds 1 @@ -2997,7 +2997,7 @@ w3_dd68:: ds SCREEN_WIDTH * SCREEN_HEIGHT w3_dfec:: ds $10 w3_dffc:: ds 4 -SECTION "GBC Video", WRAMX, BANK [5] +SECTION "GBC Video", WRAMX ; 8 4-color palettes UnknBGPals:: ds 8 palettes ; d000 @@ -3022,7 +3022,7 @@ LYOverridesBackup:: ; d200 LYOverridesBackupEnd:: -SECTION "Battle Animations", WRAMX [$d300], BANK [5] +SECTION "Battle Animations", WRAMX wBattleAnimTileDict:: ds 10 @@ -3087,7 +3087,7 @@ wSurfWaveBGEffectEnd:: ds -$e wBattleAnimEnd:: -SECTION "WRAM 5 MOBILE", WRAMX [$d800], BANK [5] +SECTION "WRAM 5 MOBILE", WRAMX w5_d800:: ds $200 w5_da00:: ds $200 w5_dc00:: ds $d @@ -3098,7 +3098,7 @@ w5_MobileOpponentBattleStartMessage:: ds $c ; dc26 w5_MobileOpponentBattleWinMessage:: ds $c ; dc32 w5_MobileOpponentBattleLossMessage:: ds $c ; dc3e -SECTION "WRAM 6", WRAMX, BANK [6] +SECTION "WRAM 6", WRAMX wDecompressScratch:: wScratchTileMap:: @@ -3109,6 +3109,6 @@ w6_d800:: INCLUDE "sram.asm" -SECTION "WRAM 7", WRAMX, BANK [7] +SECTION "WRAM 7", WRAMX wWindowStack:: ds $1000 - 1 wWindowStackBottom:: ds 1 |