From 52adb844def5bffa9cd402e886cf24ea17fc00ab Mon Sep 17 00:00:00 2001 From: AntonioND Date: Tue, 21 Mar 2017 00:44:10 +0000 Subject: Revert "Fix floating sections" This reverts commit cec6e6e2fb7886acc85200f921d3913fd2ea8a2b. Signed-off-by: AntonioND --- audio.asm | 30 +++++++++++++------------- home.asm | 4 ++-- main.asm | 72 +++++++++++++++++++++++++++++++-------------------------------- sram.asm | 8 +++---- text.asm | 26 +++++++++++------------ wram.asm | 4 ++-- 6 files changed, 72 insertions(+), 72 deletions(-) diff --git a/audio.asm b/audio.asm index a2cb3220..0a344ae7 100644 --- a/audio.asm +++ b/audio.asm @@ -6,29 +6,29 @@ AUDIO_3 EQU $1f INCLUDE "constants.asm" -SECTION "Sound Effect Headers 1", ROMX[$4000], BANK[AUDIO_1] +SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/headers/sfxheaders1.asm" -SECTION "Sound Effect Headers 2", ROMX[$4000], BANK[AUDIO_2] +SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/headers/sfxheaders2.asm" -SECTION "Sound Effect Headers 3", ROMX[$4000], BANK[AUDIO_3] +SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/headers/sfxheaders3.asm" -SECTION "Music Headers 1", ROMX[$422E], BANK[AUDIO_1] +SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/headers/musicheaders1.asm" -SECTION "Music Headers 2", ROMX[$42BE], BANK[AUDIO_2] +SECTION "Music Headers 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/headers/musicheaders2.asm" -SECTION "Music Headers 3", ROMX[$4249], BANK[AUDIO_3] +SECTION "Music Headers 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/headers/musicheaders3.asm" -SECTION "Sound Effects 1", ROMX[$42FD], BANK[AUDIO_1] +SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/sfx/snare1_1.asm" INCLUDE "audio/sfx/snare2_1.asm" @@ -127,7 +127,7 @@ INCLUDE "audio/sfx/cry21_1.asm" INCLUDE "audio/sfx/cry22_1.asm" -SECTION "Sound Effects 2", ROMX[$42FD], BANK[AUDIO_2] +SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/sfx/snare1_2.asm" INCLUDE "audio/sfx/snare2_2.asm" @@ -252,7 +252,7 @@ INCLUDE "audio/sfx/cry21_2.asm" INCLUDE "audio/sfx/cry22_2.asm" -SECTION "Sound Effects 3", ROMX[$42FD], BANK[AUDIO_3] +SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/sfx/snare1_3.asm" INCLUDE "audio/sfx/snare2_3.asm" @@ -360,7 +360,7 @@ INCLUDE "audio/sfx/cry22_3.asm" -SECTION "Audio Engine 1", ROMX[$50C6], BANK[AUDIO_1] +SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] PlayBattleMusic:: xor a @@ -453,7 +453,7 @@ Music_Cities1AlternateTempo:: jp Audio1_OverwriteChannelPointer -SECTION "Audio Engine 2", ROMX[$536E], BANK[AUDIO_2] +SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] Music_DoLowHealthAlarm:: ld a, [wLowHealthAlarm] @@ -557,7 +557,7 @@ Audio2_OverwriteChannelPointer: ret -SECTION "Audio Engine 3", ROMX[$513B], BANK[AUDIO_3] +SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] PlayPokedexRatingSfx:: ld a, [$ffdc] @@ -601,7 +601,7 @@ INCLUDE "audio/engine_3.asm" -SECTION "Music 1", ROMX[$5BA3], BANK[AUDIO_1] +SECTION "Music 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/music/pkmnhealed.asm" INCLUDE "audio/music/routes1.asm" @@ -630,7 +630,7 @@ INCLUDE "audio/music/gym.asm" INCLUDE "audio/music/pokecenter.asm" -SECTION "Music 2", ROMX[$6322], BANK[AUDIO_2] +SECTION "Music 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" @@ -646,7 +646,7 @@ INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedgymleader.asm" -SECTION "Music 3", ROMX[$5BBB], BANK[AUDIO_3] +SECTION "Music 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/music/bikeriding.asm" INCLUDE "audio/music/dungeon1.asm" diff --git a/home.asm b/home.asm index bfd73b31..8cd85019 100644 --- a/home.asm +++ b/home.asm @@ -30,7 +30,7 @@ SECTION "joypad", ROM0 [$60] reti -SECTION "Home", ROM0 [$61] +SECTION "Home", ROM0 DisableLCD:: xor a @@ -99,7 +99,7 @@ SECTION "Header", ROM0 [$104] -SECTION "Main", ROM0 [$150] +SECTION "Main", ROM0 Start:: cp GBC diff --git a/main.asm b/main.asm index 7943dc3d..da2d3671 100755 --- a/main.asm +++ b/main.asm @@ -14,7 +14,7 @@ PICS_5 EQU $D INCLUDE "home.asm" -SECTION "bank1",ROMX[$4000],BANK[$1] +SECTION "bank1",ROMX,BANK[$1] INCLUDE "data/facing.asm" @@ -86,7 +86,7 @@ INCLUDE "engine/remove_pokemon.asm" INCLUDE "engine/display_pokedex.asm" -SECTION "bank3",ROMX[$4000],BANK[$3] +SECTION "bank3",ROMX,BANK[$3] INCLUDE "engine/joypad.asm" @@ -127,7 +127,7 @@ INCLUDE "engine/pathfinding.asm" INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" -SECTION "NPC Sprites 1", ROMX[$4000], BANK[NPC_SPRITES_1] +SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1] OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" RockerSprite: INCBIN "gfx/sprites/rocker.2bpp" @@ -158,7 +158,7 @@ OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp" LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp" -SECTION "Graphics", ROMX[$5380], BANK[GFX] +SECTION "Graphics", ROMX, BANK[GFX] PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" FontGraphics: INCBIN "gfx/font.1bpp" @@ -184,7 +184,7 @@ PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" PlayerCharacterTitleGraphicsEnd: -SECTION "Battle (bank 4)", ROMX[$68D8], BANK[$4] +SECTION "Battle (bank 4)", ROMX, BANK[$4] INCLUDE "engine/overworld/is_player_just_outside_map.asm" INCLUDE "engine/menu/status_screen.asm" @@ -206,7 +206,7 @@ INCLUDE "engine/battle/get_trainer_name.asm" INCLUDE "engine/random.asm" -SECTION "NPC Sprites 2", ROMX[$4000], BANK[NPC_SPRITES_2] +SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" RedSprite: INCBIN "gfx/sprites/red.2bpp" @@ -250,7 +250,7 @@ LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp" SeelSprite: INCBIN "gfx/sprites/seel.2bpp" -SECTION "Battle (bank 5)", ROMX[$7840], BANK[$5] +SECTION "Battle (bank 5)", ROMX, BANK[$5] INCLUDE "engine/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" @@ -260,7 +260,7 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" -SECTION "bank6",ROMX[$4000],BANK[$6] +SECTION "bank6",ROMX,BANK[$6] INCLUDE "data/mapHeaders/celadoncity.asm" INCLUDE "data/mapObjects/celadoncity.asm" @@ -335,7 +335,7 @@ INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" -SECTION "bank7",ROMX[$4000],BANK[$7] +SECTION "bank7",ROMX,BANK[$7] INCLUDE "data/mapHeaders/cinnabarisland.asm" INCLUDE "data/mapObjects/cinnabarisland.asm" @@ -516,7 +516,7 @@ INCLUDE "engine/menu/oaks_pc.asm" INCLUDE "engine/hidden_object_functions7.asm" -SECTION "Pics 1", ROMX[$4000], BANK[PICS_1] +SECTION "Pics 1", ROMX, BANK[PICS_1] RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic" RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" @@ -578,13 +578,13 @@ TangelaPicFront:: INCBIN "pic/bmon/tangela.pic" TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" -SECTION "Battle (bank 9)", ROMX[$7D6B], BANK[$9] +SECTION "Battle (bank 9)", ROMX, BANK[$9] INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" -SECTION "Pics 2", ROMX[$4000], BANK[PICS_2] +SECTION "Pics 2", ROMX, BANK[PICS_2] GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic" GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" @@ -652,11 +652,11 @@ MoltresPicFront:: INCBIN "pic/bmon/moltres.pic" MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" -SECTION "Battle (bank A)", ROMX[$7EA9], BANK[$A] +SECTION "Battle (bank A)", ROMX, BANK[$A] INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" -SECTION "Pics 3", ROMX[$4000], BANK[PICS_3] +SECTION "Pics 3", ROMX, BANK[PICS_3] ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic" ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" @@ -730,7 +730,7 @@ BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" -SECTION "Battle (bank B)", ROMX[$7B7B], BANK[$B] +SECTION "Battle (bank B)", ROMX, BANK[$B] INCLUDE "engine/battle/display_effectiveness.asm" @@ -746,7 +746,7 @@ INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" INCLUDE "engine/game_corner_slots2.asm" -SECTION "Pics 4", ROMX[$4000], BANK[PICS_4] +SECTION "Pics 4", ROMX, BANK[PICS_4] DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic" DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" @@ -811,12 +811,12 @@ RedPicBack:: INCBIN "pic/trainer/redb.pic" OldManPic:: INCBIN "pic/trainer/oldman.pic" -SECTION "Battle (bank C)", ROMX[$7F2B], BANK[$C] +SECTION "Battle (bank C)", ROMX, BANK[$C] INCLUDE "engine/battle/moveEffects/mist_effect.asm" INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" -SECTION "Pics 5", ROMX[$4000], BANK[PICS_5] +SECTION "Pics 5", ROMX, BANK[PICS_5] BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic" BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" @@ -874,7 +874,7 @@ VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic" VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" -SECTION "Battle (bank D)", ROMX[$7244], BANK[$D] +SECTION "Battle (bank D)", ROMX, BANK[$D] INCLUDE "engine/titlescreen2.asm" INCLUDE "engine/battle/link_battle_versus_text.asm" @@ -884,7 +884,7 @@ INCLUDE "engine/multiply_divide.asm" INCLUDE "engine/game_corner_slots.asm" -SECTION "bankE",ROMX[$4000],BANK[$E] +SECTION "bankE",ROMX,BANK[$E] INCLUDE "data/moves.asm" BaseStats: INCLUDE "data/base_stats.asm" @@ -910,12 +910,12 @@ INCLUDE "engine/battle/moveEffects/transform_effect.asm" INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" -SECTION "bankF",ROMX[$4000],BANK[$F] +SECTION "bankF",ROMX,BANK[$F] INCLUDE "engine/battle/core.asm" -SECTION "bank10",ROMX[$4000],BANK[$10] +SECTION "bank10",ROMX,BANK[$10] INCLUDE "engine/menu/pokedex.asm" INCLUDE "engine/trade.asm" @@ -923,7 +923,7 @@ INCLUDE "engine/intro.asm" INCLUDE "engine/trade2.asm" -SECTION "bank11",ROMX[$4000],BANK[$11] +SECTION "bank11",ROMX,BANK[$11] INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" @@ -1068,7 +1068,7 @@ SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" INCLUDE "engine/overworld/hidden_objects.asm" -SECTION "bank12",ROMX[$4000],BANK[$12] +SECTION "bank12",ROMX,BANK[$12] INCLUDE "data/mapHeaders/route7.asm" INCLUDE "data/mapObjects/route7.asm" @@ -1247,7 +1247,7 @@ INCLUDE "data/mapObjects/safarizonesecrethouse.asm" SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" -SECTION "bank13",ROMX[$4000],BANK[$13] +SECTION "bank13",ROMX,BANK[$13] TrainerPics:: YoungsterPic:: INCBIN "pic/trainer/youngster.pic" @@ -1312,7 +1312,7 @@ INCLUDE "engine/give_pokemon.asm" INCLUDE "engine/predefs.asm" -SECTION "bank14",ROMX[$4000],BANK[$14] +SECTION "bank14",ROMX,BANK[$14] INCLUDE "data/mapHeaders/route22.asm" INCLUDE "data/mapObjects/route22.asm" @@ -1390,7 +1390,7 @@ INCLUDE "engine/menu/prize_menu.asm" INCLUDE "engine/hidden_object_functions14.asm" -SECTION "bank15",ROMX[$4000],BANK[$15] +SECTION "bank15",ROMX,BANK[$15] INCLUDE "data/mapHeaders/route2.asm" INCLUDE "data/mapObjects/route2.asm" @@ -1482,7 +1482,7 @@ INCLUDE "engine/menu/diploma.asm" INCLUDE "engine/overworld/trainers.asm" -SECTION "bank16",ROMX[$4000],BANK[$16] +SECTION "bank16",ROMX,BANK[$16] INCLUDE "data/mapHeaders/route6.asm" INCLUDE "data/mapObjects/route6.asm" @@ -1572,7 +1572,7 @@ HallofFameRoomBlocks: INCLUDE "engine/overworld/saffron_guards.asm" -SECTION "bank17",ROMX[$4000],BANK[$17] +SECTION "bank17",ROMX,BANK[$17] SaffronMartBlocks: LavenderMartBlocks: @@ -1728,7 +1728,7 @@ INCLUDE "engine/predefs17_2.asm" INCLUDE "engine/hidden_object_functions17.asm" -SECTION "bank18",ROMX[$4000],BANK[$18] +SECTION "bank18",ROMX,BANK[$18] ViridianForestBlocks: INCBIN "maps/viridianforest.blk" UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" @@ -1851,7 +1851,7 @@ SilphCo11Blocks: INCBIN "maps/silphco11.blk" INCLUDE "engine/hidden_object_functions18.asm" -SECTION "bank19",ROMX[$4000],BANK[$19] +SECTION "bank19",ROMX,BANK[$19] Overworld_GFX: INCBIN "gfx/tilesets/overworld.t2.2bpp" Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" @@ -1873,7 +1873,7 @@ Plateau_GFX: INCBIN "gfx/tilesets/plateau.t10.2bpp" Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" -SECTION "bank1A",ROMX[$4000],BANK[$1A] +SECTION "bank1A",ROMX,BANK[$1A] INCLUDE "engine/battle/decrement_pp.asm" @@ -1909,7 +1909,7 @@ Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" Facility_Block: INCBIN "gfx/blocksets/facility.bst" -SECTION "bank1B",ROMX[$4000],BANK[$1B] +SECTION "bank1B",ROMX,BANK[$1B] Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp" Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" @@ -1927,7 +1927,7 @@ Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp" Underground_Block: INCBIN "gfx/blocksets/underground.bst" -SECTION "bank1C",ROMX[$4000],BANK[$1C] +SECTION "bank1C",ROMX,BANK[$1C] INCLUDE "engine/gamefreak.asm" INCLUDE "engine/hall_of_fame.asm" @@ -1942,7 +1942,7 @@ INCLUDE "engine/palettes.asm" INCLUDE "engine/save.asm" -SECTION "bank1D",ROMX[$4000],BANK[$1D] +SECTION "bank1D",ROMX,BANK[$1D] CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" @@ -2074,7 +2074,7 @@ INCLUDE "engine/menu/league_pc.asm" INCLUDE "engine/overworld/hidden_items.asm" -SECTION "bank1E",ROMX[$4000],BANK[$1E] +SECTION "bank1E",ROMX,BANK[$1E] INCLUDE "engine/battle/animations.asm" diff --git a/sram.asm b/sram.asm index 3b51df77..3e7b3e16 100644 --- a/sram.asm +++ b/sram.asm @@ -1,4 +1,4 @@ -SECTION "Sprite Buffers", SRAM[$a000], BANK[0] +SECTION "Sprite Buffers", SRAM, BANK[0] sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000 sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188 @@ -9,7 +9,7 @@ sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310 sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY ; a598 -SECTION "Save Data", SRAM[$a000], BANK[1] +SECTION "Save Data", SRAM, BANK[1] ds $598 sPlayerName:: ds NAME_LENGTH ; a598 @@ -21,7 +21,7 @@ sTilesetType:: ds 1 ; b522 sMainDataCheckSum:: ds 1 ; b523 -SECTION "Saved Boxes 1", SRAM[$a000], BANK[2] +SECTION "Saved Boxes 1", SRAM, BANK[2] sBox1:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox2:: ds wBoxDataEnd - wBoxDataStart ; a462 @@ -33,7 +33,7 @@ sBank2AllBoxesChecksum:: ds 1 ; ba4c sBank2IndividualBoxChecksums:: ds 6 ; ba4d -SECTION "Saved Boxes 2", SRAM[$a000], BANK[3] +SECTION "Saved Boxes 2", SRAM, BANK[3] sBox7:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox8:: ds wBoxDataEnd - wBoxDataStart ; a462 diff --git a/text.asm b/text.asm index be12aa7d..866d4a7f 100644 --- a/text.asm +++ b/text.asm @@ -19,7 +19,7 @@ INCLUDE "macros.asm" INCLUDE "hram.asm" -SECTION "Text 1", ROMX[$4000], BANK[TEXT_1] +SECTION "Text 1", ROMX, BANK[TEXT_1] _CardKeySuccessText1:: text "Bingo!@@" @@ -192,7 +192,7 @@ INCLUDE "text/maps/silph_co_4f.asm" INCLUDE "text/maps/silph_co_5f_1.asm" -SECTION "Text 2", ROMX[$4000], BANK[TEXT_2] +SECTION "Text 2", ROMX, BANK[TEXT_2] INCLUDE "text/maps/silph_co_5f_2.asm" INCLUDE "text/maps/silph_co_6f.asm" @@ -224,7 +224,7 @@ INCLUDE "text/maps/agatha.asm" INCLUDE "text/maps/rock_tunnel_b2f_1.asm" -SECTION "Text 3", ROMX[$4000], BANK[TEXT_3] +SECTION "Text 3", ROMX, BANK[TEXT_3] INCLUDE "text/maps/rock_tunnel_b2f_2.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" @@ -1939,7 +1939,7 @@ INCLUDE "text/maps/saffron_gates.asm" INCLUDE "text/maps/daycare_1.asm" -SECTION "Text 4", ROMX[$4000], BANK[TEXT_4] +SECTION "Text 4", ROMX, BANK[TEXT_4] INCLUDE "text/maps/daycare_2.asm" INCLUDE "text/maps/underground_path_route_6_entrance.asm" @@ -1978,7 +1978,7 @@ INCLUDE "text/maps/route_10.asm" INCLUDE "text/maps/route_11_1.asm" -SECTION "Text 5", ROMX[$4000], BANK[TEXT_5] +SECTION "Text 5", ROMX, BANK[TEXT_5] INCLUDE "text/maps/route_11_2.asm" INCLUDE "text/maps/route_12.asm" @@ -1996,7 +1996,7 @@ INCLUDE "text/maps/route_23.asm" INCLUDE "text/maps/route_24_1.asm" -SECTION "Text 6", ROMX[$4000], BANK[TEXT_6] +SECTION "Text 6", ROMX, BANK[TEXT_6] INCLUDE "text/maps/route_24_2.asm" INCLUDE "text/maps/route_25.asm" @@ -2339,7 +2339,7 @@ INCLUDE "text/maps/museum_2f.asm" INCLUDE "text/maps/pewter_gym_1.asm" -SECTION "Text 7", ROMX[$4000], BANK[TEXT_7] +SECTION "Text 7", ROMX, BANK[TEXT_7] INCLUDE "text/maps/pewter_gym_2.asm" INCLUDE "text/maps/pewter_house_1.asm" @@ -2371,7 +2371,7 @@ INCLUDE "text/maps/vermilion_mart.asm" INCLUDE "text/maps/vermilion_gym_1.asm" -SECTION "Text 8", ROMX[$4000], BANK[TEXT_8] +SECTION "Text 8", ROMX, BANK[TEXT_8] INCLUDE "text/maps/vermilion_gym_2.asm" INCLUDE "text/maps/vermilion_house.asm" @@ -2403,7 +2403,7 @@ INCLUDE "text/maps/safari_zone_entrance.asm" INCLUDE "text/maps/fuchsia_gym_1.asm" -SECTION "Text 9", ROMX[$4000], BANK[TEXT_9] +SECTION "Text 9", ROMX, BANK[TEXT_9] INCLUDE "text/maps/fuchsia_gym_2.asm" INCLUDE "text/maps/fuchsia_meeting_room.asm" @@ -2646,7 +2646,7 @@ _CableClubNPCLinkClosedBecauseOfInactivityText:: done -SECTION "Text 10", ROMX[$4000], BANK[TEXT_10] +SECTION "Text 10", ROMX, BANK[TEXT_10] _CableClubNPCPleaseComeAgainText:: text "Please come again!" @@ -2992,7 +2992,7 @@ _BoxFullCannotThrowBallText:: prompt -SECTION "Text 11", ROMX[$4000], BANK[TEXT_11] +SECTION "Text 11", ROMX, BANK[TEXT_11] _ItemUseText001:: text " used@@" @@ -3192,11 +3192,11 @@ _UsedCutText:: prompt -SECTION "Pokedex Text", ROMX[$4000], BANK[POKEDEX_TEXT] +SECTION "Pokedex Text", ROMX, BANK[POKEDEX_TEXT] INCLUDE "text/pokedex.asm" -SECTION "Move Names", ROMX[$4000], BANK[MOVE_NAMES] +SECTION "Move Names", ROMX, BANK[MOVE_NAMES] INCLUDE "text/move_names.asm" diff --git a/wram.asm b/wram.asm index 47502613..1bcef26b 100755 --- a/wram.asm +++ b/wram.asm @@ -60,7 +60,7 @@ battle_struct: MACRO ENDM -SECTION "WRAM Bank 0", WRAM0 [$c000] +SECTION "WRAM Bank 0", WRAM0 wUnusedC000:: ; c000 ds 1 @@ -1610,7 +1610,7 @@ wEnemyMonDefense:: dw wEnemyMonSpeed:: dw wEnemyMonSpecial:: dw wEnemyMonPP:: ds 2 ; NUM_MOVES - 2 -SECTION "WRAM Bank 1", WRAMX[$d000], BANK[1] +SECTION "WRAM Bank 1", WRAMX, BANK[1] ds 2 ; NUM_MOVES - 2 wEnemyMonBaseStats:: ds 5 -- cgit v1.2.3 From 6697d9e7f1721bdbc9c996413a5e733e050f3d9e Mon Sep 17 00:00:00 2001 From: Sanqui Date: Wed, 19 Apr 2017 20:09:45 +0200 Subject: INSTALL.md: add a note about different cygwin install paths Fixes #149. --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 9bc30d6c..adcde642 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -44,7 +44,7 @@ To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the d In the installer, select the following packages: `make` `git` `python` `gettext` Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/). -Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. +Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable. In the **Cygwin terminal**: -- cgit v1.2.3 From c4e51522cc09424fa7f97c4e1f3f81b0cbc00089 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 1 May 2017 11:08:36 -0400 Subject: Update the rgbds links. v0.2.5 is the last working version. --- INSTALL.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index adcde642..dee3eea1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -2,8 +2,9 @@ sudo apt-get install make gcc bison git python - git clone https://github.com/bentley/rgbds + git clone https://github.com/rednex/rgbds cd rgbds + git checkout v0.2.5 sudo make install cd .. @@ -26,8 +27,9 @@ In **Terminal**, run: xcode-select --install - git clone https://github.com/bentley/rgbds + git clone https://github.com/rednex/rgbds cd rgbds + git checkout v0.2.5 sudo make install cd .. @@ -43,8 +45,8 @@ To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the d In the installer, select the following packages: `make` `git` `python` `gettext` -Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/). -Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable. +Then get [**rgbds 0.2.5**](https://github.com/bentley/rgbds/releases/tag/v0.2.5). +Extract the archive and put `rgbasm.exe`, `rgblink.exe`, `rgbfix.exe` and `rgbgfx.exe` in `C:\cygwin\usr\local\bin`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable. In the **Cygwin terminal**: -- cgit v1.2.3 From 832c28eaea1efa8c64765da88ffce661da9426a8 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 1 May 2017 11:15:39 -0400 Subject: Fix the Stack section. Negative section sizes are no longer allowed as of rgbds 0.3.0. --- wram.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wram.asm b/wram.asm index 1bcef26b..cc2d332a 100755 --- a/wram.asm +++ b/wram.asm @@ -3220,9 +3220,9 @@ wBoxMonNicksEnd:: ; dee2 wBoxDataEnd:: -SECTION "Stack", WRAMX[$dfff], BANK[1] +SECTION "Stack", WRAMX[$df00], BANK[1] + ds $ff wStack:: ; dfff - ds -$100 INCLUDE "sram.asm" -- cgit v1.2.3 From e9f33ce19c3f573cc7fb312d6869e711d5d9de4f Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 8 May 2017 02:54:20 -0500 Subject: =?UTF-8?q?Typo:=20SFX=5FPOKEFLUE=20=E2=86=92=20SFX=5FPOKEFLUTE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/music_constants.asm | 2 +- engine/items/items.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 57ad230d..5eb05b61 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -194,7 +194,7 @@ ENDM music_const SFX_SAVE, SFX_Save_1 ; AUDIO_1 - music_const SFX_POKEFLUE, SFX_Pokeflute + music_const SFX_POKEFLUTE, SFX_Pokeflute music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA ; AUDIO_2 diff --git a/engine/items/items.asm b/engine/items/items.asm index f8873a6e..057595df 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1846,12 +1846,12 @@ PlayedFluteHadEffectText: ; play out-of-battle pokeflute music ld a,$ff call PlaySound ; turn off music - ld a, SFX_POKEFLUE + ld a, SFX_POKEFLUTE ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing ld a,[wChannelSoundIDs + Ch2] - cp a, SFX_POKEFLUE + cp a, SFX_POKEFLUTE jr z,.musicWaitLoop call PlayDefaultMusic ; start playing normal music again .done -- cgit v1.2.3 From 7a9a1b1e55f4a7f6c339a86d8cdb7fbf1bee7838 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 24 Jun 2017 15:01:43 -0500 Subject: Fix typos in comments --- audio.asm | 2 +- constants/hardware_constants.asm | 2 +- constants/misc_constants.asm | 2 +- data/trainer_parties.asm | 6 +++--- engine/battle/animations.asm | 4 ++-- engine/battle/core.asm | 20 ++++++++++---------- engine/battle/draw_hud_pokeball_gfx.asm | 2 +- engine/battle/moveEffects/heal_effect.asm | 2 +- engine/battle/moveEffects/recoil_effect.asm | 2 +- engine/battle/moveEffects/substitute_effect.asm | 4 ++-- engine/battle/trainer_ai.asm | 8 ++++---- engine/hidden_object_functions17.asm | 2 +- engine/items/items.asm | 2 +- engine/learn_move.asm | 2 +- engine/menu/draw_start_menu.asm | 2 +- engine/menu/naming_screen.asm | 2 +- engine/menu/pokedex.asm | 2 +- engine/overworld/map_sprites.asm | 4 ++-- engine/overworld/movement.asm | 8 ++++---- home.asm | 6 +++--- hram.asm | 2 +- macros/data_macros.asm | 2 +- wram.asm | 10 +++++----- 23 files changed, 49 insertions(+), 49 deletions(-) diff --git a/audio.asm b/audio.asm index 0a344ae7..8bc175fa 100644 --- a/audio.asm +++ b/audio.asm @@ -541,7 +541,7 @@ Music_PokeFluteInBattle:: ; begin playing the "caught mon" sound effect ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent - ; then immediately overwrtie the channel pointers + ; then immediately overwrite the channel pointers ld hl, wChannelCommandPointers + Ch4 * 2 ld de, SFX_08_PokeFlute_Ch4 call Audio2_OverwriteChannelPointer diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index 21a3ad93..d6af3584 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -68,7 +68,7 @@ rNR34 EQU $ff1e ; Channel 3 Frequency's higher data (R/W) rNR41 EQU $ff20 ; Channel 4 Sound Length (R/W) rNR42 EQU $ff21 ; Channel 4 Volume Envelope (R/W) rNR43 EQU $ff22 ; Channel 4 Polynomial Counter (R/W) -rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Inital (R/W) +rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Initial (R/W) rNR50 EQU $ff24 ; Channel control / ON-OFF / Volume (R/W) rNR51 EQU $ff25 ; Selection of Sound output terminal (R/W) rNR52 EQU $ff26 ; Sound on/off diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 57b19a37..d4f231b5 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -120,7 +120,7 @@ TMHM_PARTY_MENU EQU 3 SWAP_MONS_PARTY_MENU EQU 4 EVO_STONE_PARTY_MENU EQU 5 -; party memu message IDs +; party menu message IDs ANTIDOTE_MSG EQU $F0 BURN_HEAL_MSG EQU $F1 ICE_HEAL_MSG EQU $F2 diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index 0c586dad..da4f80c9 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -391,18 +391,18 @@ JugglerData: db 29,KADABRA,MR_MIME,0 ; Victory Road 2F db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0 -; Fucshia Gym +; Fuchsia Gym db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0 db 34,DROWZEE,HYPNO,0 ; Victory Road 2F db 48,MR_MIME,0 ; Unused db 33,HYPNO,0 -; Fucshia Gym +; Fuchsia Gym db 38,HYPNO,0 db 34,DROWZEE,KADABRA,0 TamerData: -; Fucshia Gym +; Fuchsia Gym db 34,SANDSLASH,ARBOK,0 db 33,ARBOK,SANDSLASH,ARBOK,0 ; Viridian Gym diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 373136a8..4964b2cf 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -829,7 +829,7 @@ DoRockSlideSpecialEffects: cp a,1 jp z,AnimationFlashScreen ; if it's the end of the subanimation, flash the screen ret -; if the subaninmation counter is between 8 and 11, shake the screen horizontally and vertically +; if the subanimation counter is between 8 and 11, shake the screen horizontally and vertically .shakeScreen ld b,1 predef PredefShakeScreenHorizontally ; shake horizontally @@ -1516,7 +1516,7 @@ AnimationShowMonPic: jp Delay3 AnimationShowEnemyMonPic: -; Shows the emenmy mon's front sprite. Used in animations like Seismic Toss +; Shows the enemy mon's front sprite. Used in animations like Seismic Toss ; to make the mon's sprite reappear after disappears offscreen. ld hl, AnimationShowMonPic jp CallWithTurnFlipped diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 153a9048..4e21f6de 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -406,7 +406,7 @@ MainInBattleLoop: ld a, [wEnemyBattleStatus1] bit UsingTrappingMove, a ; check if enemy is using a multi-turn attack like wrap jr z, .selectPlayerMove ; if not, jump -; enemy is using a mult-turn attack like wrap, so player is trapped and cannot execute a move +; enemy is using a multi-turn attack like wrap, so player is trapped and cannot execute a move ld a, $ff ld [wPlayerSelectedMove], a jr .selectEnemyMove @@ -704,7 +704,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ret ; adds bc to enemy HP -; bc isn't updated if HP substracted was capped to prevent overkill +; bc isn't updated if HP subtracted was capped to prevent overkill HandlePoisonBurnLeechSeed_IncreaseEnemyHP: push hl ld hl, wEnemyMonMaxHP @@ -1218,7 +1218,7 @@ ChooseNextMon: ret ; called when player is out of usable mons. -; prints approriate lose message, sets carry flag if player blacked out (special case for initial rival fight) +; prints appropriate lose message, sets carry flag if player blacked out (special case for initial rival fight) HandlePlayerBlackOut: ld a, [wLinkState] cp LINK_STATE_BATTLING @@ -3550,7 +3550,7 @@ CheckPlayerStatusConditions: ld c,[hl] ld hl,wPlayerBideAccumulatedDamage + 1 ld a,[hl] - add c ; acumulate damage taken + add c ; accumulate damage taken ld [hld],a ld a,[hl] adc b @@ -4286,7 +4286,7 @@ GetDamageVarsForPlayerAttack: sla c rl b ; reflect and light screen boosts do not cap the stat at 999, so weird things will happen during stats scaling if -; a Pokemon with 512 or more Defense has ued Reflect, or if a Pokemon with 512 or more Special has used Light Screen +; a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen .specialAttackCritCheck ld hl, wBattleMonSpecial ld a, [wCriticalHitOrOHKO] @@ -4399,7 +4399,7 @@ GetDamageVarsForEnemyAttack: sla c rl b ; reflect and light screen boosts do not cap the stat at 999, so weird things will happen during stats scaling if -; a Pokemon with 512 or more Defense has ued Reflect, or if a Pokemon with 512 or more Special has used Light Screen +; a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen .specialAttackCritCheck ld hl, wEnemyMonSpecial ld a, [wCriticalHitOrOHKO] @@ -7291,16 +7291,16 @@ PoisonEffect: ld de, wEnemyMoveEffect .poisonEffect call CheckTargetSubstitute - jr nz, .noEffect ; can't posion a substitute target + jr nz, .noEffect ; can't poison a substitute target ld a, [hli] ld b, a and a jr nz, .noEffect ; miss if target is already statused ld a, [hli] - cp POISON ; can't posion a poison-type target + cp POISON ; can't poison a poison-type target jr z, .noEffect ld a, [hld] - cp POISON ; can't posion a poison-type target + cp POISON ; can't poison a poison-type target jr z, .noEffect ld a, [de] cp POISON_SIDE_EFFECT1 @@ -7780,7 +7780,7 @@ StatModifierDownEffect: jp nz, MoveMissed ld a, [de] sub ATTACK_DOWN1_EFFECT - cp EVASION_DOWN1_EFFECT + $3 - ATTACK_DOWN1_EFFECT ; covers al -1 effects + cp EVASION_DOWN1_EFFECT + $3 - ATTACK_DOWN1_EFFECT ; covers all -1 effects jr c, .decrementStatMod sub ATTACK_DOWN2_EFFECT - ATTACK_DOWN1_EFFECT ; map -2 effects to corresponding -1 effect .decrementStatMod diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index f44d64f5..323dd167 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -186,7 +186,7 @@ SetupPlayerAndEnemyPokeballs: ld hl, wOAMBuffer + $18 jp WritePokeballOAMData -; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon) +; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (fainted) and pokeball slot (no mon) PokeballTileGraphics:: INCBIN "gfx/pokeball.2bpp" PokeballTileGraphicsEnd: diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index b7d8283f..2e68acc0 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -76,7 +76,7 @@ HealEffect_: ld a, [de] sbc [hl] jr c, .playAnim -; copy max HP to current HP if an overflow ocurred +; copy max HP to current HP if an overflow occurred ld a, [hli] ld [de], a ld [wHPBarNewHP+1], a diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 7fc90c44..0f2f087b 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -25,7 +25,7 @@ RecoilEffect_: jr nz, .updateHP inc c ; minimum recoil damage is 1 .updateHP -; substract HP from user due to the recoil damage +; subtract HP from user due to the recoil damage ld a, [hli] ld [wHPBarMaxHP+1], a ld a, [hl] diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm index 03314ebf..6cca3eae 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -37,9 +37,9 @@ SubstituteEffect_: sbc 0 pop bc jr c, .notEnoughHP ; underflow means user would be left with negative health - ; bug: since it only brances on carry, it will possibly leave user with 0 HP + ; bug: since it only branches on carry, it will possibly leave user with 0 HP .userHasZeroOrMoreHP - ldi [hl], a ; save resulting HP after substraction into current HP + ldi [hl], a ; save resulting HP after subtraction into current HP ld [hl], d ld h, b ld l, c diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index b175fcaf..cabd4334 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -114,7 +114,7 @@ AIMoveChoiceModification1: ld a, [wBattleMonStatus] and a ret z ; return if no status ailment on player's mon - ld hl, wBuffer - 1 ; temp move selection array (-1 byte offest) + ld hl, wBuffer - 1 ; temp move selection array (-1 byte offset) ld de, wEnemyMonMoves ; enemy moves ld b, NUM_MOVES + 1 .nextMove @@ -154,7 +154,7 @@ StatusAilmentMoveEffects: ; slightly encourage moves with specific effects. ; in particular, stat-modifying moves and other move effects -; that fall in-bewteen +; that fall in-between AIMoveChoiceModification2: ld a, [wAILayer2Encouragement] cp $1 @@ -212,7 +212,7 @@ AIMoveChoiceModification3: cp $10 jr z, .nextMove jr c, .notEffectiveMove - dec [hl] ; sligthly encourage this move + dec [hl] ; slightly encourage this move jr .nextMove .notEffectiveMove ; discourages non-effective moves if better moves are available push hl @@ -253,7 +253,7 @@ AIMoveChoiceModification3: pop hl and a jr z, .nextMove - inc [hl] ; sligthly discourage this move + inc [hl] ; slightly discourage this move jr .nextMove AIMoveChoiceModification4: ret diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 1b571d35..c1fa5aa4 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -54,7 +54,7 @@ KabutopsFossilText: DisplayMonFrontSpriteInBox: ; Displays a pokemon's front sprite in a pop-up window. -; [wcf91] = pokemon interal id number +; [wcf91] = pokemon internal id number ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 diff --git a/engine/items/items.asm b/engine/items/items.asm index 057595df..f46261b6 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -863,7 +863,7 @@ ItemUseMedicine: jp nc,.useVitamin ; if it's a vitamin or Rare Candy cp a,FULL_RESTORE jr nc,.healHP ; if it's a Full Restore or one of the potions -; fall through if it's one of the status-specifc healing items +; fall through if it's one of the status-specific healing items .cureStatusAilment ld bc,wPartyMon1Status - wPartyMon1 add hl,bc ; hl now points to status diff --git a/engine/learn_move.asm b/engine/learn_move.asm index ba73d4c0..53c7f87e 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -185,7 +185,7 @@ TryingToLearn: LearnedMove1Text: TX_FAR _LearnedMove1Text - TX_SFX_ITEM_1 ; plays SFX_GET_ITEM_1 in the pary menu (rare candy) and plays SFX_LEVEL_UP in battle + TX_SFX_ITEM_1 ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle TX_BLINK db "@" diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm index 4df9de27..83a81aac 100644 --- a/engine/menu/draw_start_menu.asm +++ b/engine/menu/draw_start_menu.asm @@ -27,7 +27,7 @@ DrawStartMenu: set 6,[hl] ; no pauses between printing each letter coord hl, 12, 2 CheckEvent EVENT_GOT_POKEDEX -; case for not having pokdex +; case for not having pokedex ld a,$06 jr z,.storeMenuItemCount ; case for having pokedex diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 2628da48..64065c4d 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -409,7 +409,7 @@ PrintNicknameAndUnderscores: call EraseMenuCursor ld a, $11 ; "ED" x coord ld [wTopMenuItemX], a - ld a, $5 ; "ED" y corrd + ld a, $5 ; "ED" y coord ld [wCurrentMenuItem], a ld a, [wNamingScreenType] cp NAME_MON_SCREEN diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 2da3a0f6..bf8afaa9 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -647,7 +647,7 @@ PokedexToIndex: ret IndexToPokedex: - ; converts the indexédex number at wd11e to a Pokédex number + ; converts the index number at wd11e to a Pokédex number push bc push hl ld a,[wd11e] diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index 05588321..2a221c7e 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -7,7 +7,7 @@ ; $C1X* and $C2X* are used to denote wSpriteStateData1-wSpriteStateData1 + $ff and wSpriteStateData2 + $00-wSpriteStateData2 + $ff sprite slot ; fields, respectively, within loops. The X is the loop index. ; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y* -; denote fields of the sprite slots interated over in the inner loop. +; denote fields of the sprite slots iterated over in the inner loop. InitMapSprites: call InitOutsideMapSprites ret c ; return if the map is an outside map (already handled by above call) @@ -192,7 +192,7 @@ LoadMapSpriteTilePatterns: pop de call FarCopyData2 ; load tile pattern data for sprite when walking jr .skipSecondLoad -; When reloading the upper half of tile patterns after diplaying text, the LCD +; When reloading the upper half of tile patterns after displaying text, the LCD ; will be on, so CopyVideoData (which writes to VRAM only during V-blank) must ; be used instead of FarCopyData2. .loadWhileLCDOn diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 6d05859e..bbfbbc39 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -331,9 +331,9 @@ UpdateSpriteInWalkingAnimation: ld a, [H_CURRENTSPRITEOFFSET] ld l, a inc h - ld a, [hl] ; c2x0 (walk animantion counter) + ld a, [hl] ; c2x0 (walk animation counter) dec a - ld [hl], a ; update walk animantion counter + ld [hl], a ; update walk animation counter ret nz ld a, $6 ; walking finished, update state add l @@ -446,7 +446,7 @@ InitializeSpriteStatus: ld [hl], a ; $c2x3: set X displacement to 8 ret -; calculates the spprite's scrren position form its map position and the player position +; calculates the sprite's screen position form its map position and the player position InitializeSpriteScreenPosition: ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] @@ -685,7 +685,7 @@ CanWalkOntoTile: scf ; set carry (marking failure to walk) ret -; calculates the tile pointer pointing to the tile the current sprite stancs on +; calculates the tile pointer pointing to the tile the current sprite stands on ; this is always the lower left tile of the 2x2 tile blocks all sprites are snapped to ; hl: output pointer GetTileSpriteStandsOn: diff --git a/home.asm b/home.asm index 0a2d829d..3d0adfff 100644 --- a/home.asm +++ b/home.asm @@ -2083,7 +2083,7 @@ DisableWaitingAfterTextDisplay:: ; [wcf91] = item ID ; OUTPUT: ; [wActionResultOrTookBattleTurn] = success -; 00: unsucessful +; 00: unsuccessful ; 01: successful ; 02: not able to be used right now, no extra menu displayed (only certain items use this) UseItem:: @@ -3382,7 +3382,7 @@ CopyString:: ; this function is used when lower button sensitivity is wanted (e.g. menus) ; OUTPUT: [hJoy5] = pressed buttons in usual format ; there are two flags that control its functionality, [hJoy6] and [hJoy7] -; there are esentially three modes of operation +; there are essentially three modes of operation ; 1. Get newly pressed buttons only ; ([hJoy7] == 0, [hJoy6] == any) ; Just copies [hJoyPressed] to [hJoy5]. @@ -3730,7 +3730,7 @@ CalcStat:: ld a, b add e jr nc, .noCarry2 - inc d ; da = (Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4 + inc d ; de = (Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4 .noCarry2 ld [H_MULTIPLICAND+2], a ld a, d diff --git a/hram.asm b/hram.asm index 9c13e5a1..4beca9c4 100644 --- a/hram.asm +++ b/hram.asm @@ -98,7 +98,7 @@ hSwapTemp EQU $FF95 hExperience EQU $FF96 ; 3 bytes, big endian -; Multiplcation and division variables are meant +; Multiplication and division variables are meant ; to overlap for back-to-back usage. Big endian. H_MULTIPLICAND EQU $FF96 ; 3 bytes diff --git a/macros/data_macros.asm b/macros/data_macros.asm index e24ae20e..4c6457be 100755 --- a/macros/data_macros.asm +++ b/macros/data_macros.asm @@ -146,7 +146,7 @@ ENDM ;\6 (flag) = add 3 to width of connection strip (why?) SOUTH_MAP_CONNECTION: MACRO db \2 ; map id - dw \5 + \4 ; "Conection Strip" location + dw \5 + \4 ; "Connection Strip" location dw wOverworldMap + 3 + (\1_HEIGHT + 3) * (\1_WIDTH + 6) + \3 ; current map position IF (\1_WIDTH < \2_WIDTH) IF (_NARG > 5) diff --git a/wram.asm b/wram.asm index cc2d332a..698027be 100755 --- a/wram.asm +++ b/wram.asm @@ -1735,7 +1735,7 @@ wPlayerBattleStatus3:: ; d064 ; bit 0 - toxic ; bit 1 - light screen ; bit 2 - reflect -; bit 3 - tranformed +; bit 3 - transformed ds 1 wEnemyStatsToDouble:: ; d065 @@ -2046,7 +2046,7 @@ wPredefBank:: ; d0b7 wMonHeader:: ; d0b8 wMonHIndex:: ; d0b8 -; In the ROM base stats data stucture, this is the dex number, but it is +; In the ROM base stats data structure, this is the dex number, but it is ; overwritten with the internal index number after the header is copied to WRAM. ds 1 @@ -3057,7 +3057,7 @@ wd732:: ; d732 ; bit 1: remnant of debug mode? not set by the game code. ; if it is set ; 1. skips most of Prof. Oak's speech, and uses NINTEN as the player's name and SONY as the rival's name -; 2. does not have the player start in floor two of the playyer's house (instead sending them to [wLastMap]) +; 2. does not have the player start in floor two of the player's house (instead sending them to [wLastMap]) ; 3. allows wild battles to be avoided by holding down B ; bit 2: the target warp is a fly warp (bit 3 set or blacked out) or a dungeon warp (bit 4 set) ; bit 3: used warp pad, escape rope, dig, teleport, or fly, so the target warp is a "fly warp" @@ -3085,7 +3085,7 @@ wd736:: ; d736 ; bit 1: the player is currently stepping down from a door ; bit 2: standing on a warp ; bit 6: jumping down a ledge / fishing animation -; bit 7: player sprite spinning due to spin tiles (Rocket hidehout / Viridian Gym) +; bit 7: player sprite spinning due to spin tiles (Rocket hideout / Viridian Gym) ds 1 wCompletedInGameTradeFlags:: ; d737 @@ -3168,7 +3168,7 @@ wUnusedDA38:: ; da38 wCurMapScript:: ; da39 ; index of current map script, mostly used as index for function pointer array -; mostly copied from map-specific map script pointer and wirtten back later +; mostly copied from map-specific map script pointer and written back later ds 1 ds 7 -- cgit v1.2.3 From 5c39c6c5cb4defc4fcec85bb4b7cd878d190d6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20M=2E=20Gonz=C3=A1lez?= Date: Sun, 30 Jul 2017 18:46:53 -0300 Subject: Replaced all instances of $52, $53, and $5A with "", "", and "" respectively. --- text.asm | 2 +- text/maps/agatha.asm | 2 +- text/maps/bills_house.asm | 2 +- text/maps/blues_house.asm | 6 +++--- text/maps/bruno.asm | 2 +- text/maps/celadon_city.asm | 2 +- text/maps/celadon_dept_store_roof.asm | 6 +++--- text/maps/celadon_diner.asm | 2 +- text/maps/celadon_game_corner.asm | 6 +++--- text/maps/celadon_gym.asm | 2 +- text/maps/cerulean_city.asm | 10 +++++----- text/maps/cerulean_gym.asm | 2 +- text/maps/champion.asm | 22 +++++++++++----------- text/maps/cinnabar_gym.asm | 4 ++-- text/maps/cinnabar_lab_fossil_room.asm | 2 +- text/maps/cinnabar_lab_metronome_room.asm | 2 +- text/maps/copycats_house_2f.asm | 14 +++++++------- text/maps/daycare_1.asm | 2 +- text/maps/fuchsia_fishing_house.asm | 4 ++-- text/maps/fuchsia_gym_2.asm | 2 +- text/maps/fujis_house.asm | 4 ++-- text/maps/lance.asm | 6 +++--- text/maps/mr_psychics_house.asm | 2 +- text/maps/mt_moon_b2f.asm | 2 +- text/maps/oaks_lab.asm | 4 ++-- text/maps/pallet_town.asm | 4 ++-- text/maps/pewter_gym_2.asm | 4 ++-- text/maps/pokemon_tower_2f.asm | 6 +++--- text/maps/pokemon_tower_5f.asm | 2 +- text/maps/route_1.asm | 2 +- text/maps/route_12_gate_upstairs.asm | 2 +- text/maps/route_12_house.asm | 4 ++-- text/maps/route_16_house.asm | 2 +- text/maps/route_22.asm | 12 ++++++------ text/maps/route_24_1.asm | 2 +- text/maps/safari_zone_entrance.asm | 2 +- text/maps/safari_zone_secret_house.asm | 2 +- text/maps/saffron_gym.asm | 2 +- text/maps/silph_co_11f.asm | 4 ++-- text/maps/silph_co_2f.asm | 2 +- text/maps/silph_co_3f.asm | 2 +- text/maps/silph_co_7f.asm | 12 ++++++------ text/maps/ss_anne_2.asm | 10 +++++----- text/maps/ss_anne_7.asm | 4 ++-- text/maps/vermilion_fishing_house.asm | 4 ++-- text/maps/vermilion_gym_2.asm | 2 +- text/maps/victory_road_2f.asm | 2 +- text/maps/viridian_city.asm | 2 +- text/maps/viridian_gym.asm | 2 +- text/maps/viridian_mart.asm | 2 +- text/maps/wardens_house.asm | 4 ++-- text/oakspeech.asm | 2 +- 52 files changed, 107 insertions(+), 107 deletions(-) diff --git a/text.asm b/text.asm index 866d4a7f..fc075e19 100644 --- a/text.asm +++ b/text.asm @@ -2239,7 +2239,7 @@ _CoinsScatteredText:: prompt _GettingPumpedText:: - text $5a, "'s" + text "'s" line "getting pumped!" prompt diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index 4957f4d4..9ef5059a 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -17,7 +17,7 @@ _AgathaBeforeBattleText:: cont "wrong! #MON" cont "are for fighting!" - para $52, "! I'll show" + para "! I'll show" line "you how a real" cont "trainer fights!" done diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm index 463b13e6..5ece48d7 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -54,7 +54,7 @@ _BillThankYouText:: prompt _SSTicketReceivedText:: - text $52, " received" + text " received" line "an @" TX_RAM wcf4b text "!@@" diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm index b676ea69..1898636a 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/blues_house.asm @@ -1,6 +1,6 @@ _DaisyInitialText:: - text "Hi ",$52,"!" - line $53," is out at" + text "Hi !" + line " is out at" cont "Grandpa's lab." done @@ -12,7 +12,7 @@ _DaisyOfferMapText:: prompt _GotMapText:: - text $52," got a" + text " got a" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm index 39898eb5..9c493c4a 100644 --- a/text/maps/bruno.asm +++ b/text/maps/bruno.asm @@ -11,7 +11,7 @@ _BrunoBeforeBattleText:: line "trained with" cont "my #MON!" - para $52, "!" + para "!" para "We will grind you" line "down with our" diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index e2470ec1..1dbd5cdf 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -40,7 +40,7 @@ _TM41PreText:: prompt _ReceivedTM41Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm index 4689b023..5d104cf5 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/celadon_dept_store_roof.asm @@ -14,7 +14,7 @@ _CeladonMartRoofText_484f3:: line "from me!@@" _CeladonMartRoofText_484f9:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" @@ -40,7 +40,7 @@ _CeladonMartRoofText_48504:: line "from me!@@" _CeladonMartRoofText_4850a:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" @@ -66,7 +66,7 @@ _CeladonMartRoofText_48515:: line "from me!@@" _ReceivedTM49Text:: - text $52, " received" + text " received" line "TM49!@@" _CeladonMartRoofText_48520:: diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm index fd31eb20..dc5e9350 100644 --- a/text/maps/celadon_diner.asm +++ b/text/maps/celadon_diner.asm @@ -42,7 +42,7 @@ _CeladonDinerText_491a7:: prompt _ReceivedCoinCaseText:: - text $52, " received" + text " received" line "a @" TX_RAM wcf4b text "!@@" diff --git a/text/maps/celadon_game_corner.asm b/text/maps/celadon_game_corner.asm index 2d263e80..1e59f83e 100644 --- a/text/maps/celadon_game_corner.asm +++ b/text/maps/celadon_game_corner.asm @@ -64,7 +64,7 @@ _CeladonGameCornerText_48d9c:: prompt _Received10CoinsText:: - text $52, " received" + text " received" line "10 coins!@@" _CeladonGameCornerText_48da7:: @@ -121,7 +121,7 @@ _CeladonGameCornerText_48e26:: prompt _Received20CoinsText:: - text $52, " received" + text " received" line "20 coins!@@" _CeladonGameCornerText_48e31:: @@ -143,7 +143,7 @@ _CeladonGameCornerText_48e88:: prompt _CeladonGameCornerText_48e8d:: - text $52, " received" + text " received" line "20 coins!@@" _CeladonGameCornerText_48e93:: diff --git a/text/maps/celadon_gym.asm b/text/maps/celadon_gym.asm index 99833ee1..d8f9394c 100644 --- a/text/maps/celadon_gym.asm +++ b/text/maps/celadon_gym.asm @@ -62,7 +62,7 @@ _CeladonGymText9:: done _ReceivedTM21Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm index 48d97e05..b5319d04 100644 --- a/text/maps/cerulean_city.asm +++ b/text/maps/cerulean_city.asm @@ -1,6 +1,6 @@ _CeruleanCityText_19668:: - text $53, ": Yo!" - line $52, "!" + text ": Yo!" + line "!" para "You're still" line "struggling along" @@ -13,7 +13,7 @@ _CeruleanCityText_19668:: para "Here, let me see" line "what you caught," - cont $52, "!" + cont "!" done _CeruleanCityText_1966d:: @@ -29,7 +29,7 @@ _CeruleanCityText_19672:: prompt _CeruleanCityText_19677:: - text $53, ": Hey," + text ": Hey," line "guess what?" para "I went to BILL's" @@ -69,7 +69,7 @@ _CeruleanCityText_196d9:: done _ReceivedTM28Text:: - text $52, " recovered" + text " recovered" line "TM28!@@" _ReceivedTM28Text2:: diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm index dd6baaff..1d1d6d1c 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/cerulean_gym.asm @@ -46,7 +46,7 @@ _CeruleanGymText_5c7c8:: done _ReceivedTM11Text:: - text $52, " received" + text " received" line "TM11!@@" _CeruleanGymText_5c7d3:: diff --git a/text/maps/champion.asm b/text/maps/champion.asm index 3ca7aadf..61050565 100644 --- a/text/maps/champion.asm +++ b/text/maps/champion.asm @@ -1,9 +1,9 @@ _GaryChampionIntroText:: - text $53, ": Hey!" + text ": Hey!" para "I was looking" line "forward to seeing" - cont "you, ", $52, "!" + cont "you, !" para "My rival should" line "be strong to keep" @@ -24,7 +24,7 @@ _GaryChampionIntroText:: para "I'm the #MON" line "LEAGUE champion!" - para $52, "! Do you" + para "! Do you" line "know what that" cont "means?" @@ -54,11 +54,11 @@ _GaryVictoryText:: line "I won, I won!" para "I'm too good for" - line "you, ", $52, "!" + line "you, !" para "You did well to" line "even reach me," - cont $53, ", the" + cont ", the" cont "#MON genius!" para "Nice try, loser!" @@ -82,7 +82,7 @@ _GaryText_76103:: done _GaryText2:: - text "OAK: ", $52, "!" + text "OAK: !" done _GaryText_76120:: @@ -99,12 +99,12 @@ _GaryText_76120:: TX_RAM wcd6d text "!" - para $52, ", you have" + para ", you have" line "come of age!" done _GaryText_76125:: - text "OAK: ", $53, "! I'm" + text "OAK: ! I'm" line "disappointed!" para "I came when I" @@ -115,7 +115,7 @@ _GaryText_76125:: line "here, you had" cont "already lost!" - para $53, "! Do you" + para "! Do you" line "understand why" cont "you lost?" @@ -130,7 +130,7 @@ _GaryText_76125:: done _GaryText_7612a:: - text "OAK: ", $52, "!" + text "OAK: !" para "You understand" line "that your victory" @@ -141,6 +141,6 @@ _GaryText_7612a:: line "with your #MON" cont "is marvelous!" - para $52, "!" + para "!" line "Come with me!" done diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm index b14f6f60..173f94d2 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/cinnabar_gym.asm @@ -42,7 +42,7 @@ _BlaineBadgeText:: done _ReceivedTM38Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" @@ -204,6 +204,6 @@ _CinnabarGymText_75ac2:: done _CinnabarGymText_75ac7:: - text $52, "! You beat" + text "! You beat" line "that fire brand!" done diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/cinnabar_lab_fossil_room.asm index 565104b3..3978814e 100644 --- a/text/maps/cinnabar_lab_fossil_room.asm +++ b/text/maps/cinnabar_lab_fossil_room.asm @@ -58,7 +58,7 @@ _Lab4Text_610b3:: text "So! You hurry and" line "give me that!" - para $52, " handed" + para " handed" line "over @" TX_RAM wcd6d text "!" diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/cinnabar_lab_metronome_room.asm index e2fbb558..fa04677f 100644 --- a/text/maps/cinnabar_lab_metronome_room.asm +++ b/text/maps/cinnabar_lab_metronome_room.asm @@ -7,7 +7,7 @@ _TM35PreReceiveText:: prompt _ReceivedTM35Text:: - text $52, " received " + text " received " line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm index 90833127..44988e58 100644 --- a/text/maps/copycats_house_2f.asm +++ b/text/maps/copycats_house_2f.asm @@ -1,11 +1,11 @@ _CopycatsHouse2FText_5ccd4:: - text $52, ": Hi! Do" + text ": Hi! Do" line "you like #MON?" - para $52, ": Uh no, I" + para ": Uh no, I" line "just asked you." - para $52, ": Huh?" + para ": Huh?" line "You're strange!" para "COPYCAT: Hmm?" @@ -27,7 +27,7 @@ _TM31PreReceiveText:: prompt _ReceivedTM31Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" @@ -41,12 +41,12 @@ _TM31ExplanationText1:: line "#MON!@@" _TM31ExplanationText2:: - text $52, ": Hi!" + text ": Hi!" line "Thanks for TM31!" - para $52, ": Pardon?" + para ": Pardon?" - para $52, ": Is it" + para ": Is it" line "that fun to mimic" cont "my every move?" diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm index 6e3c5737..f4cec10e 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/daycare_1.asm @@ -46,7 +46,7 @@ _DayCareOweMoneyText:: done _DayCareGotMonBackText:: - text $52, " got" + text " got" line "@" TX_RAM wDayCareMonName text " back!" diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm index 195dc8ef..b1b8b2f2 100644 --- a/text/maps/fuchsia_fishing_house.asm +++ b/text/maps/fuchsia_fishing_house.asm @@ -17,7 +17,7 @@ _FuchsiaHouse3Text_561c2:: para "Take this and" line "fish, young one!" - para $52, " received" + para " received" line "a @" TX_RAM wcf4b text "!@@" @@ -29,7 +29,7 @@ _FuchsiaHouse3Text_56212:: _FuchsiaHouse3Text_56217:: text "Hello there," - line $52, "!" + line "!" para "How are the fish" line "biting?" diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm index ba1970e6..2913fb8f 100644 --- a/text/maps/fuchsia_gym_2.asm +++ b/text/maps/fuchsia_gym_2.asm @@ -25,7 +25,7 @@ _FuchsiaGymText9:: done _ReceivedTM06Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm index 7c61d1ed..86cade68 100644 --- a/text/maps/fujis_house.asm +++ b/text/maps/fujis_house.asm @@ -34,7 +34,7 @@ _LavenderHouse1Text4:: text "NIDORINO: Gaoo!@@" _LavenderHouse1Text_1d94c:: - text "MR.FUJI: ", $52, "." + text "MR.FUJI: ." para "Your #DEX quest" line "may fail without" @@ -46,7 +46,7 @@ _LavenderHouse1Text_1d94c:: prompt _ReceivedFluteText:: - text $52, " received" + text " received" line "a @" TX_RAM wcf4b text "!@@" diff --git a/text/maps/lance.asm b/text/maps/lance.asm index 0313b158..ed3dcada 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -24,7 +24,7 @@ _LanceBeforeBattleText:: para "Your LEAGUE" line "challenge ends" - cont "with me, ", $52, "!" + cont "with me, !" done _LanceEndBattleText:: @@ -39,7 +39,7 @@ _LanceAfterBattleText:: text "I still can't" line "believe my" cont "dragons lost to" - cont "you, ", $52, "!" + cont "you, !" para "You are now the" line "#MON LEAGUE" @@ -54,7 +54,7 @@ _LanceAfterBattleText:: line "another trainer!" cont "His name is..." - para $53, "!" + para "!" line "He beat the ELITE" cont "FOUR before you!" diff --git a/text/maps/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm index 8c37383d..7be2e11e 100644 --- a/text/maps/mr_psychics_house.asm +++ b/text/maps/mr_psychics_house.asm @@ -6,7 +6,7 @@ _TM29PreReceiveText:: prompt _ReceivedTM29Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm index 462c9d3c..472649b9 100644 --- a/text/maps/mt_moon_b2f.asm +++ b/text/maps/mt_moon_b2f.asm @@ -9,7 +9,7 @@ _MtMoon3Text_49f64:: done _MtMoon3Text_49f6f:: - text $52, " got the" + text " got the" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 1f02c355..7a6f57b7 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -10,7 +10,7 @@ _OaksLabText40:: cont "greedy like you!" para "Go ahead and" - line "choose, ", $52, "!" + line "choose, !" done _OaksLabText41:: @@ -49,7 +49,7 @@ _OaksLabMonEnergeticText:: prompt _OaksLabReceivedMonText:: - text $52, " received" + text " received" line "a @" TX_RAM wcd6d text "!@@" diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm index 64b3325b..d5eda74f 100644 --- a/text/maps/pallet_town.asm +++ b/text/maps/pallet_town.asm @@ -47,9 +47,9 @@ _PalletTownText5:: done _PalletTownText6:: - text $52,"'s house " + text "'s house " done _PalletTownText7:: - text $53,"'s house " + text "'s house " done diff --git a/text/maps/pewter_gym_2.asm b/text/maps/pewter_gym_2.asm index ff5f7242..86b97018 100644 --- a/text/maps/pewter_gym_2.asm +++ b/text/maps/pewter_gym_2.asm @@ -18,7 +18,7 @@ _TM34PreReceiveText:: done _ReceivedTM34Text:: - text $52, " received" + text " received" line "TM34!@@" _TM34ExplanationText:: @@ -57,7 +57,7 @@ _PewterGymText_5c4bc:: line "victory, here's" cont "the BOULDERBADGE!" - para $52, " received" + para " received" line "the BOULDERBADGE!@@" _PewterGymText_5c4c1:: diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/pokemon_tower_2f.asm index ec2281fd..79323001 100644 --- a/text/maps/pokemon_tower_2f.asm +++ b/text/maps/pokemon_tower_2f.asm @@ -1,6 +1,6 @@ _PokemonTower2Text_6062d:: - text $53, ": Hey," - line $52, "! What" + text ": Hey," + line "! What" cont "brings you here?" cont "Your #MON" cont "don't look dead!" @@ -19,7 +19,7 @@ _PokemonTower2Text_60632:: prompt _PokemonTower2Text_60637:: - text $53, ": Well," + text ": Well," line "look at all your" cont "wimpy #MON!" diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/pokemon_tower_5f.asm index f2cadfcb..b329118d 100644 --- a/text/maps/pokemon_tower_5f.asm +++ b/text/maps/pokemon_tower_5f.asm @@ -66,6 +66,6 @@ _PokemonTower5Text7:: text "Entered purified," line "protected zone!" - para $52, "'s #MON" + para "'s #MON" line "are fully healed!" done diff --git a/text/maps/route_1.asm b/text/maps/route_1.asm index adffd705..73188f09 100644 --- a/text/maps/route_1.asm +++ b/text/maps/route_1.asm @@ -13,7 +13,7 @@ _Route1ViridianMartSampleText:: prompt _Route1Text_1cae8:: - text $52, " got" + text " got" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm index 1f2af788..95a89527 100644 --- a/text/maps/route_12_gate_upstairs.asm +++ b/text/maps/route_12_gate_upstairs.asm @@ -9,7 +9,7 @@ _TM39PreReceiveText:: prompt _ReceivedTM39Text:: - text $52, " received" + text " received" line "TM39!@@" _TM39ExplanationText:: diff --git a/text/maps/route_12_house.asm b/text/maps/route_12_house.asm index 4cb4beee..e04ce5fb 100644 --- a/text/maps/route_12_house.asm +++ b/text/maps/route_12_house.asm @@ -16,7 +16,7 @@ _Route12HouseText_564c5:: para "Take this and" line "fish, young one!" - para $52, " received" + para " received" line "a @" TX_RAM wcf4b text "!@@" @@ -39,7 +39,7 @@ _Route12HouseText_564cf:: _Route12HouseText_564d4:: text "Hello there," - line $52, "!" + line "!" para "Use the SUPER ROD" line "in any water!" diff --git a/text/maps/route_16_house.asm b/text/maps/route_16_house.asm index 534cee08..77efde87 100644 --- a/text/maps/route_16_house.asm +++ b/text/maps/route_16_house.asm @@ -9,7 +9,7 @@ _Route16HouseText3:: prompt _ReceivedHM02Text:: - text $52, " received" + text " received" line "HM02!@@" _HM02ExplanationText:: diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index ac4141eb..3a1d28f0 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -1,6 +1,6 @@ _Route22RivalBeforeBattleText1:: - text $53, ": Hey!" - line $52, "!" + text ": Hey!" + line "!" para "You're going to" line "#MON LEAGUE?" @@ -38,7 +38,7 @@ _Route22RivalDefeatedText1:: prompt _Route22Text_511bc:: - text $53, ": What?" + text ": What?" line "Why do I have 2" cont "#MON?" @@ -47,8 +47,8 @@ _Route22Text_511bc:: prompt _Route22RivalBeforeBattleText2:: - text $53, ": What?" - line $52, "! What a" + text ": What?" + line "! What a" cont "surprise to see" cont "you here!" @@ -72,7 +72,7 @@ _Route22RivalAfterBattleText2:: line "up! I'm ready for" cont "#MON LEAGUE!" - para $52, ", you need" + para ", you need" line "more practice!" para "But hey, you know" diff --git a/text/maps/route_24_1.asm b/text/maps/route_24_1.asm index 25079b2f..ae861eda 100644 --- a/text/maps/route_24_1.asm +++ b/text/maps/route_24_1.asm @@ -10,7 +10,7 @@ _Route24Text_51515:: prompt _Route24Text_5151a:: - text $52, " received" + text " received" line "a @" TX_RAM wcf4b text "!@@" diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm index 8a018b2d..dcc1fd9b 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/safari_zone_entrance.asm @@ -20,7 +20,7 @@ SafariZoneEntranceText_9e747:: line "special # BALL" cont "here." - para $52, " received" + para " received" line "30 SAFARI BALLs!@@" _SafariZoneEntranceText_75360:: diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm index 1bbe89fd..3df79d90 100644 --- a/text/maps/safari_zone_secret_house.asm +++ b/text/maps/safari_zone_secret_house.asm @@ -15,7 +15,7 @@ _SecretHouseText_4a350:: prompt _ReceivedHM03Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm index ba57e35d..419b56ac 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/saffron_gym.asm @@ -55,7 +55,7 @@ _SaffronGymText_5d173:: done ReceivedTM46Text:: - text $52, " received" + text " received" line "TM46!@@" _TM46ExplanationText:: diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 8e7a3848..fbaa6086 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -20,7 +20,7 @@ _SilphCoPresidentText:: prompt _ReceivedSilphCoMasterBallText:: - text $52, " got a" + text " got a" line "@" TX_RAM wcf4b text "!@@" @@ -87,7 +87,7 @@ _SilphCo10Text_62335:: para "But, TEAM ROCKET" line "will never fall!" - para $52, "! Never" + para "! Never" line "forget that all" cont "#MON exist" cont "for TEAM ROCKET!" diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm index a48ebd23..bd87630a 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -10,7 +10,7 @@ _SilphCo2Text_59ded:: prompt _ReceivedTM36Text:: - text $52, " got" + text " got" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/silph_co_3f.asm b/text/maps/silph_co_3f.asm index a514d3ef..b6a023f9 100644 --- a/text/maps/silph_co_3f.asm +++ b/text/maps/silph_co_3f.asm @@ -4,7 +4,7 @@ _SilphCo3Text_59ff9:: done _SilphCo3Text_59ffe:: - text $52, "! You and" + text "! You and" line "your #MON" cont "saved us!" done diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm index e6ad11c1..1cc2bc30 100644 --- a/text/maps/silph_co_7f.asm +++ b/text/maps/silph_co_7f.asm @@ -145,12 +145,12 @@ _SilphCo7AfterBattleText4:: done _SilphCo7Text_51ebe:: - text $53, ": What" - line "kept you ", $52, "?" + text ": What" + line "kept you ?" done _SilphCo7Text_51ec3:: - text $53, ": Hahaha!" + text ": Hahaha!" line "I thought you'd" cont "turn up if I" cont "waited here!" @@ -173,7 +173,7 @@ _SilphCo7Text_51ec8:: prompt _SilphCo7Text_51ecd:: - text $53, ": How can" + text ": How can" line "I put this?" para "You're not good" @@ -182,7 +182,7 @@ _SilphCo7Text_51ecd:: prompt _SilphCo7Text_51ed2:: - text "Well, ", $52, "!" + text "Well, !" para "I'm moving on up" line "and ahead!" @@ -202,7 +202,7 @@ _SilphCo7Text_51ed2:: line "world's most" cont "powerful trainer!" - para $52, ", well" + para ", well" line "good luck to you!" cont "Don't sweat it!" cont "Smell ya!" diff --git a/text/maps/ss_anne_2.asm b/text/maps/ss_anne_2.asm index ba231ac5..58d804ba 100644 --- a/text/maps/ss_anne_2.asm +++ b/text/maps/ss_anne_2.asm @@ -9,13 +9,13 @@ _SSAnne2Text1:: done _SSAnneRivalBeforeBattleText:: - text $53, ": Bonjour!" - line $52, "!" + text ": Bonjour!" + line "!" para "Imagine seeing" line "you here!" - para $52, ", were you" + para ", were you" line "really invited?" para "So how's your" @@ -40,7 +40,7 @@ _SSAnneRivalDefeatedText:: prompt _SSAnneRivalWonText:: - text $52, "! What are" + text "! What are" line "you, seasick?" para "You should shape" @@ -48,7 +48,7 @@ _SSAnneRivalWonText:: prompt _SSAnneRivalCaptainText:: - text $53, ": I heard" + text ": I heard" line "there was a CUT" cont "master on board." diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm index bb8ca042..7bf004da 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/ss_anne_7.asm @@ -3,7 +3,7 @@ _SSAnne7RubText:: line "I feel hideous..." cont "Urrp! Seasick..." - para $52, " rubbed" + para " rubbed" line "the CAPTAIN's" cont "back!" @@ -31,7 +31,7 @@ _ReceivingHM01Text:: prompt _ReceivedHM01Text:: - text $52, " got" + text " got" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm index 0fa28cae..6857bb5b 100644 --- a/text/maps/vermilion_fishing_house.asm +++ b/text/maps/vermilion_fishing_house.asm @@ -16,7 +16,7 @@ _VermilionHouse2Text_560b6:: para "Take this and" line "fish, young one!" - para $52, " received" + para " received" line "an @" TX_RAM wcf4b text "!@@" @@ -39,7 +39,7 @@ _VermilionHouse2Text_560c0:: _VermilionHouse2Text_560c5:: text "Hello there," - line $52, "!" + line "!" para "How are the fish" line "biting?" diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym_2.asm index 4fd5e159..d0a01932 100644 --- a/text/maps/vermilion_gym_2.asm +++ b/text/maps/vermilion_gym_2.asm @@ -24,7 +24,7 @@ _VermilionGymText_5cb77:: done _ReceivedTM24Text:: - text $52, " received " + text " received " line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm index cdcf6e36..ec9dcf4f 100644 --- a/text/maps/victory_road_2f.asm +++ b/text/maps/victory_road_2f.asm @@ -29,7 +29,7 @@ _VictoryRoad2EndBattleText2:: prompt _VictoryRoad2AfterBattleText2:: - text $53, " also came" + text " also came" line "through here!" done diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm index 17b2ec91..67ab5c40 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -83,7 +83,7 @@ _ViridianCityText_191ca:: prompt _ReceivedTM42Text:: - text $52, " received" + text " received" line "TM42!@@" _TM42Explanation:: diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm index df04e6d6..f87d8d58 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/viridian_gym.asm @@ -60,7 +60,7 @@ _ViridianGymText12:: done _ReceivedTM27Text:: - text $52, " received" + text " received" line "TM27!@@" _TM27ExplanationText:: diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm index aa199335..61750afe 100644 --- a/text/maps/viridian_mart.asm +++ b/text/maps/viridian_mart.asm @@ -16,7 +16,7 @@ ViridianMartParcelQuestText:: line "Will you take it" cont "to him?" - para $52, " got" + para " got" line "OAK's PARCEL!@@" _ViridianMartText2:: diff --git a/text/maps/wardens_house.asm b/text/maps/wardens_house.asm index d4da3781..9d40cace 100644 --- a/text/maps/wardens_house.asm +++ b/text/maps/wardens_house.asm @@ -18,7 +18,7 @@ _WardenGibberishText3:: done _WardenTeethText1:: - text $52, " gave the" + text " gave the" line "GOLD TEETH to the" cont "WARDEN!@@" @@ -42,7 +42,7 @@ _WardenThankYouText:: prompt _ReceivedHM04Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/oakspeech.asm b/text/oakspeech.asm index 5911092c..e006d16f 100644 --- a/text/oakspeech.asm +++ b/text/oakspeech.asm @@ -42,7 +42,7 @@ _IntroduceRivalText:: prompt _OakSpeechText3:: - text $52,"!" + text "!" para "Your very own" line "#MON legend is" -- cgit v1.2.3