diff options
| -rw-r--r-- | maps/OldCityPokecenter2F.asm | 89 | ||||
| -rw-r--r-- | maps/OldCityPokecenterBattle.asm | 45 | ||||
| -rw-r--r-- | maps/OldCityPokecenterTimeMachine.asm | 37 | ||||
| -rw-r--r-- | maps/OldCityPokecenterTrade.asm | 47 | ||||
| -rw-r--r-- | pokegold-spaceworld.link | 8 | ||||
| -rwxr-xr-x | shim.sym | 16 |
6 files changed, 228 insertions, 14 deletions
diff --git a/maps/OldCityPokecenter2F.asm b/maps/OldCityPokecenter2F.asm new file mode 100644 index 0000000..b2ed2c7 --- /dev/null +++ b/maps/OldCityPokecenter2F.asm @@ -0,0 +1,89 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityPokecenter2F.asm", ROMX + +OldCityPokecenter2FScriptLoader: ; 25:4782 + call Unreferenced_Function7e6 + ld hl, OldCityPokecenter2FScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +OldCityPokecenter2FScriptPointers: ; 25:478f + dw OldCityPokecenter2FScript1 + dw OldCityPokecenter2FNPCIds + +OldCityPokecenter2FScript1: ; 25:4793 + ld hl, OldCityPokecenter2FNPCIds + ld de, OldCityPokecenter2FSignPointers + call CallMapTextSubroutine + ret + +OldCityPokecenter2FNPCIds: ; 25:479d + db $00, $01, $02, $03, $ff + +OldCityPokecenter2FSignPointers: ; 25:47a2 + dw MapDefaultText + +OldCityPokecenter2FTextPointers: ; 25:47a4 + dw OldCityPokecenter2FText1 + dw OldCityPokecenter2FText2 + dw OldCityPokecenter2FText3 + dw OldCityPokecenter2FText4 + +OldCityPokecenter2FText1: ; 25:47ac + ld a, $01 + ld [wce37], a + ld hl, wJoypadFlags + set 5, [hl] + callab Function29abf + ld hl, wJoypadFlags + res 5, [hl] + ret + +OldCityPokecenter2FText2: ; 25:47c4 + ld a, $02 + ld [wce37], a + ld hl, wJoypadFlags + set 5, [hl] + callab Function29abf + ld hl, wJoypadFlags + res 5, [hl] + ret + +OldCityPokecenter2FText3: ; 25:47dc + ld hl, Text947e3 + call OpenTextbox + ret + +Text947e3: ; 25:47e3 + text "おりゃ！" + done + +OldCityPokecenter2FText4: ; 25:47e9 + ld hl, OldCityPokecenter2FTextString4 + call OpenTextbox + callab Function29a1f + jr c, .asm_9480c + ld a, $05 + call Function169f ; something related to follow + jr .asm_9480c +; unreferenced? + ld hl, Data14824 + ld a, $5 + call Function16fb + ld hl, $0000 + nop +.asm_9480c + ret + +OldCityPokecenter2FTextString4: ; 25:480d + text "うしろにあるのは" + line "タイムマシンです" + done + +; 25:4820 + db $05, $25, $24, $48 + +Data14824: ; movement data + db $07, $32 diff --git a/maps/OldCityPokecenterBattle.asm b/maps/OldCityPokecenterBattle.asm new file mode 100644 index 0000000..a2a1bb0 --- /dev/null +++ b/maps/OldCityPokecenterBattle.asm @@ -0,0 +1,45 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityPokecenterBattle.asm", ROMX + +OldCityPokecenterBattleScriptLoader: ; 25:48eb + ld hl, OldCityPokecenterBattleScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +OldCityPokecenterBattleScriptPointers: ; 25:48f5 + dw OldCityPokecenterBattleScript1 + dw OldCityPokecenterBattleNPCIds + +OldCityPokecenterBattleScript1: ; 25:48f9 + ld hl, OldCityPokecenterBattleNPCIds + ld de, OldCityPokecenterBattleSignPointers + call CallMapTextSubroutine + ret + +OldCityPokecenterBattleNPCIds: ; 25:4903 + db $00, $ff + +OldCityPokecenterBattleSignPointers: ; 25:4905 + dw MapDefaultText + +OldCityPokecenterBattleTextPointers: ; 25:4907 + dw OldCityPokecenterBattleText1 + +OldCityPokecenterBattleText1: ; 25:4909 + ld hl, wJoypadFlags + set 5, [hl] + ld hl, OldCityPokecenterBattleTextString1 + call OpenTextbox + ld hl, wJoypadFlags + res 5, [hl] + callab Function28000 + ret + +OldCityPokecenterBattleTextString1: ; 25:4922 + text "ちょっとまってね！@" + text_exit + db "@" + +; 25:492f diff --git a/maps/OldCityPokecenterTimeMachine.asm b/maps/OldCityPokecenterTimeMachine.asm new file mode 100644 index 0000000..5694775 --- /dev/null +++ b/maps/OldCityPokecenterTimeMachine.asm @@ -0,0 +1,37 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityPokecenterTimeMachine.asm", ROMX + +OldCityPokecenterTimeMachineScriptLoader: ; 25:497e + call Unreferenced_Function7e6 + ld hl, OldCityPokecenterTimeMachineScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +OldCityPokecenterTimeMachineScriptPointers: ; 25:498b + dw OldCityPokecenterTimeMachineScript1 + dw OldCityPokecenterTimeMachineNPCIds + +OldCityPokecenterTimeMachineScript1: ; 25:498f + ld hl, OldCityPokecenterTimeMachineNPCIds + ld de, OldCityPokecenterTimeMachineSignPointers + call CallMapTextSubroutine + ret + +OldCityPokecenterTimeMachineNPCIds: ; 25:4999 + db $00, $ff + +OldCityPokecenterTimeMachineSignPointers: ; 25:499b + dw MapDefaultText + +OldCityPokecenterTimeMachineTextPointers: ; 25:499d + dw OldCityPokecenterTimeMachineText1 + +OldCityPokecenterTimeMachineText1: ; 25:499f + xor a + ld [wce37], a + callab Function29abf + ret + +; 25:49ac diff --git a/maps/OldCityPokecenterTrade.asm b/maps/OldCityPokecenterTrade.asm new file mode 100644 index 0000000..e131339 --- /dev/null +++ b/maps/OldCityPokecenterTrade.asm @@ -0,0 +1,47 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityPokecenterTrade.asm", ROMX + +OldCityPokecenterTradeScriptLoader: ; 25:4866 + ld hl, OldCityPokecenterTradeScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +OldCityPokecenterTradeScriptPointers: ; 25:4870 + dw OldCityPokecenterTradeScript1 + dw OldCityPokecenterTradeNPCIds + +OldCityPokecenterTradeScript1: ; 25:4874 + ld hl, OldCityPokecenterTradeNPCIds + ld de, OldCityPokecenterTradeSignPointers + call CallMapTextSubroutine + ret + +OldCityPokecenterTradeNPCIds: ; 25:487e + db $00, $ff + +OldCityPokecenterTradeSignPointers: ; 25:4880 + dw MapDefaultText + +OldCityPokecenterTradeTextPointers: ; 25:4882 + dw OldCityPokecenterTradeText1 + +OldCityPokecenterTradeText1: ; 25:4884 + ld hl, wJoypadFlags + set 5, [hl] + ld hl, OldCityPokecenterTradeTextString1 + call OpenTextbox + ld hl, wJoypadFlags + res 5, [hl] + callab Function28000 + ret + +OldCityPokecenterTradeTextString1: ; 25:489d + text "ちょっとまってね！@" + text_exit + text_exit + text_exit + db "@" + +; 25:48ac diff --git a/pokegold-spaceworld.link b/pokegold-spaceworld.link index d5c8324..650c64f 100644 --- a/pokegold-spaceworld.link +++ b/pokegold-spaceworld.link @@ -414,13 +414,13 @@ ROMX $25 "data/maps/attributes/placeholder/OldCityPokecenter1F.asm" "maps/placeholder/OldCityPokecenter1F.asm" "data/maps/attributes/OldCityPokecenter2F.asm" - org $4826 + "maps/OldCityPokecenter2F.asm" "data/maps/attributes/OldCityPokecenterTrade.asm" - org $48ac + "maps/OldCityPokecenterTrade.asm" "data/maps/attributes/OldCityPokecenterBattle.asm" - org $492f + "maps/OldCityPokecenterBattle.asm" "data/maps/attributes/OldCityPokecenterTimeMachine.asm" - org $49ac + "maps/OldCityPokecenterTimeMachine.asm" "data/maps/attributes/placeholder/OldCityKurtsHouse.asm" "maps/placeholder/OldCityKurtsHouse.asm" "data/maps/attributes/placeholder/OldCitySchool.asm" @@ -24,6 +24,7 @@ 05:470E UnknownMapBufferPointers 05:4777 Function14777 05:477D Function1477D +05:4824 Function14824 05:4CAC Function14cac 05:4DAC Function14dac 05:4DC4 Function14dc4 @@ -47,9 +48,14 @@ 09:4955 Function24955 09:4C60 Function24c60 +; all these probably print text +0A:4000 Function28000 0A:4C98 LinkTextboxAtHL 0A:4D6E Function28d6e 0A:4DA4 Function28da4 +0A:5A1F Function29a1f ; prints text +0A:5ABF Function29abf ; prints text + 0B:52FC Function2d2fc 0B:5663 Function2d663 @@ -177,13 +183,3 @@ 3F:6750 PicTestMenu 3F:6755 PicTestMenu.loop 3F:67A1 CallSubGameMenu - -; Maps -25:47A4 OldCityPokecenter2FTextPointers -25:4782 OldCityPokecenter2FScriptLoader -25:4882 OldCityPokecenterTradeTextPointers -25:4866 OldCityPokecenterTradeScriptLoader -25:4907 OldCityPokecenterBattleTextPointers -25:48EB OldCityPokecenterBattleScriptLoader -25:499D OldCityPokecenterTimeMachineTextPointers -25:497E OldCityPokecenterTimeMachineScriptLoader
\ No newline at end of file |