diff options
55 files changed, 254 insertions, 236 deletions
diff --git a/constants/script_constants.asm b/constants/script_constants.asm index b0db4e70..989306d0 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -1,13 +1,13 @@ -; script vars +; person constants PLAYER EQU 0 LAST_TALKED EQU -2 -; memory constants +; string buffer constants const_def - const MEM_BUFFER_0 ; use wStringBuffer3 - const MEM_BUFFER_1 ; use wStringBuffer4 - const MEM_BUFFER_2 ; use wStringBuffer5 -NUM_MEM_BUFFERS EQU const_value + const STRING_BUFFER_3 ; use wStringBuffer3 + const STRING_BUFFER_4 ; use wStringBuffer4 + const STRING_BUFFER_5 ; use wStringBuffer5 +NUM_STRING_BUFFERS EQU const_value ; checkmoney/takemoney accounts const_def @@ -80,6 +80,14 @@ const_value SET -1 const PLAYEREVENT_JOYCHANGEFACING NUM_PLAYER_EVENTS EQU const_value +; script data sizes (see macros/scripts/maps.asm) +SCENE_SCRIPT_SIZE EQU 4 ; scene_script +CALLBACK_SIZE EQU 3 ; callback +WARP_EVENT_SIZE EQU 5 ; warp_event +COORD_EVENT_SIZE EQU 8 ; coord_event +BG_EVENT_SIZE EQU 5 ; bg_event +OBJECT_EVENT_SIZE EQU 13 ; object_event + ; bg_event types ; TryBGEvent arguments (see engine/overworld/events.asm) const_def diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm index ac0f7e31..4a9e9484 100755 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/misc_scripts_2.asm @@ -12,7 +12,7 @@ RepelWoreOffScript:: HiddenItemScript:: opentext copybytetovar wcf2b - itemtotext MEM_BUFFER_0, USE_SCRIPT_VAR + itemtotext STRING_BUFFER_3, USE_SCRIPT_VAR writetext .PlayerFoundItemText giveitem ITEM_FROM_MEM iffalse .bag_full @@ -100,7 +100,7 @@ Function2ffe:: ; 2ffe (0:2ffe) jr z, .quit ldh a, [hROMBank] push af - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank ld a, [wPlayerStandingMapX] add $4 ld d, a @@ -258,139 +258,12 @@ GetWeekday:: INCLUDE "home/pokedex_flags.asm" INCLUDE "home/names.asm" INCLUDE "home/scrolling_menu.asm" - -HandleStoneQueue:: - ldh a, [hROMBank] - push af - call SwitchToMapScriptHeaderBank - call StoneQueueWarpAction - pop bc - ld a, b - rst Bankswitch - ret - -StoneQueueWarpAction:: ; 37b9 (0:37b9) - ld hl, $1 - add hl, de - ld a, [hl] - cp $ff - jr z, .asm_37dc - ld l, a - push hl - call IsAnyMapObjectOnAWarp - pop hl - jr nc, .asm_37dc - ld d, a - ld e, l - call IsThisObjectInTheStoneTable - jr nc, .asm_37dc - call CallMapScript - farcall EnableScriptMode - scf - ret - -.asm_37dc - and a - ret - -IsAnyMapObjectOnAWarp:: ; 37de (0:37de) - push de - ld hl, $10 - add hl, de - ld a, [hl] - ld hl, $11 - add hl, de - ld e, [hl] - sub $4 - ld d, a - ld a, e - sub $4 - ld e, a - call IsThisMapObjectOnAWarp - pop de - ret - -IsThisMapObjectOnAWarp:: ; 37f5 (0:37f5) - ld hl, wCurrMapWarpHeaderPointer - ld a, [hli] - ld h, [hl] - ld l, a - ld a, [wCurrMapWarpCount] - and a - jr z, .no_warps -.find_warp_loop - push af - ld a, [hl] - cp e - jr nz, .next - inc hl - ld a, [hld] - cp d - jr nz, .next - jr .yes - -.next - ld a, $5 - add l - ld l, a - jr nc, .asm_3814 - inc h -.asm_3814 - pop af - dec a - jr nz, .find_warp_loop -.no_warps - and a - ret - -.yes - pop af - ld d, a - ld a, [wCurrMapWarpCount] - sub d - inc a - scf - ret - -IsThisObjectInTheStoneTable:: ; 3823 (0:3823) - ld hl, $1 - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a -.asm_382a - ld a, [hli] - cp $ff - jr z, .asm_3840 - cp d - jr nz, .asm_383b - ld a, [hli] - cp e - jr nz, .asm_383c - ld a, [hli] - ld h, [hl] - ld l, a - jr .asm_3842 - -.asm_383b - inc hl -.asm_383c - inc hl - inc hl - jr .asm_382a - -.asm_3840 - and a - ret - -.asm_3842 - scf - ret +INCLUDE "home/stone_queue.asm" CheckTrainerBattle2:: ldh a, [hROMBank] push af - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank call CheckTrainerBattle pop bc ld a, b diff --git a/home/map.asm b/home/map.asm index 30314a55..d1c522d8 100644 --- a/home/map.asm +++ b/home/map.asm @@ -502,7 +502,7 @@ Function22ad:: ; 22ad (0:22ad) ret nc ldh a, [hROMBank] push af - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank call Function22c1 pop de ld a, d @@ -516,11 +516,11 @@ Function22c1:: ; 22c1 (0:22c1) ld a, [wPlayerStandingMapX] sub $4 ld d, a - ld a, [wCurrMapWarpCount] + ld a, [wCurMapWarpCount] and a ret z ld c, a - ld hl, wCurrMapWarpHeaderPointer + ld hl, wCurMapWarpsPointer ld a, [hli] ld h, [hl] ld l, a @@ -551,7 +551,7 @@ Function22c1:: ; 22c1 (0:22c1) pop hl call Function22fe ret nc - ld a, [wCurrMapWarpCount] + ld a, [wCurMapWarpCount] inc a sub c ld c, a @@ -567,7 +567,7 @@ Function22fe:: ; 22fe (0:22fe) Function2302:: ; 2302 (0:2302) ldh a, [hROMBank] push af - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank call Function230f pop af rst Bankswitch @@ -576,7 +576,7 @@ Function2302:: ; 2302 (0:2302) Function230f:: ; 230f (0:230f) push bc - ld hl, wCurrMapWarpHeaderPointer + ld hl, wCurMapWarpsPointer ld a, [hli] ld h, [hl] ld l, a @@ -697,7 +697,7 @@ CheckDungeonMap:: LoadMapAttributes:: call CopyMapHeaders - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank call ReadMapScripts xor a call ReadMapEventHeader @@ -705,7 +705,7 @@ LoadMapAttributes:: LoadMapAttributes_SkipPeople:: call CopyMapHeaders - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank call ReadMapScripts ld a, $1 call ReadMapEventHeader @@ -829,11 +829,11 @@ ReadMapCallbacks:: ; 24a2 (0:24a2) ReadWarps:: ; 24b9 (0:24b9) ld a, [hli] ld c, a - ld [wCurrMapWarpCount], a + ld [wCurMapWarpCount], a ld a, l - ld [wCurrMapWarpHeaderPointer], a + ld [wCurMapWarpsPointer], a ld a, h - ld [wCurrMapWarpHeaderPointer + 1], a + ld [wCurMapWarpsPointer + 1], a ld a, c and a ret z @@ -1260,7 +1260,7 @@ RunMapCallback:: ; 2764 (0:2764) ld b, a ldh a, [hROMBank] push af - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank call FindCallback jr nc, .asm_2779 call GetMapScriptHeaderBank @@ -1987,7 +1987,7 @@ CheckFacingSign:: ld c, a ldh a, [hROMBank] push af - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank call CheckIfFacingTileCoordIsSign pop hl ld a, h @@ -2037,7 +2037,7 @@ CheckCurrentMapXYTriggers:: ld c, a ldh a, [hROMBank] push af - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank call .TriggerCheck pop hl ld a, h @@ -2251,7 +2251,7 @@ PartiallyCopyMapHeader:: ; 2d16 (0:2d16) rst Bankswitch ret -SwitchToMapScriptHeaderBank:: ; 2d2b (0:2d2b) +SwitchToMapScriptsBank:: ; 2d2b (0:2d2b) ld a, [wd08c] rst Bankswitch ret diff --git a/home/stone_queue.asm b/home/stone_queue.asm new file mode 100755 index 00000000..ff59509d --- /dev/null +++ b/home/stone_queue.asm @@ -0,0 +1,137 @@ +HandleStoneQueue:: + ldh a, [hROMBank] + push af + + call SwitchToMapScriptsBank + call .WarpAction + + pop bc + ld a, b + rst Bankswitch + ret + +.WarpAction: + ld hl, OBJECT_MAP_OBJECT_INDEX + add hl, de + ld a, [hl] + cp $ff + jr z, .nope + + ld l, a + push hl + call .IsObjectOnWarp + pop hl + jr nc, .nope + ld d, a + ld e, l + call .IsObjectInStoneTable + jr nc, .nope + call CallMapScript + farcall EnableScriptMode + scf + ret + +.nope + and a + ret + +.IsObjectOnWarp: + push de + + ld hl, OBJECT_NEXT_MAP_X + add hl, de + ld a, [hl] + ld hl, OBJECT_NEXT_MAP_Y + add hl, de + ld e, [hl] + + sub 4 + ld d, a + ld a, e + sub 4 + ld e, a + call .check_on_warp + + pop de + ret + +.check_on_warp + ld hl, wCurMapWarpsPointer + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [wCurMapWarpCount] + and a + jr z, .nope2 + +.loop + push af + ld a, [hl] + cp e + jr nz, .not_on_warp + inc hl + ld a, [hld] + cp d + jr nz, .not_on_warp + jr .found_warp + +.not_on_warp + ld a, WARP_EVENT_SIZE + add l + ld l, a + jr nc, .no_carry + inc h +.no_carry + + pop af + dec a + jr nz, .loop + +.nope2 + and a + ret + +.found_warp + pop af + ld d, a + ld a, [wCurMapWarpCount] + sub d + inc a + scf + ret + +.IsObjectInStoneTable: + ld hl, CMDQUEUE_ADDR + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a +.loop2 + ld a, [hli] + cp $ff + jr z, .nope3 + cp d + jr nz, .next_inc3 + ld a, [hli] + cp e + jr nz, .next_inc2 + ld a, [hli] + ld h, [hl] + ld l, a + jr .yes + +.next_inc3 + inc hl + +.next_inc2 + inc hl + inc hl + jr .loop2 + +.nope3 + and a + ret + +.yes + scf + ret
\ No newline at end of file diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index a79efc76..79176a28 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -144,7 +144,7 @@ AzaleaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext BUGSY, BUGSY1, MEM_BUFFER_1 + trainertotext BUGSY, BUGSY1, STRING_BUFFER_4 jumpstd gymstatue2 BugsyText_INeverLose: diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index d4a3a71a..87b35414 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -143,7 +143,7 @@ BlackthornGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CLAIR, CLAIR1, MEM_BUFFER_1 + trainertotext CLAIR, CLAIR1, STRING_BUFFER_4 jumpstd gymstatue2 ClairIntroText: diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 77227fbe..07359b6d 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -94,7 +94,7 @@ CeladonCafeTrashcan: giveitem LEFTOVERS iffalse .PackFull opentext - itemtotext LEFTOVERS, MEM_BUFFER_0 + itemtotext LEFTOVERS, STRING_BUFFER_3 writetext FoundLeftoversText playsound SFX_ITEM waitsfx @@ -105,7 +105,7 @@ CeladonCafeTrashcan: .PackFull: opentext - itemtotext LEFTOVERS, MEM_BUFFER_0 + itemtotext LEFTOVERS, STRING_BUFFER_3 writetext FoundLeftoversText buttonsound writetext NoRoomForLeftoversText diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 80c810f9..52cc573e 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -33,7 +33,7 @@ CeladonDeptStore6FVendingMachine: giveitem FRESH_WATER iffalse .NotEnoughSpace takemoney YOUR_MONEY, 200 - itemtotext FRESH_WATER, MEM_BUFFER_0 + itemtotext FRESH_WATER, STRING_BUFFER_3 jump .VendItem .SodaPop: @@ -42,7 +42,7 @@ CeladonDeptStore6FVendingMachine: giveitem SODA_POP iffalse .NotEnoughSpace takemoney YOUR_MONEY, 300 - itemtotext SODA_POP, MEM_BUFFER_0 + itemtotext SODA_POP, STRING_BUFFER_3 jump .VendItem .Lemonade: @@ -51,7 +51,7 @@ CeladonDeptStore6FVendingMachine: giveitem LEMONADE iffalse .NotEnoughSpace takemoney YOUR_MONEY, 350 - itemtotext LEMONADE, MEM_BUFFER_0 + itemtotext LEMONADE, STRING_BUFFER_3 jump .VendItem .VendItem: diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index beab8cae..1b29dc01 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -58,7 +58,7 @@ CeladonGameCornerFisherScript: iffalse .NoCoinCase checkcoins MAX_COINS - 1 ifequal HAVE_MORE, .FullCoinCase - stringtotext .coinname, MEM_BUFFER_1 + stringtotext .coinname, STRING_BUFFER_4 scall .GiveCoins givecoins 18 setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 82642f83..543dcf82 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -34,7 +34,7 @@ CeladonPrizeRoom_tmcounterloop: .doubleteam checkcoins 1500 ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins - itemtotext TM_DOUBLE_TEAM, MEM_BUFFER_0 + itemtotext TM_DOUBLE_TEAM, STRING_BUFFER_3 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_DOUBLE_TEAM @@ -45,7 +45,7 @@ CeladonPrizeRoom_tmcounterloop: .psychic checkcoins 3500 ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins - itemtotext TM_PSYCHIC_M, MEM_BUFFER_0 + itemtotext TM_PSYCHIC_M, STRING_BUFFER_3 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_PSYCHIC_M @@ -56,7 +56,7 @@ CeladonPrizeRoom_tmcounterloop: .hyperbeam checkcoins 7500 ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins - itemtotext TM_HYPER_BEAM, MEM_BUFFER_0 + itemtotext TM_HYPER_BEAM, STRING_BUFFER_3 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_HYPER_BEAM @@ -137,7 +137,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom - pokenamemem MR__MIME, MEM_BUFFER_0 + pokenamemem MR__MIME, STRING_BUFFER_3 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx @@ -155,7 +155,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom - pokenamemem EEVEE, MEM_BUFFER_0 + pokenamemem EEVEE, STRING_BUFFER_3 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx @@ -173,7 +173,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom - pokenamemem PORYGON, MEM_BUFFER_0 + pokenamemem PORYGON, STRING_BUFFER_3 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 89e8540a..38b09b84 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -107,7 +107,7 @@ CeladonGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext ERIKA, ERIKA1, MEM_BUFFER_1 + trainertotext ERIKA, ERIKA1, STRING_BUFFER_4 jumpstd gymstatue2 ErikaBeforeBattleText: diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 4fff92cd..fc0c3faf 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -158,7 +158,7 @@ CeruleanGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MISTY, MISTY1, MEM_BUFFER_1 + trainertotext MISTY, MISTY1, STRING_BUFFER_4 jumpstd gymstatue2 CeruleanGymGruntRunsDownMovement: diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 85a27b65..ee281738 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -67,7 +67,7 @@ CherrygroveCityGuideGent: opentext writetext GuideGentGiftText buttonsound - stringtotext .mapcardname, MEM_BUFFER_1 + stringtotext .mapcardname, STRING_BUFFER_4 scall .JumpstdReceiveItem setflag ENGINE_MAP_CARD writetext GotMapCardText diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 8a43fe43..6dfc8257 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -136,7 +136,7 @@ CianwoodGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CHUCK, CHUCK1, MEM_BUFFER_1 + trainertotext CHUCK, CHUCK1, STRING_BUFFER_4 jumpstd gymstatue2 CianwoodGymMovement_ChuckChucksBoulder: diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 0496893a..75d63cd0 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -37,7 +37,7 @@ DragonsDenB1FDragonFangScript: iffalse .BagFullDragonFang disappear DRAGONSDENB1F_POKE_BALL1 opentext - itemtotext DRAGON_FANG, MEM_BUFFER_0 + itemtotext DRAGON_FANG, STRING_BUFFER_3 writetext Text_FoundDragonFang playsound SFX_ITEM waitsfx @@ -79,7 +79,7 @@ DragonsDenB1FDragonFangScript: .BagFullDragonFang: opentext - itemtotext DRAGON_FANG, MEM_BUFFER_0 + itemtotext DRAGON_FANG, STRING_BUFFER_3 writetext Text_FoundDragonFang buttonsound writetext Text_NoRoomForDragonFang diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index d1ec88a3..bd47d9d7 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -133,7 +133,7 @@ EcruteakGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MORTY, MORTY1, MEM_BUFFER_1 + trainertotext MORTY, MORTY1, STRING_BUFFER_4 jumpstd gymstatue2 MortyIntroText: diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 4f7ef7b5..167c1025 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -133,7 +133,7 @@ CyndaquilPokeBallScript: writetext ChoseStarterText buttonsound waitsfx - pokenamemem CYNDAQUIL, MEM_BUFFER_0 + pokenamemem CYNDAQUIL, STRING_BUFFER_3 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -163,7 +163,7 @@ TotodilePokeBallScript: writetext ChoseStarterText buttonsound waitsfx - pokenamemem TOTODILE, MEM_BUFFER_0 + pokenamemem TOTODILE, STRING_BUFFER_3 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -191,7 +191,7 @@ ChikoritaPokeBallScript: writetext ChoseStarterText buttonsound waitsfx - pokenamemem CHIKORITA, MEM_BUFFER_0 + pokenamemem CHIKORITA, STRING_BUFFER_3 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -455,7 +455,7 @@ AideScript_GiveYouBalls: opentext writetext AideText_GiveYouBalls buttonsound - itemtotext POKE_BALL, MEM_BUFFER_1 + itemtotext POKE_BALL, STRING_BUFFER_4 scall AideScript_ReceiveTheBalls giveitem POKE_BALL, 5 writetext AideText_ExplainBalls diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 6b9c4b2b..e6a5e9bc 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -214,7 +214,7 @@ FuchsiaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JANINE, JANINE1, MEM_BUFFER_1 + trainertotext JANINE, JANINE1, STRING_BUFFER_4 jumpstd gymstatue2 Movement_NinjaSpin: diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index b11be1ed..6b92d7c9 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -27,7 +27,7 @@ GoldenrodVendingMachine: giveitem FRESH_WATER iffalse .NotEnoughSpace takemoney YOUR_MONEY, 200 - itemtotext FRESH_WATER, MEM_BUFFER_0 + itemtotext FRESH_WATER, STRING_BUFFER_3 jump .VendItem .SodaPop: @@ -36,7 +36,7 @@ GoldenrodVendingMachine: giveitem SODA_POP iffalse .NotEnoughSpace takemoney YOUR_MONEY, 300 - itemtotext SODA_POP, MEM_BUFFER_0 + itemtotext SODA_POP, STRING_BUFFER_3 jump .VendItem .Lemonade: @@ -45,7 +45,7 @@ GoldenrodVendingMachine: giveitem LEMONADE iffalse .NotEnoughSpace takemoney YOUR_MONEY, 350 - itemtotext LEMONADE, MEM_BUFFER_0 + itemtotext LEMONADE, STRING_BUFFER_3 jump .VendItem .VendItem: diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index ea87b115..b75414bb 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -40,7 +40,7 @@ GoldenrodGameCornerTMVendor_LoopScript: .Thunder: checkcoins 5500 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_THUNDER, MEM_BUFFER_0 + itemtotext TM_THUNDER, STRING_BUFFER_3 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_THUNDER @@ -51,7 +51,7 @@ GoldenrodGameCornerTMVendor_LoopScript: .Blizzard: checkcoins 5500 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_BLIZZARD, MEM_BUFFER_0 + itemtotext TM_BLIZZARD, STRING_BUFFER_3 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_BLIZZARD @@ -62,7 +62,7 @@ GoldenrodGameCornerTMVendor_LoopScript: .FireBlast: checkcoins 5500 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_FIRE_BLAST, MEM_BUFFER_0 + itemtotext TM_FIRE_BLAST, STRING_BUFFER_3 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_FIRE_BLAST @@ -145,7 +145,7 @@ GoldenrodGameCornerPrizeMonVendorScript: ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem ABRA, MEM_BUFFER_0 + pokenamemem ABRA, STRING_BUFFER_3 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -163,7 +163,7 @@ GoldenrodGameCornerPrizeMonVendorScript: ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem EKANS, MEM_BUFFER_0 + pokenamemem EKANS, STRING_BUFFER_3 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -181,7 +181,7 @@ GoldenrodGameCornerPrizeMonVendorScript: ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem DRATINI, MEM_BUFFER_0 + pokenamemem DRATINI, STRING_BUFFER_3 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -224,7 +224,7 @@ GoldenrodGameCornerPrizeMonVendorScript: ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem ABRA, MEM_BUFFER_0 + pokenamemem ABRA, STRING_BUFFER_3 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -242,7 +242,7 @@ GoldenrodGameCornerPrizeMonVendorScript: ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem SANDSHREW, MEM_BUFFER_0 + pokenamemem SANDSHREW, STRING_BUFFER_3 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -260,7 +260,7 @@ GoldenrodGameCornerPrizeMonVendorScript: ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem DRATINI, MEM_BUFFER_0 + pokenamemem DRATINI, STRING_BUFFER_3 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 9da4a895..2370857e 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -169,7 +169,7 @@ GoldenrodGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext WHITNEY, WHITNEY1, MEM_BUFFER_1 + trainertotext WHITNEY, WHITNEY1, STRING_BUFFER_4 jumpstd gymstatue2 BridgetWalksUpMovement: diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 5fc1c49b..7e931de3 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -34,7 +34,7 @@ LavRadioTower1FGentlemanScript: .ReturnedMachinePart: writetext LavRadioTower1FGentlemanText_ReturnedMachinePart buttonsound - stringtotext .expncardname, MEM_BUFFER_1 + stringtotext .expncardname, STRING_BUFFER_4 scall .receiveitem setflag ENGINE_EXPN_CARD .GotExpnCard: diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index f578597f..a8da6137 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -144,7 +144,7 @@ MahoganyGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext PRYCE, PRYCE1, MEM_BUFFER_1 + trainertotext PRYCE, PRYCE1, STRING_BUFFER_4 jumpstd gymstatue2 PryceText_Intro: diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index df5da9d4..b0f1d0ed 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -93,7 +93,7 @@ TrainerSchoolboyJack1: askforphonenumber PHONE_SCHOOLBOY_JACK ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0 + trainertotext SCHOOLBOY, JACK1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted @@ -187,7 +187,7 @@ TrainerPokefanfBeverly1: askforphonenumber PHONE_POKEFAN_BEVERLY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0 + trainertotext POKEFANF, BEVERLY1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 536d3c6e..d1787cb0 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -89,7 +89,7 @@ OlivineGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JASMINE, JASMINE1, MEM_BUFFER_1 + trainertotext JASMINE, JASMINE1, STRING_BUFFER_4 jumpstd gymstatue2 Jasmine_SteelTypeIntro: diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index cf98f65e..02f0d84a 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -42,7 +42,7 @@ TrainerSailorHuey: askforphonenumber PHONE_SAILOR_HUEY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext SAILOR, HUEY1, MEM_BUFFER_0 + trainertotext SAILOR, HUEY1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index e540b213..292bfb75 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -70,7 +70,7 @@ PewterGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext BROCK, BROCK1, MEM_BUFFER_1 + trainertotext BROCK, BROCK1, STRING_BUFFER_4 jumpstd gymstatue2 BrockIntroText: diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 91e0cc54..8b9c071a 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -27,7 +27,7 @@ MeetMomScript: opentext writetext ElmsLookingForYouText buttonsound - stringtotext GearName, MEM_BUFFER_1 + stringtotext GearName, STRING_BUFFER_4 scall PlayersHouse1FReceiveItemStd setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 0350ae51..c760da0e 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -146,7 +146,7 @@ RadioTower1FRadioCardWomanScript: waitsfx writetext UnknownText_0x5d37b buttonsound - stringtotext .RadioCardText, MEM_BUFFER_1 + stringtotext .RadioCardText, STRING_BUFFER_4 scall .ReceiveItem writetext UnknownText_0x5d3c0 buttonsound diff --git a/maps/Route26.asm b/maps/Route26.asm index aa6de49a..e99f4929 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -48,7 +48,7 @@ TrainerCooltrainermGaven3: askforphonenumber PHONE_COOLTRAINERM_GAVEN ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0 + trainertotext COOLTRAINERM, GAVEN3, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted @@ -142,7 +142,7 @@ TrainerCooltrainerfBeth1: askforphonenumber PHONE_COOLTRAINERF_BETH ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0 + trainertotext COOLTRAINERF, BETH1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route27.asm b/maps/Route27.asm index e08ac68b..e32f013e 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -81,7 +81,7 @@ TrainerBirdKeeperJose2: askforphonenumber PHONE_BIRDKEEPER_JOSE ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0 + trainertotext BIRD_KEEPER, JOSE2, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted @@ -186,7 +186,7 @@ TrainerCooltrainerfReena: askforphonenumber PHONE_COOLTRAINERF_REENA ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0 + trainertotext COOLTRAINERF, REENA1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route30.asm b/maps/Route30.asm index 5e47855b..3b5707eb 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -60,7 +60,7 @@ TrainerYoungsterJoey: askforphonenumber PHONE_YOUNGSTER_JOEY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 + trainertotext YOUNGSTER, JOEY1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route31.asm b/maps/Route31.asm index 7f47a1b2..78b143d0 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -46,7 +46,7 @@ TrainerBugCatcherWade1: askforphonenumber PHONE_BUG_CATCHER_WADE ifequal PHONE_CONTACTS_FULL, .PhoneFullSTD ifequal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD - trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0 + trainertotext BUG_CATCHER, WADE1, STRING_BUFFER_3 scall .RegisterNumberSTD jump .AcceptedNumberSTD diff --git a/maps/Route32.asm b/maps/Route32.asm index 799c7e9d..43b77274 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -187,7 +187,7 @@ TrainerFisherRalph1: askforphonenumber PHONE_FISHER_RALPH ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext FISHER, RALPH1, MEM_BUFFER_0 + trainertotext FISHER, RALPH1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted @@ -281,7 +281,7 @@ TrainerPicnickerLiz1: askforphonenumber PHONE_PICNICKER_LIZ ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext PICNICKER, LIZ1, MEM_BUFFER_0 + trainertotext PICNICKER, LIZ1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route33.asm b/maps/Route33.asm index 29e7d497..7af007ee 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -32,7 +32,7 @@ TrainerHikerAnthony: askforphonenumber PHONE_HIKER_ANTHONY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext HIKER, ANTHONY2, MEM_BUFFER_0 + trainertotext HIKER, ANTHONY2, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route34.asm b/maps/Route34.asm index be42a190..aa0f332c 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -109,7 +109,7 @@ TrainerCamperTodd1: askforphonenumber PHONE_CAMPER_TODD ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext CAMPER, TODD1, MEM_BUFFER_0 + trainertotext CAMPER, TODD1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted @@ -192,7 +192,7 @@ TrainerPicnickerGina1: askforphonenumber PHONE_PICNICKER_GINA ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext PICNICKER, GINA1, MEM_BUFFER_0 + trainertotext PICNICKER, GINA1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route35.asm b/maps/Route35.asm index fc2c80fa..954ea960 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -51,7 +51,7 @@ TrainerJugglerIrwin: askforphonenumber PHONE_JUGGLER_IRWIN ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM - trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0 + trainertotext JUGGLER, IRWIN1, STRING_BUFFER_3 scall Route35RegisteredNumberM jump Route35NumberAcceptedM @@ -178,7 +178,7 @@ TrainerBugCatcherArnie: askforphonenumber PHONE_BUG_CATCHER_ARNIE ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM - trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0 + trainertotext BUG_CATCHER, ARNIE1, STRING_BUFFER_3 scall Route35RegisteredNumberM jump Route35NumberAcceptedM diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 18520fdd..3ba3036f 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -57,7 +57,7 @@ Route35NationalParkGate_MapScripts: opentext checkcode VAR_CONTESTMINUTES addvar 1 - vartomem MEM_BUFFER_0 + vartomem STRING_BUFFER_3 writetext UnknownText_0x6a79a yesorno iffalse .GoBackToContest diff --git a/maps/Route36.asm b/maps/Route36.asm index 992107e4..00196c92 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -136,7 +136,7 @@ TrainerSchoolboyAlan1: askforphonenumber PHONE_SCHOOLBOY_ALAN ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0 + trainertotext SCHOOLBOY, ALAN1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 8e967b6c..a5c983e2 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -66,7 +66,7 @@ Route36NationalParkGate_MapScripts: opentext checkcode VAR_CONTESTMINUTES addvar 1 - vartomem MEM_BUFFER_0 + vartomem STRING_BUFFER_3 writetext UnknownText_0x6b284 yesorno iffalse .GoBackToContest diff --git a/maps/Route38.asm b/maps/Route38.asm index da7645d6..6dc1d046 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -58,7 +58,7 @@ TrainerLassDana1: askforphonenumber PHONE_LASS_DANA ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber - trainertotext LASS, DANA1, MEM_BUFFER_0 + trainertotext LASS, DANA1, STRING_BUFFER_3 scall .RegisteredPhoneNumber jump .NumberAccepted @@ -141,7 +141,7 @@ TrainerSchoolboyChad1: askforphonenumber PHONE_SCHOOLBOY_CHAD ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .SaidNo - trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0 + trainertotext SCHOOLBOY, CHAD1, STRING_BUFFER_3 scall .RegisteredChad jump .HaveChadsNumber diff --git a/maps/Route39.asm b/maps/Route39.asm index 069e8cad..53b4edf8 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -47,7 +47,7 @@ TrainerPokefanmDerek: askforphonenumber PHONE_POKEFANM_DEREK ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext POKEFANM, DEREK1, MEM_BUFFER_0 + trainertotext POKEFANM, DEREK1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route42.asm b/maps/Route42.asm index 622286ce..55736f29 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -38,7 +38,7 @@ TrainerFisherChris: askforphonenumber PHONE_FISHER_CHRIS ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext FISHER, CHRIS1, MEM_BUFFER_0 + trainertotext FISHER, CHRIS1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route43.asm b/maps/Route43.asm index 9fc3d56e..d0fce5df 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -70,7 +70,7 @@ TrainerPokemaniacBrent: askforphonenumber PHONE_POKEMANIAC_BRENT ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0 + trainertotext POKEMANIAC, BRENT1, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted @@ -175,7 +175,7 @@ TrainerPicnickerTiffany: askforphonenumber PHONE_PICNICKER_TIFFANY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0 + trainertotext PICNICKER, TIFFANY3, STRING_BUFFER_3 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route44.asm b/maps/Route44.asm index 1f6f0177..27e0ba1e 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -40,7 +40,7 @@ TrainerBirdKeeperVance1: askforphonenumber PHONE_BIRDKEEPER_VANCE ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM - trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0 + trainertotext BIRD_KEEPER, VANCE1, STRING_BUFFER_3 scall Route44RegisteredNumberM jump Route44NumberAcceptedM @@ -134,7 +134,7 @@ TrainerFisherWilton1: askforphonenumber PHONE_FISHER_WILTON ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM - trainertotext FISHER, WILTON1, MEM_BUFFER_0 + trainertotext FISHER, WILTON1, STRING_BUFFER_3 scall Route44RegisteredNumberM jump Route44NumberAcceptedM diff --git a/maps/Route45.asm b/maps/Route45.asm index 0d84ef4f..59a02c9a 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -42,7 +42,7 @@ TrainerBlackbeltKenji: askforphonenumber PHONE_BLACKBELT_KENJI ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM - trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0 + trainertotext BLACKBELT_T, KENJI3, STRING_BUFFER_3 scall Route45RegisteredNumberM jump Route45NumberAcceptedM @@ -147,7 +147,7 @@ TrainerHikerParry: askforphonenumber PHONE_HIKER_PARRY ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM - trainertotext HIKER, PARRY1, MEM_BUFFER_0 + trainertotext HIKER, PARRY1, STRING_BUFFER_3 scall Route45RegisteredNumberM jump Route45NumberAcceptedM diff --git a/maps/Route46.asm b/maps/Route46.asm index ea36aed9..a48d973b 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -46,7 +46,7 @@ TrainerPicnickerErin1: askforphonenumber PHONE_PICNICKER_ERIN ifequal PHONE_CONTACTS_FULL, Route46PhoneFullF ifequal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF - trainertotext PICNICKER, ERIN1, MEM_BUFFER_0 + trainertotext PICNICKER, ERIN1, STRING_BUFFER_3 scall Route46RegisteredNumberF jump Route46NumberAcceptedF diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index c495d110..5e2e0674 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -109,7 +109,7 @@ SaffronGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext SABRINA, SABRINA1, MEM_BUFFER_1 + trainertotext SABRINA, SABRINA1, STRING_BUFFER_4 jumpstd gymstatue2 UnknownText_0x189cdf: diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 1380d805..bbd836e4 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -20,11 +20,11 @@ TrainerHouseReceptionistScript: buttonsound special TrainerHouse iffalse .GetCal3Name - trainertotext CAL, CAL2, MEM_BUFFER_0 + trainertotext CAL, CAL2, STRING_BUFFER_3 jump .GotName .GetCal3Name: - trainertotext CAL, CAL3, MEM_BUFFER_0 + trainertotext CAL, CAL3, STRING_BUFFER_3 .GotName: writetext TrainerHouseB1FYourOpponentIsText buttonsound diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 7fce0c31..992d8fb6 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -99,7 +99,7 @@ VermilionGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext LT_SURGE, LT_SURGE1, MEM_BUFFER_1 + trainertotext LT_SURGE, LT_SURGE1, STRING_BUFFER_4 jumpstd gymstatue2 LtSurgeIntroText: diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 4fefeba5..5aaf8ef6 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -107,7 +107,7 @@ VioletGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext FALKNER, FALKNER1, MEM_BUFFER_1 + trainertotext FALKNER, FALKNER1, STRING_BUFFER_4 jumpstd gymstatue2 FalknerIntroText: diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index b2e64a16..8895a987 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -25,7 +25,7 @@ VioletPokecenter1F_ElmsAideScript: checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, .PartyFull giveegg TOGEPI, 5 - stringtotext .eggname, MEM_BUFFER_1 + stringtotext .eggname, STRING_BUFFER_4 scall .AideGivesEgg setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 88562e89..f3ae1b8a 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -58,7 +58,7 @@ ViridianGymStatue: jumpstd gymstatue1 .Beaten: - trainertotext BLUE, BLUE1, MEM_BUFFER_1 + trainertotext BLUE, BLUE1, STRING_BUFFER_4 jumpstd gymstatue2 LeaderBlueBeforeText: @@ -3382,8 +3382,8 @@ wd940:: ds 1 ; d940 wCurrentMapTriggerPointer:: dw ; d941 wd943:: ds 1 ; d943 wd944:: ds 1 ; d944 -wCurrMapWarpCount:: ds 1 ; d945 -wCurrMapWarpHeaderPointer:: dw ; d946 +wCurMapWarpCount:: ds 1 ; d945 +wCurMapWarpsPointer:: dw ; d946 wd948:: ds 1 ; d948 wd949:: ds 1 ; d949 wd94a:: ds 1 ; d94a |