diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-09-20 16:01:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-20 16:01:29 -0400 |
| commit | 0688c8c43a3db800a7af4b69a2efea229cf31ec5 (patch) | |
| tree | a08cd946f4b421f2d25e246df3d6d3375dc5ea05 /maps | |
| parent | e789ee48b65e8cc08104ef06de4b08c9ef9d117d (diff) | |
| parent | 8900eb7ad06931b78dcb91e0c2e7db583090aa06 (diff) | |
Merge pull request #72 from jd-0/master
Remove address comments
Diffstat (limited to 'maps')
228 files changed, 768 insertions, 768 deletions
diff --git a/maps/OldCityPokecenter2F.asm b/maps/OldCityPokecenter2F.asm index b2ed2c7..bc689a1 100644 --- a/maps/OldCityPokecenter2F.asm +++ b/maps/OldCityPokecenter2F.asm @@ -2,36 +2,36 @@ INCLUDE "constants.asm" SECTION "maps/OldCityPokecenter2F.asm", ROMX -OldCityPokecenter2FScriptLoader: ; 25:4782 +OldCityPokecenter2FScriptLoader: call Unreferenced_Function7e6 ld hl, OldCityPokecenter2FScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -OldCityPokecenter2FScriptPointers: ; 25:478f +OldCityPokecenter2FScriptPointers: dw OldCityPokecenter2FScript1 dw OldCityPokecenter2FNPCIds -OldCityPokecenter2FScript1: ; 25:4793 +OldCityPokecenter2FScript1: ld hl, OldCityPokecenter2FNPCIds ld de, OldCityPokecenter2FSignPointers call CallMapTextSubroutine ret -OldCityPokecenter2FNPCIds: ; 25:479d +OldCityPokecenter2FNPCIds: db $00, $01, $02, $03, $ff -OldCityPokecenter2FSignPointers: ; 25:47a2 +OldCityPokecenter2FSignPointers: dw MapDefaultText -OldCityPokecenter2FTextPointers: ; 25:47a4 +OldCityPokecenter2FTextPointers: dw OldCityPokecenter2FText1 dw OldCityPokecenter2FText2 dw OldCityPokecenter2FText3 dw OldCityPokecenter2FText4 -OldCityPokecenter2FText1: ; 25:47ac +OldCityPokecenter2FText1: ld a, $01 ld [wce37], a ld hl, wJoypadFlags @@ -41,7 +41,7 @@ OldCityPokecenter2FText1: ; 25:47ac res 5, [hl] ret -OldCityPokecenter2FText2: ; 25:47c4 +OldCityPokecenter2FText2: ld a, $02 ld [wce37], a ld hl, wJoypadFlags @@ -51,16 +51,16 @@ OldCityPokecenter2FText2: ; 25:47c4 res 5, [hl] ret -OldCityPokecenter2FText3: ; 25:47dc +OldCityPokecenter2FText3: ld hl, Text947e3 call OpenTextbox ret -Text947e3: ; 25:47e3 +Text947e3: text "おりゃ！" done -OldCityPokecenter2FText4: ; 25:47e9 +OldCityPokecenter2FText4: ld hl, OldCityPokecenter2FTextString4 call OpenTextbox callab Function29a1f @@ -77,7 +77,7 @@ OldCityPokecenter2FText4: ; 25:47e9 .asm_9480c ret -OldCityPokecenter2FTextString4: ; 25:480d +OldCityPokecenter2FTextString4: text "うしろにあるのは" line "タイムマシンです" done diff --git a/maps/OldCityPokecenterBattle.asm b/maps/OldCityPokecenterBattle.asm index a2a1bb0..cd2fadd 100644 --- a/maps/OldCityPokecenterBattle.asm +++ b/maps/OldCityPokecenterBattle.asm @@ -2,32 +2,32 @@ INCLUDE "constants.asm" SECTION "maps/OldCityPokecenterBattle.asm", ROMX -OldCityPokecenterBattleScriptLoader: ; 25:48eb +OldCityPokecenterBattleScriptLoader: ld hl, OldCityPokecenterBattleScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -OldCityPokecenterBattleScriptPointers: ; 25:48f5 +OldCityPokecenterBattleScriptPointers: dw OldCityPokecenterBattleScript1 dw OldCityPokecenterBattleNPCIds -OldCityPokecenterBattleScript1: ; 25:48f9 +OldCityPokecenterBattleScript1: ld hl, OldCityPokecenterBattleNPCIds ld de, OldCityPokecenterBattleSignPointers call CallMapTextSubroutine ret -OldCityPokecenterBattleNPCIds: ; 25:4903 +OldCityPokecenterBattleNPCIds: db $00, $ff -OldCityPokecenterBattleSignPointers: ; 25:4905 +OldCityPokecenterBattleSignPointers: dw MapDefaultText -OldCityPokecenterBattleTextPointers: ; 25:4907 +OldCityPokecenterBattleTextPointers: dw OldCityPokecenterBattleText1 -OldCityPokecenterBattleText1: ; 25:4909 +OldCityPokecenterBattleText1: ld hl, wJoypadFlags set 5, [hl] ld hl, OldCityPokecenterBattleTextString1 @@ -37,7 +37,7 @@ OldCityPokecenterBattleText1: ; 25:4909 callab Function28000 ret -OldCityPokecenterBattleTextString1: ; 25:4922 +OldCityPokecenterBattleTextString1: text "ちょっとまってね！@" text_exit db "@" diff --git a/maps/OldCityPokecenterTimeMachine.asm b/maps/OldCityPokecenterTimeMachine.asm index 5694775..5e82121 100644 --- a/maps/OldCityPokecenterTimeMachine.asm +++ b/maps/OldCityPokecenterTimeMachine.asm @@ -2,33 +2,33 @@ INCLUDE "constants.asm" SECTION "maps/OldCityPokecenterTimeMachine.asm", ROMX -OldCityPokecenterTimeMachineScriptLoader: ; 25:497e +OldCityPokecenterTimeMachineScriptLoader: call Unreferenced_Function7e6 ld hl, OldCityPokecenterTimeMachineScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -OldCityPokecenterTimeMachineScriptPointers: ; 25:498b +OldCityPokecenterTimeMachineScriptPointers: dw OldCityPokecenterTimeMachineScript1 dw OldCityPokecenterTimeMachineNPCIds -OldCityPokecenterTimeMachineScript1: ; 25:498f +OldCityPokecenterTimeMachineScript1: ld hl, OldCityPokecenterTimeMachineNPCIds ld de, OldCityPokecenterTimeMachineSignPointers call CallMapTextSubroutine ret -OldCityPokecenterTimeMachineNPCIds: ; 25:4999 +OldCityPokecenterTimeMachineNPCIds: db $00, $ff -OldCityPokecenterTimeMachineSignPointers: ; 25:499b +OldCityPokecenterTimeMachineSignPointers: dw MapDefaultText -OldCityPokecenterTimeMachineTextPointers: ; 25:499d +OldCityPokecenterTimeMachineTextPointers: dw OldCityPokecenterTimeMachineText1 -OldCityPokecenterTimeMachineText1: ; 25:499f +OldCityPokecenterTimeMachineText1: xor a ld [wce37], a callab Function29abf diff --git a/maps/OldCityPokecenterTrade.asm b/maps/OldCityPokecenterTrade.asm index e131339..9c9c7ca 100644 --- a/maps/OldCityPokecenterTrade.asm +++ b/maps/OldCityPokecenterTrade.asm @@ -2,32 +2,32 @@ INCLUDE "constants.asm" SECTION "maps/OldCityPokecenterTrade.asm", ROMX -OldCityPokecenterTradeScriptLoader: ; 25:4866 +OldCityPokecenterTradeScriptLoader: ld hl, OldCityPokecenterTradeScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -OldCityPokecenterTradeScriptPointers: ; 25:4870 +OldCityPokecenterTradeScriptPointers: dw OldCityPokecenterTradeScript1 dw OldCityPokecenterTradeNPCIds -OldCityPokecenterTradeScript1: ; 25:4874 +OldCityPokecenterTradeScript1: ld hl, OldCityPokecenterTradeNPCIds ld de, OldCityPokecenterTradeSignPointers call CallMapTextSubroutine ret -OldCityPokecenterTradeNPCIds: ; 25:487e +OldCityPokecenterTradeNPCIds: db $00, $ff -OldCityPokecenterTradeSignPointers: ; 25:4880 +OldCityPokecenterTradeSignPointers: dw MapDefaultText -OldCityPokecenterTradeTextPointers: ; 25:4882 +OldCityPokecenterTradeTextPointers: dw OldCityPokecenterTradeText1 -OldCityPokecenterTradeText1: ; 25:4884 +OldCityPokecenterTradeText1: ld hl, wJoypadFlags set 5, [hl] ld hl, OldCityPokecenterTradeTextString1 @@ -37,7 +37,7 @@ OldCityPokecenterTradeText1: ; 25:4884 callab Function28000 ret -OldCityPokecenterTradeTextString1: ; 25:489d +OldCityPokecenterTradeTextString1: text "ちょっとまってね！@" text_exit text_exit diff --git a/maps/PlayerHouse1F.asm b/maps/PlayerHouse1F.asm index b4481a0..9626e28 100644 --- a/maps/PlayerHouse1F.asm +++ b/maps/PlayerHouse1F.asm @@ -2,38 +2,38 @@ include "constants.asm" SECTION "maps/PlayerHouse1F.asm", ROMX -PlayerHouse1FScriptLoader:: ; 409C +PlayerHouse1FScriptLoader:: ld hl, PlayerHouse1FScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -PlayerHouse1FScriptPointers: ; 40A6 +PlayerHouse1FScriptPointers: dw PlayerHouse1FScript1 dw PlayerHouse1FNPCIDs1 dw PlayerHouse1FScript2 dw PlayerHouse1FNPCIDs2 -PlayerHouse1FNPCIDs1: ; 40AE +PlayerHouse1FNPCIDs1: db $FF -PlayerHouse1FNPCIDs2: ; 40AF +PlayerHouse1FNPCIDs2: db 0 db $FF -PlayerHouse1FScript1: ; 40B1 +PlayerHouse1FScript1: ld hl, PlayerHouse1FNPCIDs1 ld de, PlayerHouse1FSignPointers call CallMapTextSubroutine ret -PlayerHouse1FScript2: ; 40BB +PlayerHouse1FScript2: ld hl, PlayerHouse1FNPCIDs2 ld de, PlayerHouse1FSignPointers call CallMapTextSubroutine ret -PlayerHouse1FSignPointers: ; 40C5 +PlayerHouse1FSignPointers: dw Function38ab dw Function38b4 dw Function38a2 @@ -42,12 +42,12 @@ PlayerHouse1FSignPointers: ; 40C5 PlayerHouse1FTextPointers:: dw PlayerHouse1FNPCText1 -PlayerHouse1FNPCText1: ; 40D1 +PlayerHouse1FNPCText1: ld hl, PlayerHouse1FTextString1 call OpenTextbox ret -PlayerHouse1FTextString1: ; 40D8 +PlayerHouse1FTextString1: text "おかあさん『えっ あなた" line "オーキドはかせに" cont "ポケモンずかんを つくってくれって" diff --git a/maps/PlayerHouse2F.asm b/maps/PlayerHouse2F.asm index 783598f..f684b98 100644 --- a/maps/PlayerHouse2F.asm +++ b/maps/PlayerHouse2F.asm @@ -2,13 +2,13 @@ include "constants.asm" SECTION "maps/PlayerHouse2F.asm", ROMX -PlayerHouse2FScriptLoader:: ; 418B +PlayerHouse2FScriptLoader:: ld hl, PlayerHouse2FScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -PlayerHouse2FScriptPointers: ; 4195 +PlayerHouse2FScriptPointers: dw PlayerHouse2FScript1 dw PlayerHouse2FNPCIDs1 dw PlayerHouse2FScript2 @@ -18,23 +18,23 @@ PlayerHouse2FTextPointers:: dw PlayerHouse2FText1 dw PlayerHouse2FDollText -PlayerHouse2FNPCIDs1: ; 41A1 +PlayerHouse2FNPCIDs1: db 0 db 1 db $FF -PlayerHouse2FNPCIDs2: ; 41A4 +PlayerHouse2FNPCIDs2: db 1 db $FF -PlayerHouse2FSignPointers: ; 41A6 +PlayerHouse2FSignPointers: dw Function3899 dw PlayerHouse2FRadioText dw PlayerHouse2FComputerText dw Function3899 dw PlayerHouse2FN64Text -PlayerHouse2FScript1: ; 41B0 +PlayerHouse2FScript1: call PlayerHouse2PositionCheck ret z ld hl, PlayerHouse2FNPCIDs1 @@ -43,7 +43,7 @@ PlayerHouse2FScript1: ; 41B0 ret nz ret -PlayerHouse2PositionCheck: ; 41BF +PlayerHouse2PositionCheck: ld hl, wd41a bit 0, [hl] ret nz @@ -64,7 +64,7 @@ PlayerHouse2PositionCheck: ; 41BF call ClearAccumulator ret -PlayerHouse2FMovePlayer: ; 41EA +PlayerHouse2FMovePlayer: ld a, 0 ld hl, Movement call LoadMovementDataPointer @@ -74,18 +74,18 @@ PlayerHouse2FMovePlayer: ; 41EA call WriteIntod637 ret -Movement: ; 41FD +Movement: db $08 db $04 db $32 -PlayerHouse2FScript2: ; 4200 +PlayerHouse2FScript2: ld hl, PlayerHouse2FNPCIDs2 ld de, PlayerHouse2FSignPointers call CallMapTextSubroutine ret -PlayerHouse2FText1: ; 420A +PlayerHouse2FText1: ld hl, wd41a bit 3, [hl] jr nz, .jump @@ -100,17 +100,17 @@ PlayerHouse2FText1: ; 420A call OpenTextbox ret -PlayerHouse2FDollText: ; 4228 +PlayerHouse2FDollText: ld hl, PlayerHouse2FTextString3 call OpenTextbox ret -PlayerHouse2FRadioText: ; 422F +PlayerHouse2FRadioText: ld hl, PlayerHouse2FTextString9 call OpenTextbox ret -PlayerHouse2FComputerText: ; 4236 +PlayerHouse2FComputerText: ld hl, wd41a bit 0, [hl] jr nz, .jump @@ -125,7 +125,7 @@ PlayerHouse2FComputerText: ; 4236 call Function1fea ret -PlayerHouse2FCheckEmail: ; 4253 +PlayerHouse2FCheckEmail: call YesNoBox jr c, .jump2 ld hl, wd41a @@ -140,12 +140,12 @@ PlayerHouse2FCheckEmail: ; 4253 call PrintText ret -PlayerHouse2FN64Text: ; 426B +PlayerHouse2FN64Text: ld hl, PlayerHouse2FTextString4 call OpenTextbox ret -PlayerHouse2FTextString1: ; 4272 +PlayerHouse2FTextString1: text "ケン『おっ おまえの うでで" line "ひかりかがやく そのとけいは⋯⋯" cont "<PLAYER>も ついに" @@ -165,27 +165,27 @@ PlayerHouse2FTextString1: ; 4272 cont "きょうは むり だぜ！" done -PlayerHouse2FTextString2: ; 4332 +PlayerHouse2FTextString2: text "そうだ おまえの パソコンに" line "メールが とどいていたな" cont "でかけるんなら" cont "メールぐらい よんでおけよ" done -PlayerHouse2FTextString3: ; 4365 +PlayerHouse2FTextString3: text "クりスマスに カントーの" line "しんせきに プレゼント" cont "してもらった にんぎょうだ" done -PlayerHouse2FTextString4: ; 438D +PlayerHouse2FTextString4: text "ニンテンドウ６４を してる！" cont "⋯⋯ ⋯⋯ さてと！" cont "そろそろ そとに あそびに" cont "でかけるか！" done -PlayerHouse2FTextString5: ; 43BD +PlayerHouse2FTextString5: text "<PLAYER>は" line "パソコンの スイッチを いれた！" @@ -200,7 +200,7 @@ PlayerHouse2FTextString5: ; 43BD call Function3036 ret -PlayerHouse2FTextString6: ; 43FA +PlayerHouse2FTextString6: text "とつぜん メールを さしあげる" line "しつれいを おゆるしあれ" @@ -210,12 +210,12 @@ PlayerHouse2FTextString6: ; 43FA cont "ポケモンけんきゅうしゃ オーキド" done -PlayerHouse2FTextString7: ; 4456 +PlayerHouse2FTextString7: text "あとで" line "よもっと<⋯⋯>" done -PlayerHouse2FTextString8: ; 4461 (unused?) +PlayerHouse2FTextString8: ; (unused?) text "しんはつばい トレーナーギア！" line "ポケモントレーナーの ための" cont "さいせんたんの とけい です" @@ -233,7 +233,7 @@ PlayerHouse2FTextString8: ; 4461 (unused?) cont "シルフの ホームぺージだ" done -PlayerHouse2FTextString9: ; 44FE +PlayerHouse2FTextString9: text "<PLAYER>は" line "ラジオのスイッチを おした！" diff --git a/maps/Route1Gate1F.asm b/maps/Route1Gate1F.asm index dcc6f1f..9aca3ce 100644 --- a/maps/Route1Gate1F.asm +++ b/maps/Route1Gate1F.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "maps/Route1Gate1F.asm", ROMX -Route1Gate1FScriptLoader:: ;4061 +Route1Gate1FScriptLoader:: ld hl, Route1Gate1FScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -12,39 +12,39 @@ Route1Gate1FScriptPointers: dw Route1Gate1FScript ;>> routine dw Route1Gate1FNPCIDs ;>> data -Route1Gate1FNPCIDs: ; 406F +Route1Gate1FNPCIDs: db $00 db $01 db $FF -Route1Gate1FSignPointers: ; 4072 +Route1Gate1FSignPointers: dw MapDefaultText ;no signs -Route1Gate1FTextPointers:: ; 4074 +Route1Gate1FTextPointers:: dw Route1Gate1FText1 dw Route1Gate1FText2 -Route1Gate1FScript: ; 4078 +Route1Gate1FScript: ld hl, Route1Gate1FNPCIDs ld de, Route1Gate1FSignPointers call CallMapTextSubroutine ret -Route1Gate1FText1: ; 4082 +Route1Gate1FText1: ld hl, Route1Gate1FText1String call OpenTextbox ret -Route1Gate1FText2: ; 4089 +Route1Gate1FText2: ld hl, Route1Gate1FText2String call OpenTextbox ret -Route1Gate1FText1String: ; 4090 +Route1Gate1FText1String: text "このゲートを ぬけると" line "すぐに オールドシティ です" done -Route1Gate1FText2String: ; 40AC +Route1Gate1FText2String: text "オールドシティには" line "あの ゆうめいな" cont "ごじゅうのとう が あるの" diff --git a/maps/Route1Gate2F.asm b/maps/Route1Gate2F.asm index 73c827e..e6d4a20 100644 --- a/maps/Route1Gate2F.asm +++ b/maps/Route1Gate2F.asm @@ -2,55 +2,55 @@ include "constants.asm" SECTION "maps/Route1Gate2F.asm", ROMX -Route1Gate2FScriptLoader:: ; 411F +Route1Gate2FScriptLoader:: ld hl, Route1Gate2FScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -Route1Gate2FScriptPointers: ; 4129 +Route1Gate2FScriptPointers: dw Route1Gate2FScript dw Route1Gate2FNPCIDs -Route1Gate2FNPCIDs: ; 412D +Route1Gate2FNPCIDs: db 0 db 1 db $FF -Route1Gate2FSignPointers: ; 4130 +Route1Gate2FSignPointers: dw Route1Gate2FTextSign1 dw Route1Gate2FTextSign2 -Route1Gate2FTextPointers:: ; 4134 +Route1Gate2FTextPointers:: dw Route1Gate2FTextNPC1 dw Route1Gate2FTextNPC2 -Route1Gate2FScript:: ; 4138 +Route1Gate2FScript:: ld hl, Route1Gate2FNPCIDs ld de, Route1Gate2FSignPointers call CallMapTextSubroutine ret -Route1Gate2FTextNPC1: ; 4142 +Route1Gate2FTextNPC1: ld hl, Route1Gate2FTextString1 call OpenTextbox ret -Route1Gate2FTextNPC2: ; 4149 +Route1Gate2FTextNPC2: ld hl, Route1Gate2FTextString2 call OpenTextbox ret -Route1Gate2FTextSign1: ; 4150 +Route1Gate2FTextSign1: ld hl, Route1Gate2FTextString3 call OpenTextbox ret -Route1Gate2FTextSign2: ; 4157 +Route1Gate2FTextSign2: ld hl, Route1Gate2FTextString4 call OpenTextbox ret -Route1Gate2FTextString1: ; 415E +Route1Gate2FTextString1: text "ガンテツさんって しってる？" para "ガンテツさんに" @@ -58,7 +58,7 @@ Route1Gate2FTextString1: ; 415E cont "トレーナーとして たいしたもの よ" done -Route1Gate2FTextString2: ; 4197 +Route1Gate2FTextString2: text "あなた かんこうで きたの？" line "なら ざんねんね" @@ -68,7 +68,7 @@ Route1Gate2FTextString2: ; 4197 cont "ものじゃないわ" done -Route1Gate2FTextString3: ; 41D8 +Route1Gate2FTextString3: text "<PLAYER>は" line "ぼうえんきょうを のぞいた！" @@ -76,7 +76,7 @@ Route1Gate2FTextString3: ; 41D8 line "たかーい とう が みえる！" done -Route1Gate2FTextString4: ; 41FF +Route1Gate2FTextString4: text "<PLAYER>は" line "ぼうえんきょうを のぞいた！" diff --git a/maps/Route1P1.asm b/maps/Route1P1.asm index 667d7b0..04a84c5 100644 --- a/maps/Route1P1.asm +++ b/maps/Route1P1.asm @@ -5,7 +5,7 @@ SECTION "maps/Route1P1.asm", ROMX ret dw Textdbb82 -Textdbb82: ; 36:7b82 +Textdbb82: text "べんりな よのなかだね" done @@ -13,22 +13,22 @@ Textdbb82: ; 36:7b82 ret endr -Route1P1ScriptLoader:: ; 7B98 +Route1P1ScriptLoader:: ld hl, Route1P1ScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -Route1P1ScriptPointers: ; 7BA2 +Route1P1ScriptPointers: dw Route1P1Script dw Route1P1NPCIDs -Route1P1NPCIDs: ; 7BA6 +Route1P1NPCIDs: db 0 db 1 db $FF -Route1P1SignPointers: ; 7BA9 +Route1P1SignPointers: dw Route1P1TextSign1 dw Route1P1TextSign2 @@ -36,33 +36,33 @@ Route1P1TextPointers:: dw Route1P1TextNPC1 dw Route1P1TextNPC2 -Route1P1Script:: ; 7BB1 +Route1P1Script:: ld hl, Route1P1NPCIDs ld de, Route1P1SignPointers call CallMapTextSubroutine ret -Route1P1TextNPC1: ; 7BBB +Route1P1TextNPC1: ld hl, Route1P1TextString1 call OpenTextbox ret -Route1P1TextNPC2: ; 7BC2 +Route1P1TextNPC2: ld hl, Route1P1TextString2 call OpenTextbox ret -Route1P1TextSign1: ; 7BC9 +Route1P1TextSign1: ld hl, Route1P1TextString3 call OpenTextbox ret -Route1P1TextSign2: ; 7BD0 +Route1P1TextSign2: ld hl, Route1P1TextString4 call OpenTextbox ret -Route1P1TextString1: ; 7BD7 +Route1P1TextString1: text "しょうねん！" para "モンスターボールは" @@ -70,12 +70,12 @@ Route1P1TextString1: ; 7BD7 cont "つかうのが きほんだ！" done -Route1P1TextString2: ; 7C08 +Route1P1TextString2: text "ぼく ゆうがた じゅくの かえりに" line "かわった ポケモンを みたよ" done -Route1P1TextString3: ; 7C2A +Route1P1TextString3: text "このさき しずかな おか" line "やせいの ポケモンに ちゅうい" done diff --git a/maps/Route1P2.asm b/maps/Route1P2.asm index 7427c10..f60fce1 100644 --- a/maps/Route1P2.asm +++ b/maps/Route1P2.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "maps/Route1P2.asm", ROMX -Route1P2ScriptLoader:: ; 7C67 +Route1P2ScriptLoader:: ld hl, Route1P2ScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -12,7 +12,7 @@ Route1P2ScriptPointers: dw Route1P2Script dw Route1P2NPCIDs -Route1P2NPCIDs: ; 7C76 +Route1P2NPCIDs: db $00 db $01 db $FF @@ -24,7 +24,7 @@ Route1P2TextPointers:: dw Route1P2Text1 dw Route1P2Text2 -Route1P2Script:: ; 7C7F +Route1P2Script:: ld a, [wYCoord] cp $06 jr nz, .skipCheck @@ -45,13 +45,13 @@ Route1P2Script:: ; 7C7F ret .endDemo -Route1P2Text1: ; 7CA7 +Route1P2Text1: ld hl, Route1P2TextString4 call OpenTextbox call GBFadeOutToBlack jp Init -Route1P2Text2: ; 7CB3 +Route1P2Text2: ld hl, $D3A2 ; trainer flags? bit 1, [hl] jr nz, .Text2Jump ; already fought @@ -70,31 +70,31 @@ Route1P2Text2: ; 7CB3 ret .Text2Jump -Route1P2Text3: ; 7CDA +Route1P2Text3: ld hl, Route1P2TextString3 call OpenTextbox ret -Route1P2TextSign1: ; 7CE1 +Route1P2TextSign1: ld hl, Route1P2TextString5 call OpenTextbox ret -Route1P2TextString1: ; 7CE8 +Route1P2TextString1: text "まあ かわいらしい トレーナーやこと" line "うちと ポケモン しはります？" done -Route1P2TextString2: ; 7D0C (unused?) +Route1P2TextString2: ; (unused?) text "いやあ かんにんやわあ" done -Route1P2TextString3: ; 7D19 +Route1P2TextString3: text "かわいい かおして つよおすなあ" line "その ちょうしで おきばりやす" done -Route1P2TextString4: ; 7D3B +Route1P2TextString4: text "シゲル『おっ サトシじゃないか！" para "なんとか ここまで これた" @@ -111,7 +111,7 @@ Route1P2TextString4: ; 7D3B line "じゃあな" done -Route1P2TextString5: ; 7DBD +Route1P2TextString5: text "ここは １ばん どうろ" line "サイレントヒル ⋯⋯ オールドシティ" done diff --git a/maps/ShizukanaOka.asm b/maps/ShizukanaOka.asm index 0ade95c..2996c82 100644 --- a/maps/ShizukanaOka.asm +++ b/maps/ShizukanaOka.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "maps/ShizukanaOka.asm", ROMX -ShizukanaOkaScriptLoader:: ; 564B +ShizukanaOkaScriptLoader:: ld hl, ShizukanaOkaScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -12,7 +12,7 @@ ShizukanaOkaScriptPointers: dw ShizukanaOkaScript dw ShizukanaOkaNPCIDs -ShizukanaOkaNPCIDs: ; 5659 +ShizukanaOkaNPCIDs: db 0 db 1 db 2 @@ -22,29 +22,29 @@ ShizukanaOkaNPCIDs: ; 5659 db $FF ShizukanaOkaSignPointers: - dw ShizukanaOkaSignpost1 ;574b - dw ShizukanaOkaSignpost2 ;5744 - -ShizukanaOkaTextPointers: ;5664 - dw ShizukanaOkaText1 ;567a - dw ShizukanaOkaTrainer2 ;5681 - dw ShizukanaOkaTrainer3 ;56A8 - dw ShizukanaOkaTrainer4 ;56cf - dw ShizukanaOkaTrainer5 ;56f6 - dw ShizukanaOkaTrainer6 ;571d - -ShizukanaOkaScript: ;5670 + dw ShizukanaOkaSignpost1 + dw ShizukanaOkaSignpost2 + +ShizukanaOkaTextPointers: + dw ShizukanaOkaText1 + dw ShizukanaOkaTrainer2 + dw ShizukanaOkaTrainer3 + dw ShizukanaOkaTrainer4 + dw ShizukanaOkaTrainer5 + dw ShizukanaOkaTrainer6 + +ShizukanaOkaScript: ld hl, ShizukanaOkaNPCIDs ld de, ShizukanaOkaSignPointers call CallMapTextSubroutine ret -ShizukanaOkaText1: ;567a +ShizukanaOkaText1: ld hl, ShizukanaOkaText1String call OpenTextbox ret -ShizukanaOkaTrainer2: ;5681 +ShizukanaOkaTrainer2: ld hl, $D3A5 bit 1, [hl] jr nz, .Trainer2Won @@ -63,7 +63,7 @@ ShizukanaOkaTrainer2: ;5681 call OpenTextbox ret -ShizukanaOkaTrainer3: ;56A8 +ShizukanaOkaTrainer3: ld hl, wd3a5 bit 2, [hl] jr nz, .Trainer3Won @@ -82,7 +82,7 @@ ShizukanaOkaTrainer3: ;56A8 call OpenTextbox ret -ShizukanaOkaTrainer4: ;56CF +ShizukanaOkaTrainer4: ld hl, wd3a5 bit 3, [hl] jr nz, .Trainer4Won @@ -101,7 +101,7 @@ ShizukanaOkaTrainer4: ;56CF call OpenTextbox ret -ShizukanaOkaTrainer5: ;56F6 +ShizukanaOkaTrainer5: ld hl, wd3a5 bit 4, [hl] jr nz, .Trainer5Won @@ -120,7 +120,7 @@ ShizukanaOkaTrainer5: ;56F6 call OpenTextbox ret -ShizukanaOkaTrainer6: ;571D +ShizukanaOkaTrainer6: ld hl, wd3a5 bit 5, [hl] jr nz, .Trainer6Won @@ -139,17 +139,17 @@ ShizukanaOkaTrainer6: ;571D call OpenTextbox ret -ShizukanaOkaSignpost2: ;5744 +ShizukanaOkaSignpost2: ld hl, ShizukanaOkaSignpost2String call OpenTextbox ret -ShizukanaOkaSignpost1: ;574b +ShizukanaOkaSignpost1: ld hl, ShizukanaOkaSignpost1String call OpenTextbox ret -ShizukanaOkaTrainer6EncounterString: ; 2f:5752 +ShizukanaOkaTrainer6EncounterString: text "ねえ ねえ みてよ" para "これ ぜったい" line "しんしゅの ポケモン だよ！" @@ -159,13 +159,13 @@ ShizukanaOkaTrainer6EncounterString: ; 2f:5752 line "わかってないから しかたないよ" done -ShizukanaOkaTrainer6WonString: ; 2f:5794 +ShizukanaOkaTrainer6WonString: text "あたらしい ポケモンだけでなく" line "あたらしい タイプも" cont "みつかったって うわさだよ" done -ShizukanaOkaTrainer5EncounterString: ; 2f:57be +ShizukanaOkaTrainer5EncounterString: text "いい てんきねー" line "あなた ちょうしは いかが？" done @@ -174,11 +174,11 @@ ShizukanaOkaTrainer5EncounterString: ; 2f:57be line "⋯⋯なにいってるのかしら あたし" done -ShizukanaOkaTrainer5WonString: ; 2f:57f1 +ShizukanaOkaTrainer5WonString: text "なんで こうなるの？" line "さんぽしてた だけなのに@@" -ShizukanaOkaTrainer4EncounterString: ; 2f:580b +ShizukanaOkaTrainer4EncounterString: text "こんなところで" line "ひを ふく れんしゅう！" done @@ -186,14 +186,14 @@ ShizukanaOkaTrainer4EncounterString: ; 2f:580b text "あちち しっぱいだー" done -ShizukanaOkaTrainer4WonString: ; 2f:582d +ShizukanaOkaTrainer4WonString: text "よるになると くらくなるから" line "こどもは はやく かえりなさい！" para "おれ？" line "おれは ひをふくから だいじょうぶ" done -ShizukanaOkaTrainer3EncounterString: ; 2f:5864 +ShizukanaOkaTrainer3EncounterString: text "むしポケモンの ことなら" line "だれよりも くわしいよ" done @@ -201,14 +201,14 @@ ShizukanaOkaTrainer3EncounterString: ; 2f:5864 text "パラパラー" done -ShizukanaOkaTrainer3WonString: ; 2f:5885 +ShizukanaOkaTrainer3WonString: text "ポケモンずかんを つくるんだって？" line "ちょっと みせてよ" para "へー" line "タイプべつに ポケモン さがせるんだ" done -ShizukanaOkaTrainer2EncounterString: ; 2f:58b8 +ShizukanaOkaTrainer2EncounterString: text "いっとくけど" line "きみよりも べんきょう してるから" cont "きみよりも つよいよ ぜったい！" @@ -217,13 +217,13 @@ ShizukanaOkaTrainer2EncounterString: ; 2f:58b8 text "な なぜなんだ？" done -ShizukanaOkaTrainer2WonString: ; 2f:58ed +ShizukanaOkaTrainer2WonString: text "おかしいよ⋯⋯" line "まいにち ポケモンの べんきょうを" cont "きちんと してるのに まけるなんて" done -ShizukanaOkaText1String: ; 2f:591a +ShizukanaOkaText1String: text "この おかの ポケモンは よわい！" line "だから ここで しゅぎょう している" cont "トレーナーも おおいよ" @@ -231,12 +231,12 @@ ShizukanaOkaText1String: ; 2f:591a line "うでだめしを するといい" done -ShizukanaOkaSignpost2String: ; 2f:5968 +ShizukanaOkaSignpost2String: text "しずかな おか" line "サイレントヒル は こちら" done -ShizukanaOkaSignpost1String: ; 2f:597f +ShizukanaOkaSignpost1String: text "しずかな おか" line "オールドシティ は こちら" done diff --git a/maps/SilentHill.asm b/maps/SilentHill.asm index 3cefcc1..804bd4b 100644 --- a/maps/SilentHill.asm +++ b/maps/SilentHill.asm @@ -2,58 +2,58 @@ include "constants.asm" SECTION "maps/SilentHill.asm", ROMX -SilentHillScriptLoader:: ; 7669 +SilentHillScriptLoader:: ld hl, SilentHillScriptPointers1 call RunMapScript call WriteBackMapScriptNumber ret -SilentHillNPCIDs1: ; 7673 +SilentHillNPCIDs1: db 0 db 2 db 3 db $FF -SilentHillNPCIDs2: ; 7677 +SilentHillNPCIDs2: db 2 db 3 db $FF -SilentHillNPCIDs3: ; 767A +SilentHillNPCIDs3: db 1 db 2 db 3 db $FF -SilentHillScriptPointers1: ; 767E +SilentHillScriptPointers1: dw SilentHillScript1 dw SilentHillNPCIDs1 -SilentHillScriptPointers2: ; 7682 +SilentHillScriptPointers2: dw SilentHillScript2 dw SilentHillNPCIDs1 -SilentHillScriptPointers3: ; 7686 +SilentHillScriptPointers3: dw SilentHillScript3 dw SilentHillNPCIDs1 -SilentHillScriptPointers4: ; 768A +SilentHillScriptPointers4: dw SilentHillScript4 dw SilentHillNPCIDs2 -SilentHillScriptPointers5: ; 768E +SilentHillScriptPointers5: dw SilentHillScript5 dw SilentHillNPCIDs3 -SilentHillScriptPointers6: ; 7692 +SilentHillScriptPointers6: dw SilentHillScript6 dw SilentHillNPCIDs2 -SilentHillScriptPointers7: ; 7696 +SilentHillScriptPointers7: dw SilentHillScript7 dw SilentHillNPCIDs2 -SilentHillScript1: ; 769A +SilentHillScript1: ld a, [wYCoord] cp 5 ret nz @@ -75,7 +75,7 @@ SilentHillScript1: ; 769A call WriteIntod637 ret -SilentHillMovement1: ; 76C8 +SilentHillMovement1: db $0D db $0D db $0D @@ -84,7 +84,7 @@ SilentHillMovement1: ; 76C8 db $02 db $32 -SilentHillScript2: ; 76CF +SilentHillScript2: ld a, 0 ld d, RIGHT call SetObjectFacing @@ -105,17 +105,17 @@ SilentHillScript2: ; 76CF ld [wMapScriptNumber], a ret -SilentHillMovement2: ; 76FF +SilentHillMovement2: db $00, $04, $08, $0C, $0C, $0C, $33 -SilentHillScript3: ;7706 +SilentHillScript3: call Function1848 ld a, 3 ld [wMapScriptNumber], a call InitUnknownBuffercc9e ret -SilentHillScript4: ; 7712 +SilentHillScript4: ld a, [wXCoord] cp 0 jr nz, .bigjump @@ -158,7 +158,7 @@ SilentHillScript4: ; 7712 call CallMapTextSubroutine ret -Function776a: ; 776A +Function776a: ld hl, wd41a set 7, [hl] ld a, 1 @@ -166,13 +166,13 @@ Function776a: ; 776A ld [hl], a ret -SilentHillMovement3: ; 7776 +SilentHillMovement3: db $0A, $0A, $0A, $09, $0A, $06, $02, $32 -SilentHillMovement4: ; 777E +SilentHillMovement4: db $0A, $0A, $0A, $0A, $06, $02, $32 -SilentHillScript5: ; 7785 +SilentHillScript5: ld a, 0 ld d, RIGHT call SetObjectFacing @@ -205,13 +205,13 @@ SilentHillScript5: ; 7785 ld [wMapScriptNumber], a ret -SilentHillMovement5: ; 77CC +SilentHillMovement5: db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33 -SilentHillMovement6: ; 77E0 +SilentHillMovement6: db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33 -SilentHillScript6: ; 77F3 +SilentHillScript6: ld hl, SilentHillNPCIDs2 ld de, SilentHillSignPointers call CallMapTextSubroutine @@ -224,7 +224,7 @@ SilentHillScript6: ; 77F3 ld [wMapScriptNumber], a ret -SilentHillScript7: ; 780D +SilentHillScript7: call CheckLabDoor ret z ld hl, SilentHillNPCIDs2 @@ -232,7 +232,7 @@ SilentHillScript7: ; 780D call CallMapTextSubroutine ret -CheckLabDoor: ; 781B +CheckLabDoor: ld a, [wYCoord] cp $C ret nz @@ -257,7 +257,7 @@ CheckLabDoor: ; 781B call ClearAccumulator ret -LabClosed: ; 784C +LabClosed: ld a, 0 ld hl, SilentHillMovement7 call LoadMovementDataPointer @@ -267,64 +267,64 @@ LabClosed: ; 784C call WriteIntod637 ret -SilentHillTextString1: ; 785F +SilentHillTextString1: text "あれ？ カギが かかっている" done -SilentHillMovement7: ; 786F +SilentHillMovement7: db $04, $32 -SilentHillSignPointers:: ; 7871 +SilentHillSignPointers:: dw SilentHillPlayerHouseText dw Function38c6 dw SilentHillSignText1 dw SilentHillLabText dw SilentHillRivalHouseText -SilentHillLabText: ; 787B +SilentHillLabText: ld hl, SilentHillTextString2 call OpenTextbox ret -SilentHillTextString2: ; 7882 +SilentHillTextString2: text "にゅうきょしゃ ぼしゅうちゅう！" done -SilentHillSignText1: ; 7894 +SilentHillSignText1: ld hl, SilentHillTextString3 call OpenTextbox ret -SilentHillTextString3: ; 789B +SilentHillTextString3: text "ここは サイレント ヒル" line "しずかな おか" done -SilentHillPlayerHouseText: ; 78B1 +SilentHillPlayerHouseText: ld hl, SilentHillTextString4 call OpenTextbox ret -SilentHillTextString4: ; 78B8 +SilentHillTextString4: text "ここは <PLAYER> のいえ" done -SilentHillRivalHouseText: ; 78C3 +SilentHillRivalHouseText: ld hl, SilentHillTextString5 call OpenTextbox ret -SilentHillTextString5: ; 78CA +SilentHillTextString5: text "ここは <RIVAL> のいえ" done -SilentHillTextPointers:: ; 78d5 +SilentHillTextPointers:: dw SilentHillTextRival1 ; west dw SilentHillTextNorthExit ; north dw SilentHillTextBackpack ; npc1 dw SilentHillTextPokemonHate ; npc2 -SilentHillTextRival1: ; 78DD +SilentHillTextRival1: text "<RIVAL>『よう ちょっと おまえに" cont "じまん したいことが" cont "あってきたんだよ" @@ -341,7 +341,7 @@ SilentHillTextRival1: ; 78DD db $08 -LoadMomNamePromptUnused: ; 796F +LoadMomNamePromptUnused: call LoadStandardMenuHeader callab MomNamePrompt call CloseWindow @@ -350,13 +350,13 @@ LoadMomNamePromptUnused: ; 796F call UpdateTimePals jp Function3036 -MomNameMenuHeaderUnused: ; 7989 +MomNameMenuHeaderUnused: db MENU_BACKUP_TILES ; flags menu_coords 00, 00, 10, 11 dw .MomNameMenuDataUnused db 01 ; initial selection -.MomNameMenuDataUnused: ; 7991 +.MomNameMenuDataUnused: db STATICMENU_CURSOR db 04 ; items db "じぶんで きめる@" @@ -364,7 +364,7 @@ MomNameMenuHeaderUnused: ; 7989 db "ママ@" db "かあちゃん@" -SilentHillTextRival2: ; 79AC - BYTE OFF +SilentHillTextRival2: ; BYTE OFF text "<RIVAL>『えー かっこわりい！" line "そんな こどもっぽい" cont "よびかた してるなんて" @@ -377,12 +377,12 @@ SilentHillTextRival2: ; 79AC - BYTE OFF cont "いくことに するぜ！" done -SilentHillTextNorthExit: ; 7A14 +SilentHillTextNorthExit: text "ちょいまち！" line "まってよ！ まてっ てば！" done -SilentHillTextPokemonInGrassString: ; 7A2A +SilentHillTextPokemonInGrassString: text "きみは まったく" line "なんにも しらないんだね！" cont "くさむらでは" @@ -397,22 +397,22 @@ SilentHillTextPokemonInGrassString: ; 7A2A cont "ぼくに ついて きて！" done -SilentHillTextBackpack: ; 7A99 +SilentHillTextBackpack: ld hl, SilentHillTextBackpackString call OpenTextbox ret -SilentHillTextBackpackString: ; 7AA0 +SilentHillTextBackpackString: text "あなたの りュック かっこいいわよ" line "どこで てに いれたの？" done -SilentHillTextPokemonHate: ; 7AC0 +SilentHillTextPokemonHate: ld hl, SilentHillTextPokemonHateString call OpenTextbox ret -SilentHillTextPokemonHateString: ; 7AC7 +SilentHillTextPokemonHateString: text "よのなかに ポケモンが きらいな" line "ひとは いるのかな？" done diff --git a/maps/SilentHillHouse.asm b/maps/SilentHillHouse.asm index 7df6b18..fafdf3b 100644 --- a/maps/SilentHillHouse.asm +++ b/maps/SilentHillHouse.asm @@ -2,13 +2,13 @@ include "constants.asm" SECTION "maps/SilentHillHouse.asm", ROMX -SilentHillHouseScriptLoader:: ; 4839 +SilentHillHouseScriptLoader:: ld hl, SilentHillHouseScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -SilentHillHouseScriptPointers: ; 4843 +SilentHillHouseScriptPointers: dw SilentHillHouseScript1 dw SilentHillHouseNPCIDs1 dw SilentHillHouseScript2 @@ -16,19 +16,19 @@ SilentHillHouseScriptPointers: ; 4843 dw SilentHillHouseScript3 dw SilentHillHouseNPCIDs1 -SilentHillHouseScript1: ; 484F +SilentHillHouseScript1: ld hl, SilentHillHouseNPCIDs1 ld de, SilentHillHouseTextPointers2 call CallMapTextSubroutine ret -SilentHillHouseScript2: ; 4859 +SilentHillHouseScript2: ld hl, SilentHillHouseNPCIDs2 ld de, SilentHillHouseTextPointers2 call CallMapTextSubroutine ret -SilentHillHouseScript3: ; 4863 +SilentHillHouseScript3: ld hl, SilentHillHouseNPCIDs1 ld de, SilentHillHouseTextPointers2 call CallMapTextSubroutine @@ -43,7 +43,7 @@ SilentHillHouseNPCIDs2: db 1 db $FF -SilentHillHouseTextPointers2:: ; 4872 +SilentHillHouseTextPointers2:: dw SilentHillHouseNPCText1 dw Function38bd dw Function3899 @@ -51,7 +51,7 @@ SilentHillHouseTextPointers2:: ; 4872 dw Function38ab dw Function38cf -SilentHillHouseNPCText1: ; 487E +SilentHillHouseNPCText1: ld hl, wd41a bit 6, [hl] jr nz, .jump @@ -66,13 +66,13 @@ SilentHillHouseNPCText1: ; 487E call Function1fea ret -SilentHillHouseTextString1: ; 489B +SilentHillHouseTextString1: text "おや？ <RIVAL>あてに メールが" line "とどいている ようだ" cont "よんでみる？@" db $08 -SilentHillHouseNPCText2: ; 48BD (unused due to typo in the text pointers?) +SilentHillHouseNPCText2: ; (unused due to typo in the text pointers?) call YesNoBox jr c, .jump ld hl, wd41a @@ -87,7 +87,7 @@ SilentHillHouseNPCText2: ; 48BD (unused due to typo in the text pointers?) call Function3036 ret -SilentHillHouseTextString2: ; 48DB +SilentHillHouseTextString2: text "とつぜん メールを さしあげる" line "しつれいを おゆるしあれ" @@ -97,26 +97,26 @@ SilentHillHouseTextString2: ; 48DB cont "ポケモンけんきゅうしゃ オーキド" done -SilentHillHouseTextString3: ; 4937 +SilentHillHouseTextString3: text "ひとのメールは" line "みちゃ いけないよな<⋯⋯>" done -SilentHillHouseTextPointers:: ; 494C +SilentHillHouseTextPointers:: dw SilentHillHouseNPCText3 dw SilentHillHouseNPCText4 -SilentHillHouseNPCText3: ; 4950 +SilentHillHouseNPCText3: ld hl, SilentHillHouseTextString4 call OpenTextbox ret -SilentHillHouseTextString4: ; 4957 +SilentHillHouseTextString4: text "このまえ かわったいろの" line "ポッポを みかけたわ" done -SilentHillHouseNPCText4: ; 4970 +SilentHillHouseNPCText4: ld hl, wd41e bit 2, [hl] jr nz, .jump @@ -133,7 +133,7 @@ SilentHillHouseNPCText4: ; 4970 call OpenTextbox ret -SilentHillHouseTextString5: ; 4991 +SilentHillHouseTextString5: text "ケン『ななな" line "なんだ <PLAYER> じゃないか！" @@ -151,7 +151,7 @@ SilentHillHouseTextString5: ; 4991 cont "よし これで マップが みれるぞ！" done -SilentHillHouseTextString6: ; 4A29 +SilentHillHouseTextString6: text "もし オールドにいくなら" line "マサキって やつに あうといい" @@ -161,7 +161,7 @@ SilentHillHouseTextString6: ; 4A29 cont "てだすけを してくれるぜ" done -SilentHillHouseTextString7: ; 4A76 +SilentHillHouseTextString7: text "ケン『<PLAYER>" line "オーキドはかせに みこまれて" cont "ポケモンずかんを つくるんだって？" diff --git a/maps/SilentHillLabBack.asm b/maps/SilentHillLabBack.asm index b23c816..cd28b02 100644 --- a/maps/SilentHillLabBack.asm +++ b/maps/SilentHillLabBack.asm @@ -2,13 +2,13 @@ include "constants.asm" SECTION "maps/SilentHillLabBack.asm", ROMX -SilentHillLabBackScriptLoader:: ; 5C69 +SilentHillLabBackScriptLoader:: ld hl, SilentHillLabBackScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -SilentHillLabBackScriptPointers: ; 5C73 +SilentHillLabBackScriptPointers: dw SilentHillLabBackScript1 dw SilentHillLabBackNPCIDs1 dw SilentHillLabBackScript2 @@ -24,23 +24,23 @@ SilentHillLabBackScriptPointers: ; 5C73 dw SilentHillLabBackScript7 dw SilentHillLabBackNPCIDs1 -SilentHillLabBackNPCIDs1: ; 5C8F +SilentHillLabBackNPCIDs1: db 00, 01, 02, 03, 04, $FF -SilentHillLabBackNPCIDs2: ; 5C95 +SilentHillLabBackNPCIDs2: db 00, 01, 04, $FF -SilentHillLabBackNPCIDs3: ; 5C99 +SilentHillLabBackNPCIDs3: db 00, 01, 02, $FF -SilentHillLabBackNPCIDs4: ; 5C9D +SilentHillLabBackNPCIDs4: db 00, 01, 03, $FF -SilentHillLabBackTextPointers:: ; 5CA1 +SilentHillLabBackTextPointers:: dw SilentHillLabBackText1 dw SilentHillLabBackFunc3 dw SilentHillLabBackFunc4 dw SilentHillLabBackFunc4 dw SilentHillLabBackFunc4 -SilentHillLabBackScript1: ; 5CAB +SilentHillLabBackScript1: ld hl, wJoypadFlags set 4, [hl] ld a, 0 @@ -58,10 +58,10 @@ SilentHillLabBackScript1: ; 5CAB call WriteIntod637 ret -SilentHillLabBackMovement1: ; 5CD2 +SilentHillLabBackMovement1: db 09, 09, 05, $32 -SilentHillLabBackScript2: ; 5CD6 +SilentHillLabBackScript2: ld hl, wc5ed set 6, [hl] call Function20f8 @@ -78,13 +78,13 @@ SilentHillLabBackScript2: ; 5CD6 ld [wMapScriptNumber], a ret -SilentHillLabBackScript3: ; 5CFD +SilentHillLabBackScript3: ld hl, SilentHillLabBackNPCIDs1 ld de, SilentHillLabBackTextPointers2 call CallMapTextSubroutine ret -SilentHillLabBackRivalChoosePokemon: ; 5D07 +SilentHillLabBackRivalChoosePokemon: ld hl, wJoypadFlags set 4, [hl] ld a, 3 @@ -108,15 +108,15 @@ SilentHillLabBackRivalChoosePokemon: ; 5D07 call WriteIntod637 ret -SilentHillLabBackMovementPointers: ; 5D34 +SilentHillLabBackMovementPointers: dw SilentHillLabBackMovement2+1 dw SilentHillLabBackMovement2 dw SilentHillLabBackMovement2+2 -SilentHillLabBackMovement2: ; 5D3A +SilentHillLabBackMovement2: db $0B, $0B, $0B, $0B, $05, $32 -SilentHillLabBackScript5: ; 5D40 +SilentHillLabBackScript5: ld hl, SilentHillLabBackTextString12 call OpenTextbox ld a, [wd266] @@ -128,7 +128,7 @@ SilentHillLabBackScript5: ; 5D40 ld [wMapScriptNumber], a ret -SilentHillLabBackScript6: ; 5D5B +SilentHillLabBackScript6: call Function20f8 ld hl, wc5ed res 6, [hl] @@ -136,13 +136,13 @@ SilentHillLabBackScript6: ; 5D5B ld[wMapScriptNumber], a ret -SilentHillLabBackScript7: ; 5D69 +SilentHillLabBackScript7: ld hl, SilentHillLabBackNPCIDs1 ld de, SilentHillLabBackTextPointers2 call CallMapTextSubroutine ret -SilentHillLabBackText1: ; 5D73 +SilentHillLabBackText1: ld hl, wd41b bit 2, [hl] ld hl, SilentHillLabBackTextString3 @@ -152,7 +152,7 @@ SilentHillLabBackText1: ; 5D73 call OpenTextbox ret -SilentHillLabBackTextString1: ; 5D84 +SilentHillLabBackTextString1: text "オーキド『ほれ そこに ３びき" cont "ポケモンが いる じゃろう！" cont "ほっほ！" @@ -162,18 +162,18 @@ SilentHillLabBackTextString1: ; 5D84 cont "⋯⋯ さあ えらべ！" done -SilentHillLabBackTextString2: ; 5DCD +SilentHillLabBackTextString2: text "オーキド『まあ" line "あわてるな <RIVAL>！" cont "おまえも すきなものを とれ！" done -SilentHillLabBackTextString3: ; 5DEF +SilentHillLabBackTextString3: text "オーキド『さあ <PLAYER>" line "どの ポケモンに するかね？" done -SilentHillLabBackTextString4: ; 5E1C +SilentHillLabBackTextString4: text "オーキド『ほう！ ほのおのポケモン" line "@" ld bc, wStringBuffer1 @@ -183,7 +183,7 @@ SilentHillLabBackTextString4: ; 5E1C call Function3036 ret -SilentHillLabBackTextString5: ; 5E32 +SilentHillLabBackTextString5: text "オーキド『ふむ みずのポケモン" line "@" ld bc, wStringBuffer1 @@ -193,7 +193,7 @@ SilentHillLabBackTextString5: ; 5E32 call Function3036 ret -SilentHillLabBackTextString6: ; 5E6E +SilentHillLabBackTextString6: text "オーキド『おお！ くさのポケモン" line "@" ld bc, wStringBuffer1 @@ -203,7 +203,7 @@ SilentHillLabBackTextString6: ; 5E6E call Function3036 ret -ConfirmPokemonSelection: ; 5E85 +ConfirmPokemonSelection: call YesNoBox jr c, .bigJump ld hl, wd41b @@ -228,17 +228,17 @@ ConfirmPokemonSelection: ; 5E85 ld a, 3 ld [wMapScriptNumber], a ret -.bigJump ; 5EC6 +.bigJump ld hl, SilentHillLabBackTextString7 call PrintText ret -SilentHillLabBackTextString7: ; 5ECD +SilentHillLabBackTextString7: text "では" line "どれに するのじゃ？" done -SilentHillLabBackTextString8: ; 5EDC +SilentHillLabBackTextString8: text "オーキド『この ポケモンは" line "ほんとに げんきが いいぞ！" @@ -247,14 +247,14 @@ SilentHillLabBackTextString8: ; 5EDC ld bc, wStringBuffer1 text "を もらった！<PROMPT>" -SilentHillLabBackTextString9: ; 5F14 +SilentHillLabBackTextString9: text "オーキド『そうじゃ！" line "やせいの ポケモンが でて きても" cont "そいつを たたかわせて いけば" cont "となりまちへ いける！" done -SilentHillLabBackFunc3: ; 5F4E +SilentHillLabBackFunc3: ld hl, wd41b bit 2, [hl] ld hl, SilentHillLabBackTextString11 @@ -264,36 +264,36 @@ SilentHillLabBackFunc3: ; 5F4E call OpenTextbox ret -SilentHillLabBackTextString10: ; 5F5F +SilentHillLabBackTextString10: text "<RIVAL>『あッ！ おれにも！" line "じいさん おれにもくれよう！" done -SilentHillLabBackTextString11: ; 5F7B +SilentHillLabBackTextString11: text "<RIVAL>『いいぜ <PLAYER>！" line "さきに えらんで！" cont "おれは こころが ひろいからな" done -SilentHillLabBackTextString12: ; 5F9F +SilentHillLabBackTextString12: text "<RIVAL>『じゃ おれは これ！" done -SilentHillLabBackTextString13: ; 5FAD +SilentHillLabBackTextString13: text "<RIVAL>は オーキドから" line "@" ld bc, wStringBuffer1 text "を もらった！" done -SilentHillLabBackTextString14: ; 5FC5 +SilentHillLabBackTextString14: text "<RIVAL>『<PLAYER>の#" line "いいなあ！" cont "でも おれのポケモンも" cont "ちょっと いいだろ？" done -SilentHillLabBackFunc4: ; 5FE9 +SilentHillLabBackFunc4: ld hl, wd41b bit 2, [hl] jr nz, .bigjump @@ -332,7 +332,7 @@ SilentHillLabBackFunc4: ; 5FE9 call OpenTextbox ret -SilentHillLabBackStarterData: ; 6031 +SilentHillLabBackStarterData: db DEX_HONOGUMA dw SilentHillLabBackTextString4 db DEX_KURUSU @@ -345,12 +345,12 @@ SilentHillLabBackStarterData: ; 6031 dw SilentHillLabBackTextString6 db DEX_HONOGUMA -SilentHillLabBackTextString15: ; 603D +SilentHillLabBackTextString15: text "オーキド『これ！" line "よくばっちゃ いかん！" done -SilentHillLabBackTextPointers2: ; 6053 +SilentHillLabBackTextPointers2: dw Function3899 dw Function3899 dw Function3899 diff --git a/maps/SilentHillLabFront.asm b/maps/SilentHillLabFront.asm index 6c0f84f..6b17838 100644 --- a/maps/SilentHillLabFront.asm +++ b/maps/SilentHillLabFront.asm @@ -2,13 +2,13 @@ include "constants.asm" SECTION "maps/SilentHillLabFront.asm", ROMX -SilentHillLabFrontScriptLoader:: ; 4BBC +SilentHillLabFrontScriptLoader:: ld hl, SilentHillLabFrontScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -SilentHillLabFrontScriptPointers: ; 4BC6 +SilentHillLabFrontScriptPointers: dw SilentHillLabFrontScript1 dw SilentHillLabFrontNPCIDs1 @@ -66,30 +66,30 @@ SilentHillLabFrontScriptPointers: ; 4BC6 dw SilentHillLabFrontScript19 dw SilentHillLabFrontNPCIDs9 -SilentHillLabFrontNPCIDs1: ; 4C12 +SilentHillLabFrontNPCIDs1: db $02 db $09 db $0A db $FF -SilentHillLabFrontNPCIDs2: ; 4C16 +SilentHillLabFrontNPCIDs2: db $00 db $02 db $04 db $09 db $0A db $FF -SilentHillLabFrontNPCIDs3: ; 4C1C +SilentHillLabFrontNPCIDs3: db $02 db $04 db $09 db $0A db $FF -SilentHillLabFrontNPCIDs4: ; 4C21 +SilentHillLabFrontNPCIDs4: db $04 db $09 db $0A db $FF -SilentHillLabFrontNPCIDs5: ; 4C25 +SilentHillLabFrontNPCIDs5: db $01 db $03 db $05 @@ -99,7 +99,7 @@ SilentHillLabFrontNPCIDs5: ; 4C25 db $09 db $0A db $FF -SilentHillLabFrontNPCIDs6: ; 4C2E +SilentHillLabFrontNPCIDs6: db $01 db $03 db $05 @@ -107,14 +107,14 @@ SilentHillLabFrontNPCIDs6: ; 4C2E db $07 db $08 db $FF -SilentHillLabFrontNPCIDs7: ; 4C35 +SilentHillLabFrontNPCIDs7: db $00 db $05 db $06 db $07 db $08 db $FF -SilentHillLabFrontNPCIDs8: ; 4C3B (unused?) +SilentHillLabFrontNPCIDs8: ; (unused?) db $00 db $03 db $05 @@ -124,13 +124,13 @@ SilentHillLabFrontNPCIDs8: ; 4C3B (unused?) db $09 db $0A db $FF -SilentHillLabFrontNPCIDs9: ; 4C44 +SilentHillLabFrontNPCIDs9: db $00 db $07 db $08 db $FF -SilentHillLabFrontTextPointers:: ; 4C48 +SilentHillLabFrontTextPointers:: dw SilentHillLabFrontText4 dw SilentHillLabFrontText7 dw SilentHillLabFrontText10 @@ -143,7 +143,7 @@ SilentHillLabFrontTextPointers:: ; 4C48 dw SilentHillLabFrontText16 dw SilentHillLabFrontText16 -SilentHillLabFrontScript1: ; 4C5E +SilentHillLabFrontScript1: call SilentHillLabFrontMoveDown ret z ld hl, SilentHillLabFrontNPCIDs1 @@ -151,7 +151,7 @@ SilentHillLabFrontScript1: ; 4C5E call CallMapTextSubroutine ret -SilentHillLabFrontMoveDown: ; 4C6C +SilentHillLabFrontMoveDown: ld a, [wXCoord] cp 4 ret nz @@ -176,15 +176,15 @@ SilentHillLabFrontMoveDown: ; 4C6C call ClearAccumulator ret -SilentHillLabFrontMovement1: ; 4CA2 +SilentHillLabFrontMovement1: db $06, $32 -SilentHillLabFrontScript2: ; 4CA4 +SilentHillLabFrontScript2: ld a, 2 ld [wMapScriptNumber], a ret -SilentHillLabFrontScript3: ; 4CAA +SilentHillLabFrontScript3: ld a, 6 call Function17f9 ld a, 0 @@ -203,16 +203,16 @@ SilentHillLabFrontScript3: ; 4CAA call WriteIntod637 ret -SilentHillLabFrontMovement2: ; 4CD3 +SilentHillLabFrontMovement2: db 09, 09, 09, 09, 09, 09, 09, 09, 09, 05, 07, 01, $32 -SilentHillLabFrontScript4: ; 4CE0 +SilentHillLabFrontScript4: call Function1828 ld a, 4 ld [wMapScriptNumber], a ret -SilentHillLabFrontConversation1: ; 4CE9 +SilentHillLabFrontConversation1: ld a, 4 ld d, RIGHT call SetObjectFacing @@ -237,7 +237,7 @@ SilentHillLabFrontConversation1: ; 4CE9 call SilentHillLabFrontScript5 ret -SilentHillLabFrontScript5: ; 4D26 +SilentHillLabFrontScript5: ld hl, wJoypadFlags set 4, [hl] ld a, 2 @@ -253,10 +253,10 @@ SilentHillLabFrontScript5: ; 4D26 call WriteIntod637 ret -SilentHillLabFrontMovement3: ; 4D48 +SilentHillLabFrontMovement3: db 9, 5, $33 -SilentHillLabFrontScript6: ; 4D4B +SilentHillLabFrontScript6: ld hl, wJoypadFlags set 4, [hl] ld a, 4 @@ -272,10 +272,10 @@ SilentHillLabFrontScript6: ; 4D4B call WriteIntod637 ret -SilentHillLabFrontMovement4: ; 4D6D +SilentHillLabFrontMovement4: db $0D, $0D, $0F, $0D, $0D, $33 -SilentHillLabFrontScript7: ; 4D73 +SilentHillLabFrontScript7: ld hl, wJoypadFlags set 4, [hl] ld a, 0 @@ -291,10 +291,10 @@ SilentHillLabFrontScript7: ; 4D73 call WriteIntod637 ret -SilentHillLabFrontMovement5: ; 4D95 +SilentHillLabFrontMovement5: db 09, 09, 09, 05, $32 -SilentHillLabFrontScript8: ; 4D9A +SilentHillLabFrontScript8: ld a, 3 call Function1989 ld a, 5 @@ -314,10 +314,10 @@ SilentHillLabFrontScript8: ; 4D9A call WriteIntod637 ret -SilentHillLabFrontMovement6: ; 4DC6 +SilentHillLabFrontMovement6: db 8, 8, 8, $0A, 6, $32 -SilentHillLabFrontScript9: ; 4DCC +SilentHillLabFrontScript9: ld hl, wJoypadFlags set 4, [hl] ld a, 5 @@ -335,10 +335,10 @@ SilentHillLabFrontScript9: ; 4DCC call WriteIntod637 ret -SilentHillLabFrontMovement7: ; 4DF3 +SilentHillLabFrontMovement7: db $08, $08, $08, $08, $0A, $06, $32 -SilentHillLabFrontScript10: ; 4DFA +SilentHillLabFrontScript10: ld a, 5 ld d, RIGHT call SetObjectFacing @@ -367,10 +367,10 @@ SilentHillLabFrontScript10: ; 4DFA call WriteIntod637 ret -SilentHillLabFrontMovement8: ; 4E3C +SilentHillLabFrontMovement8: db $08, $04, $32 -SilentHillLabFrontScript11: ; 4E3F +SilentHillLabFrontScript11: ld hl, SilentHillLabFrontTextString8 call OpenTextbox ld hl, SilentHillLabFrontTextString9 @@ -391,7 +391,7 @@ SilentHillLabFrontScript11: ; 4E3F call InitUnknownBuffercc9e ret -SilentHillLabFrontScript12: ; 4E72 +SilentHillLabFrontScript12: call SilentHillLabFrontMoveDown ret z call SilentHillLabFrontRivalMovePokemon @@ -401,7 +401,7 @@ SilentHillLabFrontScript12: ; 4E72 call CallMapTextSubroutine ret -SilentHillLabFrontRivalMovePokemon: ; 4E84 +SilentHillLabFrontRivalMovePokemon: ld a, [wYCoord] cp 8 ret nz @@ -430,13 +430,13 @@ SilentHillLabFrontRivalMovePokemon: ; 4E84 call ClearAccumulator ret -SilentHillLabFrontMovement9: ; 4EDE +SilentHillLabFrontMovement9: db $08, $0B, $0B, $08, $08, $04, $32 -SilentHillLabFrontMovement10: ; 4EC5 +SilentHillLabFrontMovement10: db $08, $0B, $08, $08, $04, $32 -SilentHillLabFrontScript13: ; 4ECB +SilentHillLabFrontScript13: ld hl, SilentHillLabFrontTextString17 call OpenTextbox call GetLabPokemon @@ -449,7 +449,7 @@ SilentHillLabFrontScript13: ; 4ECB call InitUnknownBuffercc9e ret -GetLabPokemon: ; 4EE7 +GetLabPokemon: ld hl, LabPokemon ld a, [wd266] ld b, a @@ -466,7 +466,7 @@ GetLabPokemon: ; 4EE7 inc hl jr .loop -LabPokemon: ; 4EFF +LabPokemon: db DEX_KURUSU db 1 db DEX_HAPPA @@ -474,7 +474,7 @@ LabPokemon: ; 4EFF db DEX_HONOGUMA db 3 -SilentHillLabFrontScript14: ; 4F05 +SilentHillLabFrontScript14: ld hl, SilentHillLabFrontTextString19 ld a, [wcd5d] and a @@ -497,17 +497,17 @@ SilentHillLabFrontScript14: ; 4F05 call WriteIntod637 ret -SilentHillLabFrontMovement11: ; 4F36 +SilentHillLabFrontMovement11: db $04, $08, $08, $08, $33 -SilentHillLabFrontScript15: ; 4F3B +SilentHillLabFrontScript15: call Function20f8 ld a, $0F ld [wMapScriptNumber], a call InitUnknownBuffercc9e ret -SilentHillLabFrontScript16: ; 4F47 +SilentHillLabFrontScript16: call SilentHillLabFrontMoveDown ret z call SilentHillLabFrontMoveRivalLeave @@ -517,7 +517,7 @@ SilentHillLabFrontScript16: ; 4F47 call CallMapTextSubroutine ret -SilentHillLabFrontMoveRivalLeave: ; 4F59 +SilentHillLabFrontMoveRivalLeave: ld a, [wYCoord] cp $0B ret nz @@ -549,7 +549,7 @@ SilentHillLabFrontMoveRivalLeave: ; 4F59 Movememt12:; 4F93 db $07, $07, $07, $05, $32 -SilentHillLabFrontScript17: ; 4F98 +SilentHillLabFrontScript17: ld hl, SilentHillLabFrontTextString23 call OpenTextbox ld hl, wd41d @@ -565,7 +565,7 @@ SilentHillLabFrontScript17: ; 4F98 ld [wMapScriptNumber], a ret -SilentHillLabFrontScript18: ; 4FBC +SilentHillLabFrontScript18: call SilentHillLabFrontMoveDown ret z ld hl, SilentHillLabFrontNPCIDs7 @@ -573,7 +573,7 @@ SilentHillLabFrontScript18: ; 4FBC call CallMapTextSubroutine ret -SilentHillLabFrontScript19: ; 4FCA +SilentHillLabFrontScript19: call SilentHillLabFrontMoveDown ret z ld hl, SilentHillLabFrontNPCIDs9 @@ -581,7 +581,7 @@ SilentHillLabFrontScript19: ; 4FCA call CallMapTextSubroutine ret -SilentHillLabFrontTextPointers2: ; 4FD8 +SilentHillLabFrontTextPointers2: dw SilentHillLabFrontText1 dw SilentHillLabFrontText2 dw Function3899 @@ -598,12 +598,12 @@ SilentHillLabFrontTextPointers2: ; 4FD8 dw Function3899 dw SilentHillLabFrontText3 -SilentHillLabFrontText1: ; 4FF6 +SilentHillLabFrontText1: ld hl, SilentHillLabFrontTextString1 call OpenTextbox ret -SilentHillLabFrontTextString1: ; 4FFD +SilentHillLabFrontTextString1: text "パソコンを みると" line "なんと メールが きていた！" @@ -626,7 +626,7 @@ SilentHillLabFrontTextString1: ; 4FFD cont "<⋯⋯> <⋯⋯> <⋯⋯>じょしゅより" done -SilentHillLabFrontText2: ; 50B3 +SilentHillLabFrontText2: ld hl, wd39d bit 0, [hl] set 0, [hl] @@ -640,26 +640,26 @@ SilentHillLabFrontText2: ; 50B3 call OpenTextbox ret -SilentHillLabFrontTextString2A: ; 50CA +SilentHillLabFrontTextString2A: text "スタート ボタンを プシュ！" line "おすと メニューが ひらくなり" done -SilentHillLabFrontTextString2B: ; 50EA +SilentHillLabFrontTextString2B: text "セーブするには # レポート" line "こまめに かくと いいなり" done -SilentHillLabFrontText3: ; 5108 +SilentHillLabFrontText3: ld hl, SilentHillLabFrontTextString3 call OpenTextbox ret -SilentHillLabFrontTextString3: ; 510F +SilentHillLabFrontTextString3: text "カギが かかっている" done -SilentHillLabFrontText4: ; 511B +SilentHillLabFrontText4: ld a, [wMapScriptNumber] cp $0E jp nc, SilentHillLabFrontText7 @@ -667,11 +667,11 @@ SilentHillLabFrontText4: ; 511B call OpenTextbox ret -SilentHillLabFrontTextString4: ; 512A +SilentHillLabFrontTextString4: text "オーキド『ごくろうさん！" done -SilentHillLabFrontTextString5: ; 5138 +SilentHillLabFrontTextString5: text "オーキド『そうとも！" line "わしが オーキドじゃ！" cont "じじいで わるかったな！" @@ -683,7 +683,7 @@ SilentHillLabFrontTextString5: ; 5138 line "きいては くれんか？@" db $08 -SilentHillLabFrontText6: ; 5192 +SilentHillLabFrontText6: call YesNoBox jr c, .jump .loop @@ -699,7 +699,7 @@ SilentHillLabFrontText6: ; 5192 jr c, .jump jr .loop -SilentHillLabFrontTextString6A: ; 51AE +SilentHillLabFrontTextString6A: text "オーキド『いまから １ねんまえ" line "わしは カントーで" cont "きみたちの ような しょうねんに" @@ -740,7 +740,7 @@ SilentHillLabFrontTextString6A: ; 51AE cont "ちからを かして くれんか！" done -SilentHillLabFrontTextString6B: ; 5332 +SilentHillLabFrontTextString6B: text "オーキド『そうか<⋯⋯>" line "わしに ひとを みるめが" cont "なかったと いうことじゃな<⋯⋯>" @@ -753,12 +753,12 @@ SilentHillLabFrontTextString6B: ; 5332 cont "わしの はなしを きいてくれるな？" done -SilentHillLabFrontTextString7: ; 538D +SilentHillLabFrontTextString7: text "オーキド『ふたりとも！" line "ちょっと わしに ついてこい！" done -SilentHillLabFrontText7: ; 53AA +SilentHillLabFrontText7: ld a, [wMapScriptNumber] cp $12 jr z, .jump @@ -771,18 +771,18 @@ SilentHillLabFrontText7: ; 53AA call OpenTextbox ret -SilentHillLabFrontTextString8: ; 53BF +SilentHillLabFrontTextString8: text "オーキド『<PLAYER>！<RIVAL>！" line "このずかんを" cont "おまえたちに あずける！" done -SilentHillLabFrontTextString9: ; 53DE +SilentHillLabFrontTextString9: text "<PLAYER>は オーキドから" line "#ずかんを もらった！" done -SilentHillLabFrontTextString10: ; 53F5 +SilentHillLabFrontTextString10: text "オーキド『この せかいの すべての" line "#を きろくした" cont "かんぺきな ずかんを つくること！" @@ -804,13 +804,13 @@ SilentHillLabFrontTextString10: ; 53F5 cont "いだいな しごとじゃー！" done -SilentHillLabFrontTextString11A: ; 54C3 +SilentHillLabFrontTextString11A: text "オーキド『せかい じゅうの" line "#たちが" cont "<PLAYER>を まって おるぞー" done -SilentHillLabFrontTextString11B: ; 54E3 +SilentHillLabFrontTextString11B: text "オーキド『おう！ <PLAYER>" line "どうだ？" cont "わしの あげた #は<⋯⋯>？" @@ -827,12 +827,12 @@ SilentHillLabFrontTextString11B: ; 54E3 line "きに なるからな" done -SilentHillLabFrontText8: ; 5560 +SilentHillLabFrontText8: ld hl, SilentHillLabFrontTextString12 call OpenTextbox ret -SilentHillLabFrontTextString12: ; 5567 +SilentHillLabFrontTextString12: text "オーキド『よく きたな！" line "#ずかんの" cont "ちょうしは どうかな？" @@ -841,12 +841,12 @@ SilentHillLabFrontTextString12: ; 5567 cont "みて あげようか！" done -SilentHillLabFrontText9: ; 559A +SilentHillLabFrontText9: ld hl, SilentHillLabFrontTextString13 call OpenTextbox ret -SilentHillLabFrontTextString13: ; 55A1 +SilentHillLabFrontTextString13: text "オーキド『<⋯⋯> おっほんッ！" line "よくやったな <PLAYER>！" @@ -865,12 +865,12 @@ SilentHillLabFrontTextString13: ; 55A1 cont "<RIVAL>『ギクッ！" done -SilentHillLabFrontText10: ; 561A +SilentHillLabFrontText10: ld hl, SilentHillLabFrontTextString14 call OpenTextbox ret -SilentHillLabFrontTextString14: ; 5621 +SilentHillLabFrontTextString14: text "<RIVAL>『なんだ" line "<PLAYER>じゃないか！" cont "おれも ここが" @@ -878,23 +878,23 @@ SilentHillLabFrontTextString14: ; 5621 cont "だれも いないみたいだな<⋯⋯>" done -SilentHillLabFrontText11: ; 5658 +SilentHillLabFrontText11: ld hl, SilentHillLabFrontTextString16 call OpenTextbox ret -SilentHillLabFrontTextString15: ; 565F +SilentHillLabFrontTextString15: text "<RIVAL>『よっしゃあ！" line "じいさん！ おれにまかせな！" done -SilentHillLabFrontTextString16: ; 5678 +SilentHillLabFrontTextString16: text "<RIVAL>『おれが えらんだ" line "#のほうが つよそうだぜ！" cont "こっちに したかったんじゃないの？" done -SilentHillLabFrontTextString17: ; 56A4 +SilentHillLabFrontTextString17: text "<RIVAL>『<PLAYER>！" line "せっかく じいさんに" cont "# もらったんだから" @@ -902,12 +902,12 @@ SilentHillLabFrontTextString17: ; 56A4 cont "たたかわせて みようぜ！" done -SilentHillLabFrontTextString18: ; 56D4 +SilentHillLabFrontTextString18: text "<RIVAL>『くっそー！" line "こんどは ぜったい まけないぞ！" done -SilentHillLabFrontTextString19: ; 56EE +SilentHillLabFrontTextString19: text "<RIVAL>『よーし！" line "ほかの #と たたかわせて" cont "もっと もっと つよくしよう！" @@ -915,12 +915,12 @@ SilentHillLabFrontTextString19: ; 56EE para "そんじゃ ばいばい！" done -SilentHillLabFrontTextString20: ; 571F +SilentHillLabFrontTextString20: text "じいちゃん！" line "つれてきたよー！" done -SilentHillLabFrontTextString21: ; 5730 +SilentHillLabFrontTextString21: text "ぼくは かつて" line "#トレーナーの ちょうてんを" cont "めざしたことが あるんだ" @@ -944,23 +944,23 @@ SilentHillLabFrontTextString21: ; 5730 cont "とても ハイテクな ずかん だよ！" done -SilentHillLabFrontText12: ; 5814 +SilentHillLabFrontText12: ld hl, SilentHillLabFrontTextString22 call OpenTextbox ret -SilentHillLabFrontTextString22: ; 581B +SilentHillLabFrontTextString22: text "ぼくも むかし やったけど" line "なかなか たいへんだよ<⋯⋯>" cont "がんばってね！" done -SilentHillLabFrontText13: ; 583F +SilentHillLabFrontText13: ld hl, SilentHillLabFrontTextString24 call OpenTextbox ret -SilentHillLabFrontTextString23: ; 5846 +SilentHillLabFrontTextString23: text "ナナミ『さっき あなたを " line "つれてきた わかい おとこのこ<⋯⋯>" cont "あれは わたしの おとうとなの" @@ -1008,17 +1008,17 @@ SilentHillLabFrontTextString23: ; 5846 line "いのっているわ" done -SilentHillLabFrontTextString24: ; 5A23 +SilentHillLabFrontTextString24: text "<⋯⋯>あなたの かつやく" line "いのってるわ" done -SilentHillLabFrontText14: ; 5A36 +SilentHillLabFrontText14: ld hl, SilentHillLabFrontTextString25 call OpenTextbox ret -SilentHillLabFrontTextString25: ; 5A3D +SilentHillLabFrontTextString25: text "わたしは" line "はかせの じょしゅ です" @@ -1030,12 +1030,12 @@ SilentHillLabFrontTextString25: ; 5A3D cont "なるような きがします" done -SilentHillLabFrontText15: ; 5A90 +SilentHillLabFrontText15: ld hl, SilentHillLabFrontTextString26 call OpenTextbox ret -SilentHillLabFrontTextString26: ; 5A97 +SilentHillLabFrontTextString26: text "わたしは" line "はかせの じょしゅ です" @@ -1047,22 +1047,22 @@ SilentHillLabFrontTextString26: ; 5A97 cont "なるような きがします" done -SilentHillLabFrontText16: ; 5AEA +SilentHillLabFrontText16: ld hl, SilentHillLabFrontTextString27 call OpenTextbox ret -SilentHillLabFrontTextString27: ; 5AF1 +SilentHillLabFrontTextString27: text "なんだろう？" line "でんし てちょう かな？" done -SilentHillLabFrontText17: ; 5B05 +SilentHillLabFrontText17: ld hl, SilentHillLabFrontTextString28 call OpenTextbox ret -SilentHillLabFrontTextString28: ; 5B0D +SilentHillLabFrontTextString28: text "<RIVAL>『あのメールを くれた" line "オーキドって こんな じじい<⋯⋯>" @@ -1071,18 +1071,18 @@ SilentHillLabFrontTextString28: ; 5B0D cont "ほんもの はじめて みたよ！" done -SilentHillLabFrontTextString29: ; 5B4F +SilentHillLabFrontTextString29: text "<RIVAL>『<PLAYER>！" line "なんだか" cont "おもしろく なってきたな！" done -SilentHillLabFrontText18: ; 5B68 +SilentHillLabFrontText18: ld hl, SilentHillLabFrontTextString30 call OpenTextbox ret -SilentHillLabFrontTextString30: ; 5B6F +SilentHillLabFrontTextString30: text "わたしは" line "はかせの じょしゅ です" @@ -1091,12 +1091,12 @@ SilentHillLabFrontTextString30: ; 5B6F cont "なるような きがします" done -SilentHillLabFrontText19: ; 5BA7 +SilentHillLabFrontText19: ld hl, SilentHillLabFrontTextString31 call OpenTextbox ret -SilentHillLabFrontTextString31: ; 5BAE +SilentHillLabFrontTextString31: text "わたしは" line "はかせの じょしゅ です" diff --git a/maps/SilentHillPokecenter.asm b/maps/SilentHillPokecenter.asm index da78335..914e80b 100644 --- a/maps/SilentHillPokecenter.asm +++ b/maps/SilentHillPokecenter.asm @@ -2,17 +2,17 @@ include "constants.asm" SECTION "maps/SilentHillPokecenter.asm", ROMX -SilentHillPokecenterScriptLoader:: ; 4682 +SilentHillPokecenterScriptLoader:: ld hl, SilentHillPokecenterScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -SilentHillPokecenterScriptPointers: ; 468C +SilentHillPokecenterScriptPointers: dw SilentHillPokecenterScript dw SilentHillPokecenterNPCIDs -SilentHillPokecenterScript: ; 4690 +SilentHillPokecenterScript: ld hl, SilentHillPokecenterNPCIDs ld de, SilentHillPokecenterPCPointer call CallMapTextSubroutine @@ -21,7 +21,7 @@ SilentHillPokecenterScript: ; 4690 ; 469A dw SilentHillPokecenterNPCIDs -SilentHillPokecenterNPCIDs: ; 469C +SilentHillPokecenterNPCIDs: db 0 db 1 db 2 @@ -29,31 +29,31 @@ SilentHillPokecenterNPCIDs: ; 469C db 4 db $FF -SilentHillPokecenterPCPointer: ; 46A2 +SilentHillPokecenterPCPointer: dw SilentHillPokecenterPCText -SilentHillPokecenterPCText: ; 46A4 +SilentHillPokecenterPCText: ld hl, SilentHillPokecenterTextString1 call OpenTextbox ret -SilentHillPokecenterTextString1: ; 46AB +SilentHillPokecenterTextString1: text "げんざい ちょうせいちゅうです" done -SilentHillPokecenterTextPointers:: ; 46BC +SilentHillPokecenterTextPointers:: dw SilentHillPokecenterNPCText1 dw SilentHillPokecenterNPCText2 dw SilentHillPokecenterNPCText3 dw SilentHillPokecenterNPCText4 dw SilentHillPokecenterNPCText5 -SilentHillPokecenterNPCText1: ; 46C6 +SilentHillPokecenterNPCText1: ld hl, SilentHillPokecenterTextString2 call OpenTextbox ret -SilentHillPokecenterTextString2: ; 46CD +SilentHillPokecenterTextString2: text "もうしわけありませんが" line "ただいま しゅうりちゅう でして" @@ -63,12 +63,12 @@ SilentHillPokecenterTextString2: ; 46CD line "じゅうぶんに おきをつけ ください" done -SilentHillPokecenterNPCText2: ; 4714 +SilentHillPokecenterNPCText2: ld hl, SilentHillPokecenterTextString3 call OpenTextbox ret -SilentHillPokecenterTextString3: ; 471B +SilentHillPokecenterTextString3: text "あそこに ある パソコンは" line "トレーナー だったら" cont "いつでも むりょうで" @@ -76,12 +76,12 @@ SilentHillPokecenterTextString3: ; 471B cont "きが きいてるよな！" done -SilentHillPokecenterNPCText3: ; 4757 +SilentHillPokecenterNPCText3: ld hl, SilentHillPokecenterTextString4 call OpenTextbox ret -SilentHillPokecenterTextString4: ; 475E +SilentHillPokecenterTextString4: text "いま じゅんびちゅうの" line "きかいは すごいらしいよ" @@ -91,22 +91,22 @@ SilentHillPokecenterTextString4: ; 475E para "ほんとかな？" done -SilentHillPokecenterNPCText4: ; 479E +SilentHillPokecenterNPCText4: ld hl, SilentHillPokecenterTextString5 call OpenTextbox ret -SilentHillPokecenterTextString5: ; 47A5 +SilentHillPokecenterTextString5: text "こいつ へルガー" line "いままでにない タイプの ポケモンさ" done -SilentHillPokecenterNPCText5: ; 47C2 +SilentHillPokecenterNPCText5: ld hl, SilentHillPokecenterTextString6 call OpenTextbox ret -SilentHillPokecenterTextString6: ; 47C9 +SilentHillPokecenterTextString6: text "へルガー『ぐるるうー" done diff --git a/maps/UnusedMap13.asm b/maps/UnusedMap13.asm index 4d6488f..22f2b01 100644 --- a/maps/UnusedMap13.asm +++ b/maps/UnusedMap13.asm @@ -2,26 +2,26 @@ include "constants.asm" SECTION "maps/UnusedMap13.asm", ROMX -UnusedMap13ScriptLoader:: ; 6078 +UnusedMap13ScriptLoader:: ld hl, UnusedMap13ScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -UnusedMap13ScriptPointers: ; 6082 +UnusedMap13ScriptPointers: dw UnusedMap13Script dw UnusedMap13NPCIDs -UnusedMap13NPCIDs: ; 6086 +UnusedMap13NPCIDs: db $FF -UnusedMap13SignPointers: ; 6087 +UnusedMap13SignPointers: dw MapDefaultText -UnusedMap13TextPointers:: ; 6089 +UnusedMap13TextPointers:: dw MapDefaultText -UnusedMap13Script: ; 608B +UnusedMap13Script: ld hl, UnusedMap13NPCIDs ld de, UnusedMap13SignPointers call CallMapTextSubroutine diff --git a/maps/placeholder/Baadon.asm b/maps/placeholder/Baadon.asm index a80f4d4..ec28632 100644 --- a/maps/placeholder/Baadon.asm +++ b/maps/placeholder/Baadon.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Baadon.asm", ROMX -BaadonScriptLoader:: ; d89f7 (36:49f7) +BaadonScriptLoader:: ret db "@" diff --git a/maps/placeholder/BaadonHouse1.asm b/maps/placeholder/BaadonHouse1.asm index e84fb66..d4cc840 100644 --- a/maps/placeholder/BaadonHouse1.asm +++ b/maps/placeholder/BaadonHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonHouse1.asm", ROMX -BaadonHouse1ScriptLoader:: ; 9cade (27:4ade) +BaadonHouse1ScriptLoader:: ret -BaadonHouse1TextPointers:: ; 9cadf (27:4adf) +BaadonHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BaadonHouse2.asm b/maps/placeholder/BaadonHouse2.asm index 7d1ad92..c2c0280 100644 --- a/maps/placeholder/BaadonHouse2.asm +++ b/maps/placeholder/BaadonHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonHouse2.asm", ROMX -BaadonHouse2ScriptLoader:: ; 9cb81 (27:4b81) +BaadonHouse2ScriptLoader:: ret -BaadonHouse2TextPointers:: ; 9cb82 (27:4b82) +BaadonHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BaadonLeague1F.asm b/maps/placeholder/BaadonLeague1F.asm index ecef9ad..3f24f0a 100644 --- a/maps/placeholder/BaadonLeague1F.asm +++ b/maps/placeholder/BaadonLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonLeague1F.asm", ROMX -BaadonLeague1FScriptLoader:: ; 9cc22 (27:4c22) +BaadonLeague1FScriptLoader:: ret -BaadonLeague1FTextPointers:: ; 9cc23 (27:4c23) +BaadonLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BaadonLeague2F.asm b/maps/placeholder/BaadonLeague2F.asm index 612856c..e18cf6e 100644 --- a/maps/placeholder/BaadonLeague2F.asm +++ b/maps/placeholder/BaadonLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonLeague2F.asm", ROMX -BaadonLeague2FScriptLoader:: ; 9ccc2 (27:4cc2) +BaadonLeague2FScriptLoader:: ret -BaadonLeague2FTextPointers:: ; 9ccc3 (27:4cc3) +BaadonLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BaadonMart.asm b/maps/placeholder/BaadonMart.asm index ba9474e..9bda0fc 100644 --- a/maps/placeholder/BaadonMart.asm +++ b/maps/placeholder/BaadonMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonMart.asm", ROMX -BaadonMartScriptLoader:: ; 9c988 (27:4988) +BaadonMartScriptLoader:: ret -BaadonMartTextPointers:: ; 9c989 (27:4989) +BaadonMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BaadonPokecenter1F.asm b/maps/placeholder/BaadonPokecenter1F.asm index 6168062..8dbe247 100644 --- a/maps/placeholder/BaadonPokecenter1F.asm +++ b/maps/placeholder/BaadonPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonPokecenter1F.asm", ROMX -BaadonPokecenter1FScriptLoader:: ; 9ca0f (27:4a0f) +BaadonPokecenter1FScriptLoader:: ret -BaadonPokecenter1FTextPointers:: ; 9ca10 (27:4a10) +BaadonPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BaadonPokecenter2F.asm b/maps/placeholder/BaadonPokecenter2F.asm index 425c391..3827617 100644 --- a/maps/placeholder/BaadonPokecenter2F.asm +++ b/maps/placeholder/BaadonPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonPokecenter2F.asm", ROMX -BaadonPokecenter2FScriptLoader:: ; 9ca88 (27:4a88) +BaadonPokecenter2FScriptLoader:: ret -BaadonPokecenter2FTextPointers:: ; 9ca89 (27:4a89) +BaadonPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BaadonRoute1.asm b/maps/placeholder/BaadonRoute1.asm index 70e22a7..8df30f7 100644 --- a/maps/placeholder/BaadonRoute1.asm +++ b/maps/placeholder/BaadonRoute1.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonRoute1.asm", ROMX -BaadonRoute1ScriptLoader:: ; da601 (36:6601) +BaadonRoute1ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BaadonRoute2.asm b/maps/placeholder/BaadonRoute2.asm index 1c64254..6a133b4 100644 --- a/maps/placeholder/BaadonRoute2.asm +++ b/maps/placeholder/BaadonRoute2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonRoute2.asm", ROMX -BaadonRoute2ScriptLoader:: ; da7ed (36:67ed) +BaadonRoute2ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BaadonRoute3.asm b/maps/placeholder/BaadonRoute3.asm index 0687dca..a20f29d 100644 --- a/maps/placeholder/BaadonRoute3.asm +++ b/maps/placeholder/BaadonRoute3.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonRoute3.asm", ROMX -BaadonRoute3ScriptLoader:: ; da8d9 (36:68d9) +BaadonRoute3ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BaadonRouteGateNewtype.asm b/maps/placeholder/BaadonRouteGateNewtype.asm index b195d03..26e0dd7 100644 --- a/maps/placeholder/BaadonRouteGateNewtype.asm +++ b/maps/placeholder/BaadonRouteGateNewtype.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonRouteGateNewtype.asm", ROMX -BaadonRouteGateNewtypeScriptLoader:: ; 9cd78 (27:4d78) +BaadonRouteGateNewtypeScriptLoader:: ret -BaadonRouteGateNewtypeTextPointers:: ; 9cd79 (27:4d79) +BaadonRouteGateNewtypeTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BaadonRouteGateWest.asm b/maps/placeholder/BaadonRouteGateWest.asm index 0696eae..4fd4b9f 100644 --- a/maps/placeholder/BaadonRouteGateWest.asm +++ b/maps/placeholder/BaadonRouteGateWest.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonRouteGateWest.asm", ROMX -BaadonRouteGateWestScriptLoader:: ; 9cd1d (27:4d1d) +BaadonRouteGateWestScriptLoader:: ret -BaadonRouteGateWestTextPointers:: ; 9cd1e (27:4d1e) +BaadonRouteGateWestTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BaadonWallpaperHouse.asm b/maps/placeholder/BaadonWallpaperHouse.asm index 47e1c45..67fa772 100644 --- a/maps/placeholder/BaadonWallpaperHouse.asm +++ b/maps/placeholder/BaadonWallpaperHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonWallpaperHouse.asm", ROMX -BaadonWallpaperHouseScriptLoader:: ; 9cb27 (27:4b27) +BaadonWallpaperHouseScriptLoader:: ret -BaadonWallpaperHouseTextPointers:: ; 9cb28 (27:4b28) +BaadonWallpaperHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullForest.asm b/maps/placeholder/BullForest.asm index 50ee99d..82e0475 100644 --- a/maps/placeholder/BullForest.asm +++ b/maps/placeholder/BullForest.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForest.asm", ROMX -BullForestScriptLoader:: ; d8f26 (36:4f26) +BullForestScriptLoader:: ret db "@" diff --git a/maps/placeholder/BullForestRoute1.asm b/maps/placeholder/BullForestRoute1.asm index 9958454..459d42f 100644 --- a/maps/placeholder/BullForestRoute1.asm +++ b/maps/placeholder/BullForestRoute1.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForestRoute1.asm", ROMX -BullForestRoute1ScriptLoader:: ; dad8d (36:6d8d) +BullForestRoute1ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BullForestRoute1House.asm b/maps/placeholder/BullForestRoute1House.asm index 51f2c34..1d4e46e 100644 --- a/maps/placeholder/BullForestRoute1House.asm +++ b/maps/placeholder/BullForestRoute1House.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForestRoute1House.asm", ROMX -BullForestRoute1HouseScriptLoader:: ; 9d804 (27:5804) +BullForestRoute1HouseScriptLoader:: ret -BullForestRoute1HouseTextPointers:: ; 9d805 (27:5805) +BullForestRoute1HouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullForestRoute2.asm b/maps/placeholder/BullForestRoute2.asm index c02d627..17305bd 100644 --- a/maps/placeholder/BullForestRoute2.asm +++ b/maps/placeholder/BullForestRoute2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForestRoute2.asm", ROMX -BullForestRoute2ScriptLoader:: ; db019 (36:7019) +BullForestRoute2ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BullForestRoute3.asm b/maps/placeholder/BullForestRoute3.asm index 17830a8..a465c21 100644 --- a/maps/placeholder/BullForestRoute3.asm +++ b/maps/placeholder/BullForestRoute3.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForestRoute3.asm", ROMX -BullForestRoute3ScriptLoader:: ; db666 (36:7666) +BullForestRoute3ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BullForestRouteGateStand.asm b/maps/placeholder/BullForestRouteGateStand.asm index c22aee9..94b630e 100644 --- a/maps/placeholder/BullForestRouteGateStand.asm +++ b/maps/placeholder/BullForestRouteGateStand.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForestRouteGateStand.asm", ROMX -BullForestRouteGateStandScriptLoader:: ; 9d85f (27:585f) +BullForestRouteGateStandScriptLoader:: ret -BullForestRouteGateStandTextPointers:: ; 9d860 (27:5860) +BullForestRouteGateStandTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullHouse1.asm b/maps/placeholder/BullHouse1.asm index 4d501aa..cbaf78a 100644 --- a/maps/placeholder/BullHouse1.asm +++ b/maps/placeholder/BullHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullHouse1.asm", ROMX -BullHouse1ScriptLoader:: ; 9d935 (27:5935) +BullHouse1ScriptLoader:: ret -BullHouse1TextPointers:: ; 9d936 (27:5936) +BullHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullHouse2.asm b/maps/placeholder/BullHouse2.asm index 59494b9..856071e 100644 --- a/maps/placeholder/BullHouse2.asm +++ b/maps/placeholder/BullHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullHouse2.asm", ROMX -BullHouse2ScriptLoader:: ; 9d98f (27:598f) +BullHouse2ScriptLoader:: ret -BullHouse2TextPointers:: ; 9d990 (27:5990) +BullHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullHouse3.asm b/maps/placeholder/BullHouse3.asm index adb18be..56c6913 100644 --- a/maps/placeholder/BullHouse3.asm +++ b/maps/placeholder/BullHouse3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullHouse3.asm", ROMX -BullHouse3ScriptLoader:: ; 9d9e9 (27:59e9) +BullHouse3ScriptLoader:: ret -BullHouse3TextPointers:: ; 9d9ea (27:59ea) +BullHouse3TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullHouse4.asm b/maps/placeholder/BullHouse4.asm index 458128e..ebc2ff5 100644 --- a/maps/placeholder/BullHouse4.asm +++ b/maps/placeholder/BullHouse4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullHouse4.asm", ROMX -BullHouse4ScriptLoader:: ; 9dc84 (27:5c84) +BullHouse4ScriptLoader:: ret -BullHouse4TextPointers:: ; 9dc85 (27:5c85) +BullHouse4TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullLeague1F.asm b/maps/placeholder/BullLeague1F.asm index c024114..972d912 100644 --- a/maps/placeholder/BullLeague1F.asm +++ b/maps/placeholder/BullLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullLeague1F.asm", ROMX -BullLeague1FScriptLoader:: ; 9db97 (27:5b97) +BullLeague1FScriptLoader:: ret -BullLeague1FTextPointers:: ; 9db98 (27:5b98) +BullLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullLeague2F.asm b/maps/placeholder/BullLeague2F.asm index 33bccae..b1fd12d 100644 --- a/maps/placeholder/BullLeague2F.asm +++ b/maps/placeholder/BullLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullLeague2F.asm", ROMX -BullLeague2FScriptLoader:: ; 9dc37 (27:5c37) +BullLeague2FScriptLoader:: ret -BullLeague2FTextPointers:: ; 9dc38 (27:5c38) +BullLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullMart.asm b/maps/placeholder/BullMart.asm index 976d80b..7f4578b 100644 --- a/maps/placeholder/BullMart.asm +++ b/maps/placeholder/BullMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullMart.asm", ROMX -BullMartScriptLoader:: ; 9d8df (27:58df) +BullMartScriptLoader:: ret -BullMartTextPointers:: ; 9d8e0 (27:58e0) +BullMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullPokecenter1F.asm b/maps/placeholder/BullPokecenter1F.asm index ffcd820..8c802d4 100644 --- a/maps/placeholder/BullPokecenter1F.asm +++ b/maps/placeholder/BullPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullPokecenter1F.asm", ROMX -BullPokecenter1FScriptLoader:: ; 9da7d (27:5a7d) +BullPokecenter1FScriptLoader:: ret -BullPokecenter1FTextPointers:: ; 9da7e (27:5a7e) +BullPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullPokecenter2F.asm b/maps/placeholder/BullPokecenter2F.asm index 396c634..805df5b 100644 --- a/maps/placeholder/BullPokecenter2F.asm +++ b/maps/placeholder/BullPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullPokecenter2F.asm", ROMX -BullPokecenter2FScriptLoader:: ; 9daf6 (27:5af6) +BullPokecenter2FScriptLoader:: ret -BullPokecenter2FTextPointers:: ; 9daf7 (27:5af7) +BullPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/CaveMinecarts1.asm b/maps/placeholder/CaveMinecarts1.asm index f018887..bac37be 100644 --- a/maps/placeholder/CaveMinecarts1.asm +++ b/maps/placeholder/CaveMinecarts1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts1.asm", ROMX -CaveMinecarts1ScriptLoader:: ; bc817 (2f:4817) +CaveMinecarts1ScriptLoader:: ret -CaveMinecarts1TextPointers:: ; bc818 (2f:4818) +CaveMinecarts1TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts2.asm b/maps/placeholder/CaveMinecarts2.asm index 8b3fa71..cb37e7f 100644 --- a/maps/placeholder/CaveMinecarts2.asm +++ b/maps/placeholder/CaveMinecarts2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts2.asm", ROMX -CaveMinecarts2ScriptLoader:: ; bc9a2 (2f:49a2) +CaveMinecarts2ScriptLoader:: ret -CaveMinecarts2TextPointers:: ; bc9a3 (2f:49a3) +CaveMinecarts2TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts3.asm b/maps/placeholder/CaveMinecarts3.asm index 4c70aff..ac7c5b1 100644 --- a/maps/placeholder/CaveMinecarts3.asm +++ b/maps/placeholder/CaveMinecarts3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts3.asm", ROMX -CaveMinecarts3ScriptLoader:: ; bcb2d (2f:4b2d) +CaveMinecarts3ScriptLoader:: ret -CaveMinecarts3TextPointers:: ; bcb2e (2f:4b2e) +CaveMinecarts3TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts4.asm b/maps/placeholder/CaveMinecarts4.asm index 372929c..fa8873f 100644 --- a/maps/placeholder/CaveMinecarts4.asm +++ b/maps/placeholder/CaveMinecarts4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts4.asm", ROMX -CaveMinecarts4ScriptLoader:: ; bccb8 (2f:4cb8) +CaveMinecarts4ScriptLoader:: ret -CaveMinecarts4TextPointers:: ; bccb9 (2f:4cb9) +CaveMinecarts4TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts5.asm b/maps/placeholder/CaveMinecarts5.asm index 9e5c97e..836f478 100644 --- a/maps/placeholder/CaveMinecarts5.asm +++ b/maps/placeholder/CaveMinecarts5.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts5.asm", ROMX -CaveMinecarts5ScriptLoader:: ; bce43 (2f:4e43) +CaveMinecarts5ScriptLoader:: ret -CaveMinecarts5TextPointers:: ; bce44 (2f:4e44) +CaveMinecarts5TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts6.asm b/maps/placeholder/CaveMinecarts6.asm index 744a154..32dd57d 100644 --- a/maps/placeholder/CaveMinecarts6.asm +++ b/maps/placeholder/CaveMinecarts6.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts6.asm", ROMX -CaveMinecarts6ScriptLoader:: ; bcf1a (2f:4f1a) +CaveMinecarts6ScriptLoader:: ret -CaveMinecarts6TextPointers:: ; bcf1b (2f:4f1b) +CaveMinecarts6TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts7.asm b/maps/placeholder/CaveMinecarts7.asm index 82867d8..c536912 100644 --- a/maps/placeholder/CaveMinecarts7.asm +++ b/maps/placeholder/CaveMinecarts7.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts7.asm", ROMX -CaveMinecarts7ScriptLoader:: ; bcff1 (2f:4ff1) +CaveMinecarts7ScriptLoader:: ret -CaveMinecarts7TextPointers:: ; bcff2 (2f:4ff2) +CaveMinecarts7TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/Fonto.asm b/maps/placeholder/Fonto.asm index b0f8d5d..29d0143 100644 --- a/maps/placeholder/Fonto.asm +++ b/maps/placeholder/Fonto.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Fonto.asm", ROMX -FontoScriptLoader:: ; d88f1 (36:48f1) +FontoScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoHouse.asm b/maps/placeholder/FontoHouse.asm index d46ac7c..d09827e 100644 --- a/maps/placeholder/FontoHouse.asm +++ b/maps/placeholder/FontoHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoHouse.asm", ROMX -FontoHouseScriptLoader:: ; 9c794 (27:4794) +FontoHouseScriptLoader:: ret -FontoHouseTextPointers:: ; 9c795 (27:4795) +FontoHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoLab.asm b/maps/placeholder/FontoLab.asm index 61d9614..1ed547a 100644 --- a/maps/placeholder/FontoLab.asm +++ b/maps/placeholder/FontoLab.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoLab.asm", ROMX -FontoLabScriptLoader:: ; 9c908 (27:4908) +FontoLabScriptLoader:: ret -FontoLabTextPointers:: ; 9c909 (27:4909) +FontoLabTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoMart.asm b/maps/placeholder/FontoMart.asm index 288f5ec..7438847 100644 --- a/maps/placeholder/FontoMart.asm +++ b/maps/placeholder/FontoMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoMart.asm", ROMX -FontoMartScriptLoader:: ; 9c73a (27:473a) +FontoMartScriptLoader:: ret -FontoMartTextPointers:: ; 9c73b (27:473b) +FontoMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoPokecenter1F.asm b/maps/placeholder/FontoPokecenter1F.asm index 293e01c..d164e2c 100644 --- a/maps/placeholder/FontoPokecenter1F.asm +++ b/maps/placeholder/FontoPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoPokecenter1F.asm", ROMX -FontoPokecenter1FScriptLoader:: ; 9c828 (27:4828) +FontoPokecenter1FScriptLoader:: ret -FontoPokecenter1FTextPointers:: ; 9c829 (27:4829) +FontoPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoPokecenter2F.asm b/maps/placeholder/FontoPokecenter2F.asm index 5026fa9..5ed4416 100644 --- a/maps/placeholder/FontoPokecenter2F.asm +++ b/maps/placeholder/FontoPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoPokecenter2F.asm", ROMX -FontoPokecenter2FScriptLoader:: ; 9c8a1 (27:48a1) +FontoPokecenter2FScriptLoader:: ret -FontoPokecenter2FTextPointers:: ; 9c8a2 (27:48a2) +FontoPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoRocketHouse.asm b/maps/placeholder/FontoRocketHouse.asm index 3e17893..3d66098 100644 --- a/maps/placeholder/FontoRocketHouse.asm +++ b/maps/placeholder/FontoRocketHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRocketHouse.asm", ROMX -FontoRocketHouseScriptLoader:: ; 9c6ba (27:46ba) +FontoRocketHouseScriptLoader:: ret -FontoRocketHouseTextPointers:: ; 9c6bb (27:46bb) +FontoRocketHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoRoute1.asm b/maps/placeholder/FontoRoute1.asm index 63014d4..aa12d5d 100644 --- a/maps/placeholder/FontoRoute1.asm +++ b/maps/placeholder/FontoRoute1.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute1.asm", ROMX -FontoRoute1ScriptLoader:: ; da081 (36:6081) +FontoRoute1ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRoute2.asm b/maps/placeholder/FontoRoute2.asm index f5412f8..3acce58 100644 --- a/maps/placeholder/FontoRoute2.asm +++ b/maps/placeholder/FontoRoute2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute2.asm", ROMX -FontoRoute2ScriptLoader:: ; da2c4 (36:62c4) +FontoRoute2ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRoute3.asm b/maps/placeholder/FontoRoute3.asm index 2786b0b..e609cbf 100644 --- a/maps/placeholder/FontoRoute3.asm +++ b/maps/placeholder/FontoRoute3.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute3.asm", ROMX -FontoRoute3ScriptLoader:: ; da4bb (36:64bb) +FontoRoute3ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRoute4.asm b/maps/placeholder/FontoRoute4.asm index 7427bc0..a0f8eef 100644 --- a/maps/placeholder/FontoRoute4.asm +++ b/maps/placeholder/FontoRoute4.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute4.asm", ROMX -FontoRoute4ScriptLoader:: ; da3b0 (36:63b0) +FontoRoute4ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRoute5.asm b/maps/placeholder/FontoRoute5.asm index 127fb8f..319bb5e 100644 --- a/maps/placeholder/FontoRoute5.asm +++ b/maps/placeholder/FontoRoute5.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute5.asm", ROMX -FontoRoute5ScriptLoader:: ; db52e (36:752e) +FontoRoute5ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRoute6.asm b/maps/placeholder/FontoRoute6.asm index 36f8506..ebe7575 100644 --- a/maps/placeholder/FontoRoute6.asm +++ b/maps/placeholder/FontoRoute6.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute6.asm", ROMX -FontoRoute6ScriptLoader:: ; da1e6 (36:61e6) +FontoRoute6ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRouteGate1.asm b/maps/placeholder/FontoRouteGate1.asm index 596766e..0c812c9 100644 --- a/maps/placeholder/FontoRouteGate1.asm +++ b/maps/placeholder/FontoRouteGate1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRouteGate1.asm", ROMX -FontoRouteGate1ScriptLoader:: ; 9c577 (27:4577) +FontoRouteGate1ScriptLoader:: ret -FontoRouteGate1TextPointers:: ; 9c578 (27:4578) +FontoRouteGate1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoRouteGate2.asm b/maps/placeholder/FontoRouteGate2.asm index a322586..42e4b33 100644 --- a/maps/placeholder/FontoRouteGate2.asm +++ b/maps/placeholder/FontoRouteGate2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRouteGate2.asm", ROMX -FontoRouteGate2ScriptLoader:: ; 9c5d2 (27:45d2) +FontoRouteGate2ScriptLoader:: ret -FontoRouteGate2TextPointers:: ; 9c5d3 (27:45d3) +FontoRouteGate2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoRouteGate3.asm b/maps/placeholder/FontoRouteGate3.asm index 1f6f77e..06c58f9 100644 --- a/maps/placeholder/FontoRouteGate3.asm +++ b/maps/placeholder/FontoRouteGate3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRouteGate3.asm", ROMX -FontoRouteGate3ScriptLoader:: ; 9c62d (27:462d) +FontoRouteGate3ScriptLoader:: ret -FontoRouteGate3TextPointers:: ; 9c62e (27:462e) +FontoRouteGate3TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Haiteku.asm b/maps/placeholder/Haiteku.asm index c76361c..7e050f2 100644 --- a/maps/placeholder/Haiteku.asm +++ b/maps/placeholder/Haiteku.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Haiteku.asm", ROMX -HaitekuScriptLoader:: ; d87f6 (36:47f6) +HaitekuScriptLoader:: ret db "@" diff --git a/maps/placeholder/HaitekuAquarium1F.asm b/maps/placeholder/HaitekuAquarium1F.asm index 7841830..f97f03b 100644 --- a/maps/placeholder/HaitekuAquarium1F.asm +++ b/maps/placeholder/HaitekuAquarium1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuAquarium1F.asm", ROMX -HaitekuAquarium1FScriptLoader:: ; 9c4b0 (27:44b0) +HaitekuAquarium1FScriptLoader:: ret -HaitekuAquarium1FTextPointers:: ; 9c4b1 (27:44b1) +HaitekuAquarium1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuAquarium2F.asm b/maps/placeholder/HaitekuAquarium2F.asm index bcb9f99..a3d01ae 100644 --- a/maps/placeholder/HaitekuAquarium2F.asm +++ b/maps/placeholder/HaitekuAquarium2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuAquarium2F.asm", ROMX -HaitekuAquarium2FScriptLoader:: ; 9c51c (27:451c) +HaitekuAquarium2FScriptLoader:: ret -HaitekuAquarium2FTextPointers:: ; 9c51d (27:451d) +HaitekuAquarium2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuHouse1.asm b/maps/placeholder/HaitekuHouse1.asm index 06cddb9..45a58fe 100644 --- a/maps/placeholder/HaitekuHouse1.asm +++ b/maps/placeholder/HaitekuHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuHouse1.asm", ROMX -HaitekuHouse1ScriptLoader:: ; 9c368 (27:4368) +HaitekuHouse1ScriptLoader:: ret -HaitekuHouse1TextPointers:: ; 9c369 (27:4369) +HaitekuHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuHouse2.asm b/maps/placeholder/HaitekuHouse2.asm index 62ed4d8..a51ceec 100644 --- a/maps/placeholder/HaitekuHouse2.asm +++ b/maps/placeholder/HaitekuHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuHouse2.asm", ROMX -HaitekuHouse2ScriptLoader:: ; 9c3c2 (27:43c2) +HaitekuHouse2ScriptLoader:: ret -HaitekuHouse2TextPointers:: ; 9c3c3 (27:43c3) +HaitekuHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuImposterOakHouse.asm b/maps/placeholder/HaitekuImposterOakHouse.asm index 083ce81..856e827 100644 --- a/maps/placeholder/HaitekuImposterOakHouse.asm +++ b/maps/placeholder/HaitekuImposterOakHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuImposterOakHouse.asm", ROMX -HaitekuImposterOakHouseScriptLoader:: ; 9c429 (27:4429) +HaitekuImposterOakHouseScriptLoader:: ret -HaitekuImposterOakHouseTextPointers:: ; 9c42a (27:442a) +HaitekuImposterOakHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuLeague1F.asm b/maps/placeholder/HaitekuLeague1F.asm index cdf39dd..a7f1787 100644 --- a/maps/placeholder/HaitekuLeague1F.asm +++ b/maps/placeholder/HaitekuLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuLeague1F.asm", ROMX -HaitekuLeague1FScriptLoader:: ; 9c1ee (27:41ee) +HaitekuLeague1FScriptLoader:: ret -HaitekuLeague1FTextPointers:: ; 9c1ef (27:41ef) +HaitekuLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuLeague2F.asm b/maps/placeholder/HaitekuLeague2F.asm index 1110f3d..85acc1c 100644 --- a/maps/placeholder/HaitekuLeague2F.asm +++ b/maps/placeholder/HaitekuLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuLeague2F.asm", ROMX -HaitekuLeague2FScriptLoader:: ; 9c28e (27:428e) +HaitekuLeague2FScriptLoader:: ret -HaitekuLeague2FTextPointers:: ; 9c28f (27:428f) +HaitekuLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuMart.asm b/maps/placeholder/HaitekuMart.asm index 94a8e3b..6591b58 100644 --- a/maps/placeholder/HaitekuMart.asm +++ b/maps/placeholder/HaitekuMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuMart.asm", ROMX -HaitekuMartScriptLoader:: ; 9c30e (27:430e) +HaitekuMartScriptLoader:: ret -HaitekuMartTextPointers:: ; 9c30f (27:430f) +HaitekuMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuPokecenter1F.asm b/maps/placeholder/HaitekuPokecenter1F.asm index cc97c3f..91408d3 100644 --- a/maps/placeholder/HaitekuPokecenter1F.asm +++ b/maps/placeholder/HaitekuPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuPokecenter1F.asm", ROMX -HaitekuPokecenter1FScriptLoader:: ; 9c0d4 (27:40d4) +HaitekuPokecenter1FScriptLoader:: ret -HaitekuPokecenter1FTextPointers:: ; 9c0d5 (27:40d5) +HaitekuPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuPokecenter2F.asm b/maps/placeholder/HaitekuPokecenter2F.asm index 6389551..ea67d63 100644 --- a/maps/placeholder/HaitekuPokecenter2F.asm +++ b/maps/placeholder/HaitekuPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuPokecenter2F.asm", ROMX -HaitekuPokecenter2FScriptLoader:: ; 9c14d (27:414d) +HaitekuPokecenter2FScriptLoader:: ret -HaitekuPokecenter2FTextPointers:: ; 9c14e (27:414e) +HaitekuPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuWestRoute.asm b/maps/placeholder/HaitekuWestRoute.asm index 34c8a9d..51ebdc5 100644 --- a/maps/placeholder/HaitekuWestRoute.asm +++ b/maps/placeholder/HaitekuWestRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuWestRoute.asm", ROMX -HaitekuWestRouteScriptLoader:: ; d9dcf (36:5dcf) +HaitekuWestRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/HaitekuWestRouteGate.asm b/maps/placeholder/HaitekuWestRouteGate.asm index 8a0dcb1..460f3a6 100644 --- a/maps/placeholder/HaitekuWestRouteGate.asm +++ b/maps/placeholder/HaitekuWestRouteGate.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuWestRouteGate.asm", ROMX -HaitekuWestRouteGateScriptLoader:: ; 9c040 (27:4040) +HaitekuWestRouteGateScriptLoader:: ret -HaitekuWestRouteGateTextPointers:: ; 9c041 (27:4041) +HaitekuWestRouteGateTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuWestRouteOcean.asm b/maps/placeholder/HaitekuWestRouteOcean.asm index e2a6351..ec4fff3 100644 --- a/maps/placeholder/HaitekuWestRouteOcean.asm +++ b/maps/placeholder/HaitekuWestRouteOcean.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuWestRouteOcean.asm", ROMX -HaitekuWestRouteOceanScriptLoader:: ; d9f15 (36:5f15) +HaitekuWestRouteOceanScriptLoader:: ret db "@" diff --git a/maps/placeholder/Kanto.asm b/maps/placeholder/Kanto.asm index 1aa686a..90d57b6 100644 --- a/maps/placeholder/Kanto.asm +++ b/maps/placeholder/Kanto.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Kanto.asm", ROMX -KantoScriptLoader:: ; d95f1 (36:55f1) +KantoScriptLoader:: ret db "@" diff --git a/maps/placeholder/KantoCeladonElevator.asm b/maps/placeholder/KantoCeladonElevator.asm index 8e94a2f..3978310 100644 --- a/maps/placeholder/KantoCeladonElevator.asm +++ b/maps/placeholder/KantoCeladonElevator.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonElevator.asm", ROMX -KantoCeladonElevatorScriptLoader:: ; 9e764 (27:6764) +KantoCeladonElevatorScriptLoader:: ret -KantoCeladonElevatorTextPointers:: ; 9e765 (27:6765) +KantoCeladonElevatorTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart1F.asm b/maps/placeholder/KantoCeladonMart1F.asm index 96cc18f..fcba348 100644 --- a/maps/placeholder/KantoCeladonMart1F.asm +++ b/maps/placeholder/KantoCeladonMart1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonMart1F.asm", ROMX -KantoCeladonMart1FScriptLoader:: ; 9e52c (27:652c) +KantoCeladonMart1FScriptLoader:: ret -KantoCeladonMart1FTextPointers:: ; 9e52d (27:652d) +KantoCeladonMart1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart2F.asm b/maps/placeholder/KantoCeladonMart2F.asm index ff41e85..f540b05 100644 --- a/maps/placeholder/KantoCeladonMart2F.asm +++ b/maps/placeholder/KantoCeladonMart2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonMart2F.asm", ROMX -KantoCeladonMart2FScriptLoader:: ; 9e5a6 (27:65a6) +KantoCeladonMart2FScriptLoader:: ret -KantoCeladonMart2FTextPointers:: ; 9e5a7 (27:65a7) +KantoCeladonMart2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart3F.asm b/maps/placeholder/KantoCeladonMart3F.asm index adbdb10..1576c0d 100644 --- a/maps/placeholder/KantoCeladonMart3F.asm +++ b/maps/placeholder/KantoCeladonMart3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonMart3F.asm", ROMX -KantoCeladonMart3FScriptLoader:: ; 9e620 (27:6620) +KantoCeladonMart3FScriptLoader:: ret -KantoCeladonMart3FTextPointers:: ; 9e621 (27:6621) +KantoCeladonMart3FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart4F.asm b/maps/placeholder/KantoCeladonMart4F.asm index fb39f9b..b26853e 100644 --- a/maps/placeholder/KantoCeladonMart4F.asm +++ b/maps/placeholder/KantoCeladonMart4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonMart4F.asm", ROMX -KantoCeladonMart4FScriptLoader:: ; 9e6a7 (27:66a7) +KantoCeladonMart4FScriptLoader:: ret -KantoCeladonMart4FTextPointers:: ; 9e6a8 (27:66a8) +KantoCeladonMart4FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart5F.asm b/maps/placeholder/KantoCeladonMart5F.asm index 10f1613..fd3cf58 100644 --- a/maps/placeholder/KantoCeladonMart5F.asm +++ b/maps/placeholder/KantoCeladonMart5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonMart5F.asm", ROMX -KantoCeladonMart5FScriptLoader:: ; 9e727 (27:6727) +KantoCeladonMart5FScriptLoader:: ret -KantoCeladonMart5FTextPointers:: ; 9e728 (27:6728) +KantoCeladonMart5FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeruleanHouse.asm b/maps/placeholder/KantoCeruleanHouse.asm index a2d626a..ac4db75 100644 --- a/maps/placeholder/KantoCeruleanHouse.asm +++ b/maps/placeholder/KantoCeruleanHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeruleanHouse.asm", ROMX -KantoCeruleanHouseScriptLoader:: ; 9e203 (27:6203) +KantoCeruleanHouseScriptLoader:: ret -KantoCeruleanHouseTextPointers:: ; 9e204 (27:6204) +KantoCeruleanHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoDiner.asm b/maps/placeholder/KantoDiner.asm index bc458f9..573ef52 100644 --- a/maps/placeholder/KantoDiner.asm +++ b/maps/placeholder/KantoDiner.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoDiner.asm", ROMX -KantoDinerScriptLoader:: ; 9ed36 (27:6d36) +KantoDinerScriptLoader:: ret -KantoDinerTextPointers:: ; 9ed37 (27:6d37) +KantoDinerTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoEastRoute.asm b/maps/placeholder/KantoEastRoute.asm index 17775ea..370dbb3 100644 --- a/maps/placeholder/KantoEastRoute.asm +++ b/maps/placeholder/KantoEastRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoEastRoute.asm", ROMX -KantoEastRouteScriptLoader:: ; db24b (36:724b) +KantoEastRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/KantoEldersHouse.asm b/maps/placeholder/KantoEldersHouse.asm index cac2c7e..29fbbaf 100644 --- a/maps/placeholder/KantoEldersHouse.asm +++ b/maps/placeholder/KantoEldersHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoEldersHouse.asm", ROMX -KantoEldersHouseScriptLoader:: ; 9f0ca (27:70ca) +KantoEldersHouseScriptLoader:: ret -KantoEldersHouseTextPointers:: ; 9f0cb (27:70cb) +KantoEldersHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoFishingGuru.asm b/maps/placeholder/KantoFishingGuru.asm index 38e5f67..a75885c 100644 --- a/maps/placeholder/KantoFishingGuru.asm +++ b/maps/placeholder/KantoFishingGuru.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoFishingGuru.asm", ROMX -KantoFishingGuruScriptLoader:: ; 9f2bb (27:72bb) +KantoFishingGuruScriptLoader:: ret -KantoFishingGuruTextPointers:: ; 9f2bc (27:72bc) +KantoFishingGuruTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGameCorner.asm b/maps/placeholder/KantoGameCorner.asm index 78ad406..23b2357 100644 --- a/maps/placeholder/KantoGameCorner.asm +++ b/maps/placeholder/KantoGameCorner.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGameCorner.asm", ROMX -KantoGameCornerScriptLoader:: ; 9ec3a (27:6c3a) +KantoGameCornerScriptLoader:: ret -KantoGameCornerTextPointers:: ; 9ec3b (27:6c3b) +KantoGameCornerTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGameCornerPrizes.asm b/maps/placeholder/KantoGameCornerPrizes.asm index f636120..d4a580a 100644 --- a/maps/placeholder/KantoGameCornerPrizes.asm +++ b/maps/placeholder/KantoGameCornerPrizes.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGameCornerPrizes.asm", ROMX -KantoGameCornerPrizesScriptLoader:: ; 9ece9 (27:6ce9) +KantoGameCornerPrizesScriptLoader:: ret -KantoGameCornerPrizesTextPointers:: ; 9ecea (27:6cea) +KantoGameCornerPrizesTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ1.asm b/maps/placeholder/KantoGamefreakHQ1.asm index 941f59c..329b6c0 100644 --- a/maps/placeholder/KantoGamefreakHQ1.asm +++ b/maps/placeholder/KantoGamefreakHQ1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGamefreakHQ1.asm", ROMX -KantoGamefreakHQ1ScriptLoader:: ; 9e87e (27:687e) +KantoGamefreakHQ1ScriptLoader:: ret -KantoGamefreakHQ1TextPointers:: ; 9e87f (27:687f) +KantoGamefreakHQ1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ2.asm b/maps/placeholder/KantoGamefreakHQ2.asm index faa65eb..6f4617d 100644 --- a/maps/placeholder/KantoGamefreakHQ2.asm +++ b/maps/placeholder/KantoGamefreakHQ2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGamefreakHQ2.asm", ROMX -KantoGamefreakHQ2ScriptLoader:: ; 9e8ea (27:68ea) +KantoGamefreakHQ2ScriptLoader:: ret -KantoGamefreakHQ2TextPointers:: ; 9e8eb (27:68eb) +KantoGamefreakHQ2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ3.asm b/maps/placeholder/KantoGamefreakHQ3.asm index 2fac35b..2307240 100644 --- a/maps/placeholder/KantoGamefreakHQ3.asm +++ b/maps/placeholder/KantoGamefreakHQ3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGamefreakHQ3.asm", ROMX -KantoGamefreakHQ3ScriptLoader:: ; 9e970 (27:6970) +KantoGamefreakHQ3ScriptLoader:: ret -KantoGamefreakHQ3TextPointers:: ; 9e971 (27:6971) +KantoGamefreakHQ3TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ4.asm b/maps/placeholder/KantoGamefreakHQ4.asm index 3f70570..ff2b22e 100644 --- a/maps/placeholder/KantoGamefreakHQ4.asm +++ b/maps/placeholder/KantoGamefreakHQ4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGamefreakHQ4.asm", ROMX -KantoGamefreakHQ4ScriptLoader:: ; 9e9c8 (27:69c8) +KantoGamefreakHQ4ScriptLoader:: ret -KantoGamefreakHQ4TextPointers:: ; 9e9c9 (27:69c9) +KantoGamefreakHQ4TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ5.asm b/maps/placeholder/KantoGamefreakHQ5.asm index aaafd57..fc2e11e 100644 --- a/maps/placeholder/KantoGamefreakHQ5.asm +++ b/maps/placeholder/KantoGamefreakHQ5.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGamefreakHQ5.asm", ROMX -KantoGamefreakHQ5ScriptLoader:: ; 9ea11 (27:6a11) +KantoGamefreakHQ5ScriptLoader:: ret -KantoGamefreakHQ5TextPointers:: ; 9ea12 (27:6a12) +KantoGamefreakHQ5TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGreensHouse1F.asm b/maps/placeholder/KantoGreensHouse1F.asm index 83616bb..eaf5171 100644 --- a/maps/placeholder/KantoGreensHouse1F.asm +++ b/maps/placeholder/KantoGreensHouse1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGreensHouse1F.asm", ROMX -KantoGreensHouse1FScriptLoader:: ; 9f021 (27:7021) +KantoGreensHouse1FScriptLoader:: ret -KantoGreensHouse1FTextPointers:: ; 9f022 (27:7022) +KantoGreensHouse1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGreensHouse2F.asm b/maps/placeholder/KantoGreensHouse2F.asm index 94a7d81..67715fe 100644 --- a/maps/placeholder/KantoGreensHouse2F.asm +++ b/maps/placeholder/KantoGreensHouse2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGreensHouse2F.asm", ROMX -KantoGreensHouse2FScriptLoader:: ; 9f063 (27:7063) +KantoGreensHouse2FScriptLoader:: ret -KantoGreensHouse2FTextPointers:: ; 9f064 (27:7064) +KantoGreensHouse2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoHospital.asm b/maps/placeholder/KantoHospital.asm index ec711de..9b8f8f4 100644 --- a/maps/placeholder/KantoHospital.asm +++ b/maps/placeholder/KantoHospital.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoHospital.asm", ROMX -KantoHospitalScriptLoader:: ; 9ee50 (27:6e50) +KantoHospitalScriptLoader:: ret -KantoHospitalTextPointers:: ; 9ee51 (27:6e51) +KantoHospitalTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoLavenderHouse.asm b/maps/placeholder/KantoLavenderHouse.asm index f616024..c440b6e 100644 --- a/maps/placeholder/KantoLavenderHouse.asm +++ b/maps/placeholder/KantoLavenderHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoLavenderHouse.asm", ROMX -KantoLavenderHouseScriptLoader:: ; 9e4b8 (27:64b8) +KantoLavenderHouseScriptLoader:: ret -KantoLavenderHouseTextPointers:: ; 9e4b9 (27:64b9) +KantoLavenderHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoLeague1F.asm b/maps/placeholder/KantoLeague1F.asm index b051d2b..98208e4 100644 --- a/maps/placeholder/KantoLeague1F.asm +++ b/maps/placeholder/KantoLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoLeague1F.asm", ROMX -KantoLeague1FScriptLoader:: ; 9e3b1 (27:63b1) +KantoLeague1FScriptLoader:: ret -KantoLeague1FTextPointers:: ; 9e3b2 (27:63b2) +KantoLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoLeague21F.asm b/maps/placeholder/KantoLeague21F.asm index 0162f5e..65d8379 100644 --- a/maps/placeholder/KantoLeague21F.asm +++ b/maps/placeholder/KantoLeague21F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoLeague21F.asm", ROMX -KantoLeague21FScriptLoader:: ; 9f1c1 (27:71c1) +KantoLeague21FScriptLoader:: ret -KantoLeague21FTextPointers:: ; 9f1c2 (27:71c2) +KantoLeague21FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoLeague22F.asm b/maps/placeholder/KantoLeague22F.asm index 520e800..2b1ef47 100644 --- a/maps/placeholder/KantoLeague22F.asm +++ b/maps/placeholder/KantoLeague22F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoLeague22F.asm", ROMX -KantoLeague22FScriptLoader:: ; 9f261 (27:7261) +KantoLeague22FScriptLoader:: ret -KantoLeague22FTextPointers:: ; 9f262 (27:7262) +KantoLeague22FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoLeague2F.asm b/maps/placeholder/KantoLeague2F.asm index 72dfd5d..ea2b121 100644 --- a/maps/placeholder/KantoLeague2F.asm +++ b/maps/placeholder/KantoLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoLeague2F.asm", ROMX -KantoLeague2FScriptLoader:: ; 9e451 (27:6451) +KantoLeague2FScriptLoader:: ret -KantoLeague2FTextPointers:: ; 9e452 (27:6452) +KantoLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoMart.asm b/maps/placeholder/KantoMart.asm index d004b04..8878e4a 100644 --- a/maps/placeholder/KantoMart.asm +++ b/maps/placeholder/KantoMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoMart.asm", ROMX -KantoMartScriptLoader:: ; 9e7e4 (27:67e4) +KantoMartScriptLoader:: ret -KantoMartTextPointers:: ; 9e7e5 (27:67e5) +KantoMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoOaksLab.asm b/maps/placeholder/KantoOaksLab.asm index 077e4b0..a57ac46 100644 --- a/maps/placeholder/KantoOaksLab.asm +++ b/maps/placeholder/KantoOaksLab.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoOaksLab.asm", ROMX -KantoOaksLabScriptLoader:: ; 9f120 (27:7120) +KantoOaksLabScriptLoader:: ret -KantoOaksLabTextPointers:: ; 9f121 (27:7121) +KantoOaksLabTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter1F.asm b/maps/placeholder/KantoPokecenter1F.asm index 961fe67..58c73ef 100644 --- a/maps/placeholder/KantoPokecenter1F.asm +++ b/maps/placeholder/KantoPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoPokecenter1F.asm", ROMX -KantoPokecenter1FScriptLoader:: ; 9e297 (27:6297) +KantoPokecenter1FScriptLoader:: ret -KantoPokecenter1FTextPointers:: ; 9e298 (27:6298) +KantoPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter21F.asm b/maps/placeholder/KantoPokecenter21F.asm index 9f776e3..542cbe4 100644 --- a/maps/placeholder/KantoPokecenter21F.asm +++ b/maps/placeholder/KantoPokecenter21F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoPokecenter21F.asm", ROMX -KantoPokecenter21FScriptLoader:: ; 9eee4 (27:6ee4) +KantoPokecenter21FScriptLoader:: ret -KantoPokecenter21FTextPointers:: ; 9eee5 (27:6ee5) +KantoPokecenter21FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter22F.asm b/maps/placeholder/KantoPokecenter22F.asm index 4220aee..d29357a 100644 --- a/maps/placeholder/KantoPokecenter22F.asm +++ b/maps/placeholder/KantoPokecenter22F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoPokecenter22F.asm", ROMX -KantoPokecenter22FScriptLoader:: ; 9ef5d (27:6f5d) +KantoPokecenter22FScriptLoader:: ret -KantoPokecenter22FTextPointers:: ; 9ef5e (27:6f5e) +KantoPokecenter22FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter2F.asm b/maps/placeholder/KantoPokecenter2F.asm index d9f03d0..9800129 100644 --- a/maps/placeholder/KantoPokecenter2F.asm +++ b/maps/placeholder/KantoPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoPokecenter2F.asm", ROMX -KantoPokecenter2FScriptLoader:: ; 9e310 (27:6310) +KantoPokecenter2FScriptLoader:: ret -KantoPokecenter2FTextPointers:: ; 9e311 (27:6311) +KantoPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoRedsHouse.asm b/maps/placeholder/KantoRedsHouse.asm index 1aec64d..13c479c 100644 --- a/maps/placeholder/KantoRedsHouse.asm +++ b/maps/placeholder/KantoRedsHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoRedsHouse.asm", ROMX -KantoRedsHouseScriptLoader:: ; 9efc4 (27:6fc4) +KantoRedsHouseScriptLoader:: ret -KantoRedsHouseTextPointers:: ; 9efc5 (27:6fc5) +KantoRedsHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoSchool.asm b/maps/placeholder/KantoSchool.asm index 9053e21..3477b1e 100644 --- a/maps/placeholder/KantoSchool.asm +++ b/maps/placeholder/KantoSchool.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoSchool.asm", ROMX -KantoSchoolScriptLoader:: ; 9edd0 (27:6dd0) +KantoSchoolScriptLoader:: ret -KantoSchoolTextPointers:: ; 9edd1 (27:6dd1) +KantoSchoolTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoSilphCo.asm b/maps/placeholder/KantoSilphCo.asm index 4cbe780..3d19d1e 100644 --- a/maps/placeholder/KantoSilphCo.asm +++ b/maps/placeholder/KantoSilphCo.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoSilphCo.asm", ROMX -KantoSilphCoScriptLoader:: ; 9eac4 (27:6ac4) +KantoSilphCoScriptLoader:: ret -KantoSilphCoTextPointers:: ; 9eac5 (27:6ac5) +KantoSilphCoTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoUnusedArea.asm b/maps/placeholder/KantoUnusedArea.asm index 7b5a07e..c69df11 100644 --- a/maps/placeholder/KantoUnusedArea.asm +++ b/maps/placeholder/KantoUnusedArea.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoUnusedArea.asm", ROMX -KantoUnusedAreaScriptLoader:: ; 9ec75 (27:6c75) +KantoUnusedAreaScriptLoader:: ret -KantoUnusedAreaTextPointers:: ; 9ec76 (27:6c76) +KantoUnusedAreaTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoViridianHouse.asm b/maps/placeholder/KantoViridianHouse.asm index 5d70660..381042d 100644 --- a/maps/placeholder/KantoViridianHouse.asm +++ b/maps/placeholder/KantoViridianHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoViridianHouse.asm", ROMX -KantoViridianHouseScriptLoader:: ; 9eb2b (27:6b2b) +KantoViridianHouseScriptLoader:: ret -KantoViridianHouseTextPointers:: ; 9eb2c (27:6b2c) +KantoViridianHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/MtFuji.asm b/maps/placeholder/MtFuji.asm index 0998279..adc354a 100644 --- a/maps/placeholder/MtFuji.asm +++ b/maps/placeholder/MtFuji.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/MtFuji.asm", ROMX -MtFujiScriptLoader:: ; d96ed (36:56ed) +MtFujiScriptLoader:: ret db "@" diff --git a/maps/placeholder/MtFujiRoute.asm b/maps/placeholder/MtFujiRoute.asm index 53f5031..2103337 100644 --- a/maps/placeholder/MtFujiRoute.asm +++ b/maps/placeholder/MtFujiRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/MtFujiRoute.asm", ROMX -MtFujiRouteScriptLoader:: ; db442 (36:7442) +MtFujiRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/Newtype.asm b/maps/placeholder/Newtype.asm index 8befb80..f13018d 100644 --- a/maps/placeholder/Newtype.asm +++ b/maps/placeholder/Newtype.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Newtype.asm", ROMX -NewtypeScriptLoader:: ; d8c38 (36:4c38) +NewtypeScriptLoader:: ret db "@" diff --git a/maps/placeholder/NewtypeDiner.asm b/maps/placeholder/NewtypeDiner.asm index 0be3f5d..783a718 100644 --- a/maps/placeholder/NewtypeDiner.asm +++ b/maps/placeholder/NewtypeDiner.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeDiner.asm", ROMX -NewtypeDinerScriptLoader:: ; 9d211 (27:5211) +NewtypeDinerScriptLoader:: ret -NewtypeDinerTextPointers:: ; 9d212 (27:5212) +NewtypeDinerTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeDojo.asm b/maps/placeholder/NewtypeDojo.asm index 165e210..6ce2743 100644 --- a/maps/placeholder/NewtypeDojo.asm +++ b/maps/placeholder/NewtypeDojo.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeDojo.asm", ROMX -NewtypeDojoScriptLoader:: ; 9d13a (27:513a) +NewtypeDojoScriptLoader:: ret -NewtypeDojoTextPointers:: ; 9d13b (27:513b) +NewtypeDojoTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeHouse1.asm b/maps/placeholder/NewtypeHouse1.asm index 3c0be72..4dc930f 100644 --- a/maps/placeholder/NewtypeHouse1.asm +++ b/maps/placeholder/NewtypeHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeHouse1.asm", ROMX -NewtypeHouse1ScriptLoader:: ; 9d194 (27:5194) +NewtypeHouse1ScriptLoader:: ret -NewtypeHouse1TextPointers:: ; 9d195 (27:5195) +NewtypeHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeHouse2.asm b/maps/placeholder/NewtypeHouse2.asm index e9bdc91..e348e28 100644 --- a/maps/placeholder/NewtypeHouse2.asm +++ b/maps/placeholder/NewtypeHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeHouse2.asm", ROMX -NewtypeHouse2ScriptLoader:: ; 9d26b (27:526b) +NewtypeHouse2ScriptLoader:: ret -NewtypeHouse2TextPointers:: ; 9d26c (27:526c) +NewtypeHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeHouse3.asm b/maps/placeholder/NewtypeHouse3.asm index f10260f..1ac4b19 100644 --- a/maps/placeholder/NewtypeHouse3.asm +++ b/maps/placeholder/NewtypeHouse3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeHouse3.asm", ROMX -NewtypeHouse3ScriptLoader:: ; 9d2c5 (27:52c5) +NewtypeHouse3ScriptLoader:: ret -NewtypeHouse3TextPointers:: ; 9d2c6 (27:52c6) +NewtypeHouse3TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeLeague1F.asm b/maps/placeholder/NewtypeLeague1F.asm index 3660e32..fc9bfa5 100644 --- a/maps/placeholder/NewtypeLeague1F.asm +++ b/maps/placeholder/NewtypeLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeLeague1F.asm", ROMX -NewtypeLeague1FScriptLoader:: ; 9cf26 (27:4f26) +NewtypeLeague1FScriptLoader:: ret -NewtypeLeague1FTextPointers:: ; 9cf27 (27:4f27) +NewtypeLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeLeague2F.asm b/maps/placeholder/NewtypeLeague2F.asm index cd27b73..0fc1764 100644 --- a/maps/placeholder/NewtypeLeague2F.asm +++ b/maps/placeholder/NewtypeLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeLeague2F.asm", ROMX -NewtypeLeague2FScriptLoader:: ; 9cfc6 (27:4fc6) +NewtypeLeague2FScriptLoader:: ret -NewtypeLeague2FTextPointers:: ; 9cfc7 (27:4fc7) +NewtypeLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeMart.asm b/maps/placeholder/NewtypeMart.asm index 400628d..00d7ab1 100644 --- a/maps/placeholder/NewtypeMart.asm +++ b/maps/placeholder/NewtypeMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeMart.asm", ROMX -NewtypeMartScriptLoader:: ; 9d0a0 (27:50a0) +NewtypeMartScriptLoader:: ret -NewtypeMartTextPointers:: ; 9d0a1 (27:50a1) +NewtypeMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypePokecenter1F.asm b/maps/placeholder/NewtypePokecenter1F.asm index 2964b15..172a8dc 100644 --- a/maps/placeholder/NewtypePokecenter1F.asm +++ b/maps/placeholder/NewtypePokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypePokecenter1F.asm", ROMX -NewtypePokecenter1FScriptLoader:: ; 9ce0c (27:4e0c) +NewtypePokecenter1FScriptLoader:: ret -NewtypePokecenter1FTextPointers:: ; 9ce0d (27:4e0d) +NewtypePokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypePokecenter2F.asm b/maps/placeholder/NewtypePokecenter2F.asm index e79a350..50f8b74 100644 --- a/maps/placeholder/NewtypePokecenter2F.asm +++ b/maps/placeholder/NewtypePokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypePokecenter2F.asm", ROMX -NewtypePokecenter2FScriptLoader:: ; 9ce85 (27:4e85) +NewtypePokecenter2FScriptLoader:: ret -NewtypePokecenter2FTextPointers:: ; 9ce86 (27:4e86) +NewtypePokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeRoute.asm b/maps/placeholder/NewtypeRoute.asm index e9e6eeb..5e49dd4 100644 --- a/maps/placeholder/NewtypeRoute.asm +++ b/maps/placeholder/NewtypeRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeRoute.asm", ROMX -NewtypeRouteScriptLoader:: ; daa6c (36:6a6c) +NewtypeRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/NewtypeRouteGate.asm b/maps/placeholder/NewtypeRouteGate.asm index 209213d..506003c 100644 --- a/maps/placeholder/NewtypeRouteGate.asm +++ b/maps/placeholder/NewtypeRouteGate.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeRouteGate.asm", ROMX -NewtypeRouteGateScriptLoader:: ; 9d406 (27:5406) +NewtypeRouteGateScriptLoader:: ret -NewtypeRouteGateTextPointers:: ; 9d407 (27:5407) +NewtypeRouteGateTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeSailorHouse.asm b/maps/placeholder/NewtypeSailorHouse.asm index a1052a9..25464fd 100644 --- a/maps/placeholder/NewtypeSailorHouse.asm +++ b/maps/placeholder/NewtypeSailorHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeSailorHouse.asm", ROMX -NewtypeSailorHouseScriptLoader:: ; 9d020 (27:5020) +NewtypeSailorHouseScriptLoader:: ret -NewtypeSailorHouseTextPointers:: ; 9d021 (27:5021) +NewtypeSailorHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/North.asm b/maps/placeholder/North.asm index e5d56a2..6ed8795 100644 --- a/maps/placeholder/North.asm +++ b/maps/placeholder/North.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/North.asm", ROMX -NorthScriptLoader:: ; d99dd (36:59dd) +NorthScriptLoader:: ret db "@" diff --git a/maps/placeholder/NorthHouse1.asm b/maps/placeholder/NorthHouse1.asm index c03412c..5533904 100644 --- a/maps/placeholder/NorthHouse1.asm +++ b/maps/placeholder/NorthHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NorthHouse1.asm", ROMX -NorthHouse1ScriptLoader:: ; 9f556 (27:7556) +NorthHouse1ScriptLoader:: ret -NorthHouse1TextPointers:: ; 9f557 (27:7557) +NorthHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NorthHouse2.asm b/maps/placeholder/NorthHouse2.asm index 72c576a..de016ba 100644 --- a/maps/placeholder/NorthHouse2.asm +++ b/maps/placeholder/NorthHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NorthHouse2.asm", ROMX -NorthHouse2ScriptLoader:: ; 9f630 (27:7630) +NorthHouse2ScriptLoader:: ret -NorthHouse2TextPointers:: ; 9f631 (27:7631) +NorthHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NorthMart.asm b/maps/placeholder/NorthMart.asm index b650193..383c905 100644 --- a/maps/placeholder/NorthMart.asm +++ b/maps/placeholder/NorthMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NorthMart.asm", ROMX -NorthMartScriptLoader:: ; 9f5d6 (27:75d6) +NorthMartScriptLoader:: ret -NorthMartTextPointers:: ; 9f5d7 (27:75d7) +NorthMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NorthPokecenter1F.asm b/maps/placeholder/NorthPokecenter1F.asm index 85f6bd7..d8352a5 100644 --- a/maps/placeholder/NorthPokecenter1F.asm +++ b/maps/placeholder/NorthPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NorthPokecenter1F.asm", ROMX -NorthPokecenter1FScriptLoader:: ; 9f6c4 (27:76c4) +NorthPokecenter1FScriptLoader:: ret -NorthPokecenter1FTextPointers:: ; 9f6c5 (27:76c5) +NorthPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NorthPokecenter2F.asm b/maps/placeholder/NorthPokecenter2F.asm index add721e..968a288 100644 --- a/maps/placeholder/NorthPokecenter2F.asm +++ b/maps/placeholder/NorthPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NorthPokecenter2F.asm", ROMX -NorthPokecenter2FScriptLoader:: ; 9f73d (27:773d) +NorthPokecenter2FScriptLoader:: ret -NorthPokecenter2FTextPointers:: ; 9f73e (27:773e) +NorthPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Office1.asm b/maps/placeholder/Office1.asm index e3b1cf0..2ff6830 100644 --- a/maps/placeholder/Office1.asm +++ b/maps/placeholder/Office1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Office1.asm", ROMX -Office1ScriptLoader:: ; bd06e (2f:506e) +Office1ScriptLoader:: ret -Office1TextPointers:: ; bd06f (2f:506f) +Office1TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/Office2.asm b/maps/placeholder/Office2.asm index 492d897..59cc8e3 100644 --- a/maps/placeholder/Office2.asm +++ b/maps/placeholder/Office2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Office2.asm", ROMX -Office2ScriptLoader:: ; bd19f (2f:519f) +Office2ScriptLoader:: ret -Office2TextPointers:: ; bd1a0 (2f:51a0) +Office2TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/Office3.asm b/maps/placeholder/Office3.asm index 88af96b..62a014e 100644 --- a/maps/placeholder/Office3.asm +++ b/maps/placeholder/Office3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Office3.asm", ROMX -Office3ScriptLoader:: ; bd276 (2f:5276) +Office3ScriptLoader:: ret -Office3TextPointers:: ; bd277 (2f:5277) +Office3TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/OldCity.asm b/maps/placeholder/OldCity.asm index 4584065..dfe8f1d 100644 --- a/maps/placeholder/OldCity.asm +++ b/maps/placeholder/OldCity.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCity.asm", ROMX -OldCityScriptLoader:: ; d8370 (36:4370) +OldCityScriptLoader:: ret db "@" diff --git a/maps/placeholder/OldCityBillsHouse.asm b/maps/placeholder/OldCityBillsHouse.asm index 239ea58..61d4b41 100644 --- a/maps/placeholder/OldCityBillsHouse.asm +++ b/maps/placeholder/OldCityBillsHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityBillsHouse.asm", ROMX -OldCityBillsHouseScriptLoader:: ; 9454f (25:454f) +OldCityBillsHouseScriptLoader:: ret -OldCityBillsHouseTextPointers:: ; 94550 (25:4550) +OldCityBillsHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityGym.asm b/maps/placeholder/OldCityGym.asm index 18e3c0b..d34f8a5 100644 --- a/maps/placeholder/OldCityGym.asm +++ b/maps/placeholder/OldCityGym.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityGym.asm", ROMX -OldCityGymScriptLoader:: ; 9426e (25:426e) +OldCityGymScriptLoader:: ret -OldCityGymTextPointers:: ; 9426f (25:426f) +OldCityGymTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityHouse.asm b/maps/placeholder/OldCityHouse.asm index 0f1c9c8..d723f61 100644 --- a/maps/placeholder/OldCityHouse.asm +++ b/maps/placeholder/OldCityHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityHouse.asm", ROMX -OldCityHouseScriptLoader:: ; 94653 (25:4653) +OldCityHouseScriptLoader:: ret -OldCityHouseTextPointers:: ; 94654 (25:4654) +OldCityHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityKurtsHouse.asm b/maps/placeholder/OldCityKurtsHouse.asm index 9291c8c..0609384 100644 --- a/maps/placeholder/OldCityKurtsHouse.asm +++ b/maps/placeholder/OldCityKurtsHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityKurtsHouse.asm", ROMX -OldCityKurtsHouseScriptLoader:: ; 94a0b (25:4a0b) +OldCityKurtsHouseScriptLoader:: ret -OldCityKurtsHouseTextPointers:: ; 94a0c (25:4a0c) +OldCityKurtsHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityMart.asm b/maps/placeholder/OldCityMart.asm index 9770dd0..3472f8b 100644 --- a/maps/placeholder/OldCityMart.asm +++ b/maps/placeholder/OldCityMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityMart.asm", ROMX -OldCityMartScriptLoader:: ; 945d3 (25:45d3) +OldCityMartScriptLoader:: ret -OldCityMartTextPointers:: ; 945d4 (25:45d4) +OldCityMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityMuseum.asm b/maps/placeholder/OldCityMuseum.asm index f344580..e4222ff 100644 --- a/maps/placeholder/OldCityMuseum.asm +++ b/maps/placeholder/OldCityMuseum.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityMuseum.asm", ROMX -OldCityMuseumScriptLoader:: ; 941b2 (25:41b2) +OldCityMuseumScriptLoader:: ret -OldCityMuseumTextPointers:: ; 941b3 (25:41b3) +OldCityMuseumTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityPokecenter1F.asm b/maps/placeholder/OldCityPokecenter1F.asm index 95d8795..541b975 100644 --- a/maps/placeholder/OldCityPokecenter1F.asm +++ b/maps/placeholder/OldCityPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityPokecenter1F.asm", ROMX -OldCityPokecenter1FScriptLoader:: ; 946eb (25:46eb) +OldCityPokecenter1FScriptLoader:: ret -OldCityPokecenter1FTextPointers:: ; 946ec (25:46ec) +OldCityPokecenter1FTextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/OldCitySchool.asm b/maps/placeholder/OldCitySchool.asm index e5a09b4..dc6bae1 100644 --- a/maps/placeholder/OldCitySchool.asm +++ b/maps/placeholder/OldCitySchool.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCitySchool.asm", ROMX -OldCitySchoolScriptLoader:: ; 94ac2 (25:4ac2) +OldCitySchoolScriptLoader:: ret -OldCitySchoolTextPointers:: ; 94ac3 (25:4ac3) +OldCitySchoolTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityTower1F.asm b/maps/placeholder/OldCityTower1F.asm index c627a23..2c149ab 100644 --- a/maps/placeholder/OldCityTower1F.asm +++ b/maps/placeholder/OldCityTower1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityTower1F.asm", ROMX -OldCityTower1FScriptLoader:: ; 942fe (25:42fe) +OldCityTower1FScriptLoader:: ret -OldCityTower1FTextPointers:: ; 942ff (25:42ff) +OldCityTower1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityTower2F.asm b/maps/placeholder/OldCityTower2F.asm index 21e4ada..c18dc79 100644 --- a/maps/placeholder/OldCityTower2F.asm +++ b/maps/placeholder/OldCityTower2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityTower2F.asm", ROMX -OldCityTower2FScriptLoader:: ; 94383 (25:4383) +OldCityTower2FScriptLoader:: ret -OldCityTower2FTextPointers:: ; 94384 (25:4384) +OldCityTower2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityTower3F.asm b/maps/placeholder/OldCityTower3F.asm index 473ee38..4045ed1 100644 --- a/maps/placeholder/OldCityTower3F.asm +++ b/maps/placeholder/OldCityTower3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityTower3F.asm", ROMX -OldCityTower3FScriptLoader:: ; 94408 (25:4408) +OldCityTower3FScriptLoader:: ret -OldCityTower3FTextPointers:: ; 94409 (25:4409) +OldCityTower3FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityTower4F.asm b/maps/placeholder/OldCityTower4F.asm index 7a67ac0..4419576 100644 --- a/maps/placeholder/OldCityTower4F.asm +++ b/maps/placeholder/OldCityTower4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityTower4F.asm", ROMX -OldCityTower4FScriptLoader:: ; 9448d (25:448d) +OldCityTower4FScriptLoader:: ret -OldCityTower4FTextPointers:: ; 9448e (25:448e) +OldCityTower4FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityTower5F.asm b/maps/placeholder/OldCityTower5F.asm index 607ebf0..dc682dc 100644 --- a/maps/placeholder/OldCityTower5F.asm +++ b/maps/placeholder/OldCityTower5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityTower5F.asm", ROMX -OldCityTower5FScriptLoader:: ; 944e1 (25:44e1) +OldCityTower5FScriptLoader:: ret -OldCityTower5FTextPointers:: ; 944e2 (25:44e2) +OldCityTower5FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/PowerPlant1.asm b/maps/placeholder/PowerPlant1.asm index 9344c72..5ce600c 100644 --- a/maps/placeholder/PowerPlant1.asm +++ b/maps/placeholder/PowerPlant1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/PowerPlant1.asm", ROMX -PowerPlant1ScriptLoader:: ; bc06a (2f:406a) +PowerPlant1ScriptLoader:: ret -PowerPlant1TextPointers:: ; bc06b (2f:406b) +PowerPlant1TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/PowerPlant2.asm b/maps/placeholder/PowerPlant2.asm index 91e7fa1..d3df908 100644 --- a/maps/placeholder/PowerPlant2.asm +++ b/maps/placeholder/PowerPlant2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/PowerPlant2.asm", ROMX -PowerPlant2ScriptLoader:: ; bc0e7 (2f:40e7) +PowerPlant2ScriptLoader:: ret -PowerPlant2TextPointers:: ; bc0e8 (2f:40e8) +PowerPlant2TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/PowerPlant3.asm b/maps/placeholder/PowerPlant3.asm index ee99c69..9b0b2c9 100644 --- a/maps/placeholder/PowerPlant3.asm +++ b/maps/placeholder/PowerPlant3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/PowerPlant3.asm", ROMX -PowerPlant3ScriptLoader:: ; bc218 (2f:4218) +PowerPlant3ScriptLoader:: ret -PowerPlant3TextPointers:: ; bc219 (2f:4219) +PowerPlant3TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/PowerPlant4.asm b/maps/placeholder/PowerPlant4.asm index b63ba7d..694d930 100644 --- a/maps/placeholder/PowerPlant4.asm +++ b/maps/placeholder/PowerPlant4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/PowerPlant4.asm", ROMX -PowerPlant4ScriptLoader:: ; bc349 (2f:4349) +PowerPlant4ScriptLoader:: ret -PowerPlant4TextPointers:: ; bc34a (2f:434a) +PowerPlant4TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/Prince.asm b/maps/placeholder/Prince.asm index 549b093..6992faf 100644 --- a/maps/placeholder/Prince.asm +++ b/maps/placeholder/Prince.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Prince.asm", ROMX -PrinceScriptLoader:: ; d9675 (36:5675) +PrinceScriptLoader:: ret db "@" diff --git a/maps/placeholder/PrinceRoute.asm b/maps/placeholder/PrinceRoute.asm index 08d6c3b..6bc474a 100644 --- a/maps/placeholder/PrinceRoute.asm +++ b/maps/placeholder/PrinceRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/PrinceRoute.asm", ROMX -PrinceRouteScriptLoader:: ; db3e6 (36:73e6) +PrinceRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/Route15.asm b/maps/placeholder/Route15.asm index 92cf6f2..dcd7f79 100644 --- a/maps/placeholder/Route15.asm +++ b/maps/placeholder/Route15.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route15.asm", ROMX -Route15ScriptLoader:: ; da9bb (36:69bb) +Route15ScriptLoader:: ret db "@" diff --git a/maps/placeholder/Route15Pokecenter1F.asm b/maps/placeholder/Route15Pokecenter1F.asm index da370e0..5937ecd 100644 --- a/maps/placeholder/Route15Pokecenter1F.asm +++ b/maps/placeholder/Route15Pokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route15Pokecenter1F.asm", ROMX -Route15Pokecenter1FScriptLoader:: ; 9d359 (27:5359) +Route15Pokecenter1FScriptLoader:: ret -Route15Pokecenter1FTextPointers:: ; 9d35a (27:535a) +Route15Pokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route15Pokecenter2F.asm b/maps/placeholder/Route15Pokecenter2F.asm index bc2e299..5fca638 100644 --- a/maps/placeholder/Route15Pokecenter2F.asm +++ b/maps/placeholder/Route15Pokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route15Pokecenter2F.asm", ROMX -Route15Pokecenter2FScriptLoader:: ; 9d3ab (27:53ab) +Route15Pokecenter2FScriptLoader:: ret -Route15Pokecenter2FTextPointers:: ; 9d3ac (27:53ac) +Route15Pokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route18.asm b/maps/placeholder/Route18.asm index aad03a2..aed82e5 100644 --- a/maps/placeholder/Route18.asm +++ b/maps/placeholder/Route18.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route18.asm", ROMX -Route18ScriptLoader:: ; dac6d (36:6c6d) +Route18ScriptLoader:: ret db "@" diff --git a/maps/placeholder/Route18Pokecenter1F.asm b/maps/placeholder/Route18Pokecenter1F.asm index f81be4b..667ba35 100644 --- a/maps/placeholder/Route18Pokecenter1F.asm +++ b/maps/placeholder/Route18Pokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route18Pokecenter1F.asm", ROMX -Route18Pokecenter1FScriptLoader:: ; 9d49a (27:549a) +Route18Pokecenter1FScriptLoader:: ret -Route18Pokecenter1FTextPointers:: ; 9d49b (27:549b) +Route18Pokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route18Pokecenter2F.asm b/maps/placeholder/Route18Pokecenter2F.asm index fdc5399..8194fa3 100644 --- a/maps/placeholder/Route18Pokecenter2F.asm +++ b/maps/placeholder/Route18Pokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route18Pokecenter2F.asm", ROMX -Route18Pokecenter2FScriptLoader:: ; 9d4ec (27:54ec) +Route18Pokecenter2FScriptLoader:: ret -Route18Pokecenter2FTextPointers:: ; 9d4ed (27:54ed) +Route18Pokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route2.asm b/maps/placeholder/Route2.asm index ad6914d..50fecb6 100644 --- a/maps/placeholder/Route2.asm +++ b/maps/placeholder/Route2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route2.asm", ROMX -Route2ScriptLoader:: ; d9cc4 (36:5cc4) +Route2ScriptLoader:: ret db "@" diff --git a/maps/placeholder/Route2Gate1F.asm b/maps/placeholder/Route2Gate1F.asm index e03b7a2..cd878e3 100644 --- a/maps/placeholder/Route2Gate1F.asm +++ b/maps/placeholder/Route2Gate1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route2Gate1F.asm", ROMX -Route2Gate1FScriptLoader:: ; 94061 (25:4061) +Route2Gate1FScriptLoader:: ret -Route2Gate1FTextPointers:: ; 94062 (25:4062) +Route2Gate1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route2Gate2F.asm b/maps/placeholder/Route2Gate2F.asm index b5cbd23..08fe259 100644 --- a/maps/placeholder/Route2Gate2F.asm +++ b/maps/placeholder/Route2Gate2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route2Gate2F.asm", ROMX -Route2Gate2FScriptLoader:: ; 940c1 (25:40c1) +Route2Gate2FScriptLoader:: ret -Route2Gate2FTextPointers:: ; 940c2 (25:40c2) +Route2Gate2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route2House.asm b/maps/placeholder/Route2House.asm index d4c1fd9..447aa1b 100644 --- a/maps/placeholder/Route2House.asm +++ b/maps/placeholder/Route2House.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route2House.asm", ROMX -Route2HouseScriptLoader:: ; 9412f (25:412f) +Route2HouseScriptLoader:: ret -Route2HouseTextPointers:: ; 94130 (25:4130) +Route2HouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/RouteSilentEast.asm b/maps/placeholder/RouteSilentEast.asm index b2acf96..0619bb3 100644 --- a/maps/placeholder/RouteSilentEast.asm +++ b/maps/placeholder/RouteSilentEast.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/RouteSilentEast.asm", ROMX -RouteSilentEastScriptLoader:: ; db38a (36:738a) +RouteSilentEastScriptLoader:: ret db "@" diff --git a/maps/placeholder/RouteSilentEastGate.asm b/maps/placeholder/RouteSilentEastGate.asm index 52914ba..7b08936 100644 --- a/maps/placeholder/RouteSilentEastGate.asm +++ b/maps/placeholder/RouteSilentEastGate.asm @@ -2,8 +2,8 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/RouteSilentEastGate.asm", ROMX -RouteSilentEastGateScriptLoader:: ; d0040 (34:4040) +RouteSilentEastGateScriptLoader:: ret -RouteSilentEastGateTextPointers:: ; d0041 (34:4041) +RouteSilentEastGateTextPointers:: db "@" diff --git a/maps/placeholder/RuinsOfAlphEntrance.asm b/maps/placeholder/RuinsOfAlphEntrance.asm index a2d9ba3..c8f0262 100644 --- a/maps/placeholder/RuinsOfAlphEntrance.asm +++ b/maps/placeholder/RuinsOfAlphEntrance.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/RuinsOfAlphEntrance.asm", ROMX -RuinsOfAlphEntranceScriptLoader:: ; bc3c6 (2f:43c6) +RuinsOfAlphEntranceScriptLoader:: ret -RuinsOfAlphEntranceTextPointers:: ; bc3c7 (2f:43c7) +RuinsOfAlphEntranceTextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/RuinsOfAlphMain.asm b/maps/placeholder/RuinsOfAlphMain.asm index 40c7161..fc2ec97 100644 --- a/maps/placeholder/RuinsOfAlphMain.asm +++ b/maps/placeholder/RuinsOfAlphMain.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/RuinsOfAlphMain.asm", ROMX -RuinsOfAlphMainScriptLoader:: ; bc68c (2f:468c) +RuinsOfAlphMainScriptLoader:: ret -RuinsOfAlphMainTextPointers:: ; bc68d (2f:468d) +RuinsOfAlphMainTextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/SlowpokeWellEntrance.asm b/maps/placeholder/SlowpokeWellEntrance.asm index a59c886..2cec405 100644 --- a/maps/placeholder/SlowpokeWellEntrance.asm +++ b/maps/placeholder/SlowpokeWellEntrance.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SlowpokeWellEntrance.asm", ROMX -SlowpokeWellEntranceScriptLoader:: ; bd2f3 (2f:52f3) +SlowpokeWellEntranceScriptLoader:: ret -SlowpokeWellEntranceTextPointers:: ; bd2f4 (2f:52f4) +SlowpokeWellEntranceTextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/SlowpokeWellMain.asm b/maps/placeholder/SlowpokeWellMain.asm index 88d913a..c660806 100644 --- a/maps/placeholder/SlowpokeWellMain.asm +++ b/maps/placeholder/SlowpokeWellMain.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SlowpokeWellMain.asm", ROMX -SlowpokeWellMainScriptLoader:: ; bd3ca (2f:53ca) +SlowpokeWellMainScriptLoader:: ret -SlowpokeWellMainTextPointers:: ; bd3cb (2f:53cb) +SlowpokeWellMainTextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/South.asm b/maps/placeholder/South.asm index fdd841d..b10b4d6 100644 --- a/maps/placeholder/South.asm +++ b/maps/placeholder/South.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/South.asm", ROMX -SouthScriptLoader:: ; d9912 (36:5912) +SouthScriptLoader:: ret db "@" diff --git a/maps/placeholder/SouthHouse1.asm b/maps/placeholder/SouthHouse1.asm index ac331ed..28b1fc5 100644 --- a/maps/placeholder/SouthHouse1.asm +++ b/maps/placeholder/SouthHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SouthHouse1.asm", ROMX -SouthHouse1ScriptLoader:: ; 9f315 (27:7315) +SouthHouse1ScriptLoader:: ret -SouthHouse1TextPointers:: ; 9f316 (27:7316) +SouthHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SouthHouse2.asm b/maps/placeholder/SouthHouse2.asm index d53c009..d61d59f 100644 --- a/maps/placeholder/SouthHouse2.asm +++ b/maps/placeholder/SouthHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SouthHouse2.asm", ROMX -SouthHouse2ScriptLoader:: ; 9f4fc (27:74fc) +SouthHouse2ScriptLoader:: ret -SouthHouse2TextPointers:: ; 9f4fd (27:74fd) +SouthHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SouthMart.asm b/maps/placeholder/SouthMart.asm index 4211890..0f291e3 100644 --- a/maps/placeholder/SouthMart.asm +++ b/maps/placeholder/SouthMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SouthMart.asm", ROMX -SouthMartScriptLoader:: ; 9f4a2 (27:74a2) +SouthMartScriptLoader:: ret -SouthMartTextPointers:: ; 9f4a3 (27:74a3) +SouthMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SouthPokecenter1F.asm b/maps/placeholder/SouthPokecenter1F.asm index 6ec73c9..1d00af3 100644 --- a/maps/placeholder/SouthPokecenter1F.asm +++ b/maps/placeholder/SouthPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SouthPokecenter1F.asm", ROMX -SouthPokecenter1FScriptLoader:: ; 9f3a9 (27:73a9) +SouthPokecenter1FScriptLoader:: ret -SouthPokecenter1FTextPointers:: ; 9f3aa (27:73aa) +SouthPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SouthPokecenter2F.asm b/maps/placeholder/SouthPokecenter2F.asm index 3016edf..0f70709 100644 --- a/maps/placeholder/SouthPokecenter2F.asm +++ b/maps/placeholder/SouthPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SouthPokecenter2F.asm", ROMX -SouthPokecenter2FScriptLoader:: ; 9f422 (27:7422) +SouthPokecenter2FScriptLoader:: ret -SouthPokecenter2FTextPointers:: ; 9f423 (27:7423) +SouthPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Stand.asm b/maps/placeholder/Stand.asm index cda74ae..35e23fb 100644 --- a/maps/placeholder/Stand.asm +++ b/maps/placeholder/Stand.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Stand.asm", ROMX -StandScriptLoader:: ; d919b (36:519b) +StandScriptLoader:: ret db "@" diff --git a/maps/placeholder/StandHouse.asm b/maps/placeholder/StandHouse.asm index d42599e..0935bed 100644 --- a/maps/placeholder/StandHouse.asm +++ b/maps/placeholder/StandHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandHouse.asm", ROMX -StandHouseScriptLoader:: ; 9df9c (27:5f9c) +StandHouseScriptLoader:: ret -StandHouseTextPointers:: ; 9df9d (27:5f9d) +StandHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandLab.asm b/maps/placeholder/StandLab.asm index 8a169ac..757d33f 100644 --- a/maps/placeholder/StandLab.asm +++ b/maps/placeholder/StandLab.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandLab.asm", ROMX -StandLabScriptLoader:: ; 9dd35 (27:5d35) +StandLabScriptLoader:: ret -StandLabTextPointers:: ; 9dd36 (27:5d36) +StandLabTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandLeague1F.asm b/maps/placeholder/StandLeague1F.asm index ffc3622..1ca2713 100644 --- a/maps/placeholder/StandLeague1F.asm +++ b/maps/placeholder/StandLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandLeague1F.asm", ROMX -StandLeague1FScriptLoader:: ; 9e109 (27:6109) +StandLeague1FScriptLoader:: ret -StandLeague1FTextPointers:: ; 9e10a (27:610a) +StandLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandLeague2F.asm b/maps/placeholder/StandLeague2F.asm index d910c0e..a361c1a 100644 --- a/maps/placeholder/StandLeague2F.asm +++ b/maps/placeholder/StandLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandLeague2F.asm", ROMX -StandLeague2FScriptLoader:: ; 9e1a9 (27:61a9) +StandLeague2FScriptLoader:: ret -StandLeague2FTextPointers:: ; 9e1aa (27:61aa) +StandLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandMart.asm b/maps/placeholder/StandMart.asm index e042540..3e56cf0 100644 --- a/maps/placeholder/StandMart.asm +++ b/maps/placeholder/StandMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandMart.asm", ROMX -StandMartScriptLoader:: ; 9df42 (27:5f42) +StandMartScriptLoader:: ret -StandMartTextPointers:: ; 9df43 (27:5f43) +StandMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandOffice.asm b/maps/placeholder/StandOffice.asm index 3b7b334..fa7f28f 100644 --- a/maps/placeholder/StandOffice.asm +++ b/maps/placeholder/StandOffice.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandOffice.asm", ROMX -StandOfficeScriptLoader:: ; 9dec2 (27:5ec2) +StandOfficeScriptLoader:: ret -StandOfficeTextPointers:: ; 9dec3 (27:5ec3) +StandOfficeTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandPokecenter1F.asm b/maps/placeholder/StandPokecenter1F.asm index 0601293..ea0e71b 100644 --- a/maps/placeholder/StandPokecenter1F.asm +++ b/maps/placeholder/StandPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandPokecenter1F.asm", ROMX -StandPokecenter1FScriptLoader:: ; 9ddc9 (27:5dc9) +StandPokecenter1FScriptLoader:: ret -StandPokecenter1FTextPointers:: ; 9ddca (27:5dca) +StandPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandPokecenter2F.asm b/maps/placeholder/StandPokecenter2F.asm index 350995b..9914a00 100644 --- a/maps/placeholder/StandPokecenter2F.asm +++ b/maps/placeholder/StandPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandPokecenter2F.asm", ROMX -StandPokecenter2FScriptLoader:: ; 9de42 (27:5e42) +StandPokecenter2FScriptLoader:: ret -StandPokecenter2FTextPointers:: ; 9de43 (27:5e43) +StandPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandRocketHouse1F.asm b/maps/placeholder/StandRocketHouse1F.asm index 094f417..c8463ab 100644 --- a/maps/placeholder/StandRocketHouse1F.asm +++ b/maps/placeholder/StandRocketHouse1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandRocketHouse1F.asm", ROMX -StandRocketHouse1FScriptLoader:: ; 9e009 (27:6009) +StandRocketHouse1FScriptLoader:: ret -StandRocketHouse1FTextPointers:: ; 9e00a (27:600a) +StandRocketHouse1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandRocketHouse2F.asm b/maps/placeholder/StandRocketHouse2F.asm index a285fec..65e7163 100644 --- a/maps/placeholder/StandRocketHouse2F.asm +++ b/maps/placeholder/StandRocketHouse2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandRocketHouse2F.asm", ROMX -StandRocketHouse2FScriptLoader:: ; 9e068 (27:6068) +StandRocketHouse2FScriptLoader:: ret -StandRocketHouse2FTextPointers:: ; 9e069 (27:6069) +StandRocketHouse2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandRoute.asm b/maps/placeholder/StandRoute.asm index 23704d9..1bee368 100644 --- a/maps/placeholder/StandRoute.asm +++ b/maps/placeholder/StandRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandRoute.asm", ROMX -StandRouteScriptLoader:: ; db15f (36:715f) +StandRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/StandRouteGateKanto.asm b/maps/placeholder/StandRouteGateKanto.asm index 2b407bf..2458e38 100644 --- a/maps/placeholder/StandRouteGateKanto.asm +++ b/maps/placeholder/StandRouteGateKanto.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandRouteGateKanto.asm", ROMX -StandRouteGateKantoScriptLoader:: ; 9dcdf (27:5cdf) +StandRouteGateKantoScriptLoader:: ret -StandRouteGateKantoTextPointers:: ; 9dce0 (27:5ce0) +StandRouteGateKantoTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Sugar.asm b/maps/placeholder/Sugar.asm index 9ef42ad..d191b39 100644 --- a/maps/placeholder/Sugar.asm +++ b/maps/placeholder/Sugar.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Sugar.asm", ROMX -SugarScriptLoader:: ; d8d03 (36:4d03) +SugarScriptLoader:: ret db "@" diff --git a/maps/placeholder/SugarHouse.asm b/maps/placeholder/SugarHouse.asm index 5646c4c..d85a5ad 100644 --- a/maps/placeholder/SugarHouse.asm +++ b/maps/placeholder/SugarHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarHouse.asm", ROMX -SugarHouseScriptLoader:: ; 9d5c7 (27:55c7) +SugarHouseScriptLoader:: ret -SugarHouseTextPointers:: ; 9d5c8 (27:55c8) +SugarHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SugarHouse2.asm b/maps/placeholder/SugarHouse2.asm index 172475e..b6cfde5 100644 --- a/maps/placeholder/SugarHouse2.asm +++ b/maps/placeholder/SugarHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarHouse2.asm", ROMX -SugarHouse2ScriptLoader:: ; 9d61d (27:561d) +SugarHouse2ScriptLoader:: ret -SugarHouse2TextPointers:: ; 9d61e (27:561e) +SugarHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SugarMart.asm b/maps/placeholder/SugarMart.asm index 148d7c8..8e78179 100644 --- a/maps/placeholder/SugarMart.asm +++ b/maps/placeholder/SugarMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarMart.asm", ROMX -SugarMartScriptLoader:: ; 9d69d (27:569d) +SugarMartScriptLoader:: ret -SugarMartTextPointers:: ; 9d69e (27:569e) +SugarMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SugarPokecenter1F.asm b/maps/placeholder/SugarPokecenter1F.asm index bb252d9..0e84e9b 100644 --- a/maps/placeholder/SugarPokecenter1F.asm +++ b/maps/placeholder/SugarPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarPokecenter1F.asm", ROMX -SugarPokecenter1FScriptLoader:: ; 9d731 (27:5731) +SugarPokecenter1FScriptLoader:: ret -SugarPokecenter1FTextPointers:: ; 9d732 (27:5732) +SugarPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SugarPokecenter2F.asm b/maps/placeholder/SugarPokecenter2F.asm index 8c1c352..56af19e 100644 --- a/maps/placeholder/SugarPokecenter2F.asm +++ b/maps/placeholder/SugarPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarPokecenter2F.asm", ROMX -SugarPokecenter2FScriptLoader:: ; 9d7aa (27:57aa) +SugarPokecenter2FScriptLoader:: ret -SugarPokecenter2FTextPointers:: ; 9d7ab (27:57ab) +SugarPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SugarRoute.asm b/maps/placeholder/SugarRoute.asm index fd1f4ed..4263c39 100644 --- a/maps/placeholder/SugarRoute.asm +++ b/maps/placeholder/SugarRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarRoute.asm", ROMX -SugarRouteScriptLoader:: ; daed3 (36:6ed3) +SugarRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/SugarRouteGate.asm b/maps/placeholder/SugarRouteGate.asm index 0273915..b2c5ac1 100644 --- a/maps/placeholder/SugarRouteGate.asm +++ b/maps/placeholder/SugarRouteGate.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarRouteGate.asm", ROMX -SugarRouteGateScriptLoader:: ; 9d547 (27:5547) +SugarRouteGateScriptLoader:: ret -SugarRouteGateTextPointers:: ; 9d548 (27:5548) +SugarRouteGateTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/West.asm b/maps/placeholder/West.asm index e11aa0c..3e68abb 100644 --- a/maps/placeholder/West.asm +++ b/maps/placeholder/West.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/West.asm", ROMX -WestScriptLoader:: ; d85d0 (36:45d0) +WestScriptLoader:: ret db "@" diff --git a/maps/placeholder/WestGym.asm b/maps/placeholder/WestGym.asm index 42ed936..9304b95 100644 --- a/maps/placeholder/WestGym.asm +++ b/maps/placeholder/WestGym.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestGym.asm", ROMX -WestGymScriptLoader:: ; 98bff (26:4bff) +WestGymScriptLoader:: ret -WestGymTextPointers:: ; 98c00 (26:4c00) +WestGymTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestHouse1.asm b/maps/placeholder/WestHouse1.asm index 55bd778..51076bb 100644 --- a/maps/placeholder/WestHouse1.asm +++ b/maps/placeholder/WestHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestHouse1.asm", ROMX -WestHouse1ScriptLoader:: ; 98c83 (26:4c83) +WestHouse1ScriptLoader:: ret -WestHouse1TextPointers:: ; 98c84 (26:4c84) +WestHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestHouse2.asm b/maps/placeholder/WestHouse2.asm index 7dbc478..ec744e0 100644 --- a/maps/placeholder/WestHouse2.asm +++ b/maps/placeholder/WestHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestHouse2.asm", ROMX -WestHouse2ScriptLoader:: ; 98d07 (26:4d07) +WestHouse2ScriptLoader:: ret -WestHouse2TextPointers:: ; 98d08 (26:4d08) +WestHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart1F.asm b/maps/placeholder/WestMart1F.asm index 0a6b9fa..67bdecc 100644 --- a/maps/placeholder/WestMart1F.asm +++ b/maps/placeholder/WestMart1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart1F.asm", ROMX -WestMart1FScriptLoader:: ; 98285 (26:4285) +WestMart1FScriptLoader:: ret -WestMart1FTextPointers:: ; 98286 (26:4286) +WestMart1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart2F.asm b/maps/placeholder/WestMart2F.asm index 0b82f67..1b3f4f2 100644 --- a/maps/placeholder/WestMart2F.asm +++ b/maps/placeholder/WestMart2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart2F.asm", ROMX -WestMart2FScriptLoader:: ; 98359 (26:4359) +WestMart2FScriptLoader:: ret -WestMart2FTextPointers:: ; 9835a (26:435a) +WestMart2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart3F.asm b/maps/placeholder/WestMart3F.asm index dfcc913..59c9db0 100644 --- a/maps/placeholder/WestMart3F.asm +++ b/maps/placeholder/WestMart3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart3F.asm", ROMX -WestMart3FScriptLoader:: ; 98418 (26:4418) +WestMart3FScriptLoader:: ret -WestMart3FTextPointers:: ; 98419 (26:4419) +WestMart3FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart4F.asm b/maps/placeholder/WestMart4F.asm index 9e4397a..774c4bc 100644 --- a/maps/placeholder/WestMart4F.asm +++ b/maps/placeholder/WestMart4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart4F.asm", ROMX -WestMart4FScriptLoader:: ; 984d7 (26:44d7) +WestMart4FScriptLoader:: ret -WestMart4FTextPointers:: ; 984d8 (26:44d8) +WestMart4FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart5F.asm b/maps/placeholder/WestMart5F.asm index eecf821..dd7ef9d 100644 --- a/maps/placeholder/WestMart5F.asm +++ b/maps/placeholder/WestMart5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart5F.asm", ROMX -WestMart5FScriptLoader:: ; 98566 (26:4566) +WestMart5FScriptLoader:: ret -WestMart5FTextPointers:: ; 98567 (26:4567) +WestMart5FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart6F.asm b/maps/placeholder/WestMart6F.asm index 5c07dbe..639cdee 100644 --- a/maps/placeholder/WestMart6F.asm +++ b/maps/placeholder/WestMart6F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart6F.asm", ROMX -WestMart6FScriptLoader:: ; 985f3 (26:45f3) +WestMart6FScriptLoader:: ret -WestMart6FTextPointers:: ; 985f4 (26:45f4) +WestMart6FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMartElevator.asm b/maps/placeholder/WestMartElevator.asm index df838e1..934b0ab 100644 --- a/maps/placeholder/WestMartElevator.asm +++ b/maps/placeholder/WestMartElevator.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMartElevator.asm", ROMX -WestMartElevatorScriptLoader:: ; 98630 (26:4630) +WestMartElevatorScriptLoader:: ret -WestMartElevatorTextPointers:: ; 98631 (26:4631) +WestMartElevatorTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestPokecenter1F.asm b/maps/placeholder/WestPokecenter1F.asm index 4909508..73d450c 100644 --- a/maps/placeholder/WestPokecenter1F.asm +++ b/maps/placeholder/WestPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestPokecenter1F.asm", ROMX -WestPokecenter1FScriptLoader:: ; 98ac6 (26:4ac6) +WestPokecenter1FScriptLoader:: ret -WestPokecenter1FTextPointers:: ; 98ac7 (26:4ac7) +WestPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestPokecenter2F.asm b/maps/placeholder/WestPokecenter2F.asm index b218dbc..4e75832 100644 --- a/maps/placeholder/WestPokecenter2F.asm +++ b/maps/placeholder/WestPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestPokecenter2F.asm", ROMX -WestPokecenter2FScriptLoader:: ; 98b43 (26:4b43) +WestPokecenter2FScriptLoader:: ret -WestPokecenter2FTextPointers:: ; 98b44 (26:4b44) +WestPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower1F.asm b/maps/placeholder/WestRadioTower1F.asm index 032723c..f5c8f44 100644 --- a/maps/placeholder/WestRadioTower1F.asm +++ b/maps/placeholder/WestRadioTower1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRadioTower1F.asm", ROMX -WestRadioTower1FScriptLoader:: ; 986af (26:46af) +WestRadioTower1FScriptLoader:: ret -WestRadioTower1FTextPointers:: ; 986b0 (26:46b0) +WestRadioTower1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower2F.asm b/maps/placeholder/WestRadioTower2F.asm index 336b600..033e158 100644 --- a/maps/placeholder/WestRadioTower2F.asm +++ b/maps/placeholder/WestRadioTower2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRadioTower2F.asm", ROMX -WestRadioTower2FScriptLoader:: ; 98757 (26:4757) +WestRadioTower2FScriptLoader:: ret -WestRadioTower2FTextPointers:: ; 98758 (26:4758) +WestRadioTower2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower3F.asm b/maps/placeholder/WestRadioTower3F.asm index b5277f9..fb10e52 100644 --- a/maps/placeholder/WestRadioTower3F.asm +++ b/maps/placeholder/WestRadioTower3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRadioTower3F.asm", ROMX -WestRadioTower3FScriptLoader:: ; 9880c (26:480c) +WestRadioTower3FScriptLoader:: ret -WestRadioTower3FTextPointers:: ; 9880d (26:480d) +WestRadioTower3FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower4F.asm b/maps/placeholder/WestRadioTower4F.asm index 706d738..19bb085 100644 --- a/maps/placeholder/WestRadioTower4F.asm +++ b/maps/placeholder/WestRadioTower4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRadioTower4F.asm", ROMX -WestRadioTower4FScriptLoader:: ; 988ce (26:48ce) +WestRadioTower4FScriptLoader:: ret -WestRadioTower4FTextPointers:: ; 988cf (26:48cf) +WestRadioTower4FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower5F.asm b/maps/placeholder/WestRadioTower5F.asm index b3686dc..09f8cc7 100644 --- a/maps/placeholder/WestRadioTower5F.asm +++ b/maps/placeholder/WestRadioTower5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRadioTower5F.asm", ROMX -WestRadioTower5FScriptLoader:: ; 98984 (26:4984) +WestRadioTower5FScriptLoader:: ret -WestRadioTower5FTextPointers:: ; 98985 (26:4985) +WestRadioTower5FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRocketRaidedHouse.asm b/maps/placeholder/WestRocketRaidedHouse.asm index a05c0ae..06f2ec2 100644 --- a/maps/placeholder/WestRocketRaidedHouse.asm +++ b/maps/placeholder/WestRocketRaidedHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRocketRaidedHouse.asm", ROMX -WestRocketRaidedHouseScriptLoader:: ; 98a2e (26:4a2e) +WestRocketRaidedHouseScriptLoader:: ret -WestRocketRaidedHouseTextPointers:: ; 98a2f (26:4a2f) +WestRocketRaidedHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText |