diff options
Diffstat (limited to 'maps')
68 files changed, 720 insertions, 88 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 475835442..ecfa62f21 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -4,7 +4,7 @@ BattleTower1F_MapScriptHeader: ; 0x9e393 ; triggers dw UnknownScript_0x9e39d, $0000 - dw $63d3, $0000 + dw UnknownScript_0x9e3d3, $0000 ; callback count db 0 @@ -39,6 +39,7 @@ UnknownScript_0x9e3c7: ; 0x9e3c7 special $0086 UnknownScript_0x9e3d1: ; 0x9e3d1 dotrigger $1 +UnknownScript_0x9e3d3: ; 0x9e3d3 end ; 0x9e3d4 @@ -57,7 +58,7 @@ UnknownScript_0x9e3e0: ; 0x9e3e0 UnknownScript_0x9e3e2: ; 0x9e3e2 writebyte $2 special $0086 - if_equal $3, $74e4 ; wtf ? + if_equal $3, BattleTowerBattleRoomScript_0x9f4e4 loadfont 2writetext UnknownText_0x9e5ab keeptextopen @@ -119,7 +120,7 @@ UnknownScript_0x9e454: ; 0x9e454 warpsound disappear $2 stopfollow - applymovement $0, $6576 + applymovement $0, MovementData_0x9e576 warpcheck end ; 0x9e47a @@ -177,9 +178,21 @@ UnknownScript_0x9e4bb: ; 0x9e4bb end ; 0x9e4be -INCBIN "baserom.gbc",$9e4be,$9e4e4 - $9e4be -UnknownScript_0x9e4e4: ; 0x9e4e4 +UnknownScript_0x9e4be: ; 0x9e4be + 2writetext UnknownText_0x9ef1f + yesorno + iffalse UnknownScript_0x9e3fc + special $0004 + iffalse UnknownScript_0x9e3fc + writebyte $1 + special $0086 + special $0075 + if_equal $a, UnknownScript_0x9e3fc + if_not_equal $0, UnknownScript_0x9e550 + 2writetext UnknownText_0x9e9eb + spriteface $2, $2 + 2writetext UnknownText_0x9ea1b closetext spriteface $2, $0 loadmovesprites @@ -282,6 +295,7 @@ MovementData_0x9e571: ; 0x9e571 step_up step_up step_up +MovementData_0x9e576: ; 0x9e576 step_up step_end ; 0x9e578 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 06755369f..8297da4f2 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -108,6 +108,7 @@ UnknownScript_0x9f4d9: ; 0x9f4d9 pause 60 special $002f warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 +BattleTowerBattleRoomScript_0x9f4e4: ; 0x9f4e4 loadfont 2writetext UnknownText_0x9eaef 2jump UnknownScript_0x9e47a @@ -136,7 +137,12 @@ UnknownScript_0x9f4f7: ; 0x9f4f7 end ; 0x9f50b -INCBIN "baserom.gbc",$9f50b,$9f52e-$9f50b + +UnknownText_0x9f50b: ; 0x9f50b + db $0, "You'll be returned", $4f + db "after you SAVE.", $57 +; 0x9f52e + BattleTowerBattleRoom_MapEventHeader: ; 0x9f52e ; filler diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 172e5f0f7..dd74470a7 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -21,11 +21,25 @@ UnknownScript_0x9f5c0: ; 0x9f5c0 UnknownScript_0x9f5c1: ; 0x9f5c1 follow $2, $0 - 3callasm $27, $75cb + 3callasm BANK(Function_0x9f5cb), Function_0x9f5cb 2jump UnknownScript_0x9f5dc ; 0x9f5cb -INCBIN "baserom.gbc",$9f5cb,$9f5dc - $9f5cb + +Function_0x9f5cb: ; 0x9f5cb + ld a, [rSVBK] + push af + + ld a, 3 + ld [rSVBK], a + ld a, [$d800] + ld [ScriptVar], a + + pop af + ld [rSVBK], a + ret +; 0x9f5dc + UnknownScript_0x9f5dc: ; 0x9f5dc if_equal $3, UnknownScript_0x9f603 diff --git a/maps/BetaAlphRuinUnsolvedPuzzleRoom.blk b/maps/BetaAlphRuinUnsolvedPuzzleRoom.blk new file mode 100644 index 000000000..a3aa06bd6 --- /dev/null +++ b/maps/BetaAlphRuinUnsolvedPuzzleRoom.blk @@ -0,0 +1 @@ +
,+
\ No newline at end of file diff --git a/maps/BetaAzaleaTown.blk b/maps/BetaAzaleaTown.blk new file mode 100644 index 000000000..8faa18369 --- /dev/null +++ b/maps/BetaAzaleaTown.blk @@ -0,0 +1,10 @@ +aaaaaaaaFDaaaaaaaaaaaaaaaaaFDaaaaaaaaaaaaaaaaaFHIIaaaaaaBaaaFaaaaaa FaFaaaHJGFee>aacaaaFaaaadeefaaaaFGbaaaaaaaaFDaaaaaaaFaaDaU +aaaaaaaHIY +aaaaaaa~zU +aaaaaaa5Y +aaaaa@AAAA5z +vvvUaaaaaaaaaaa552955zvvvvvvvvvv +aa55551111111111111 + +a555555555555555552 +a
\ No newline at end of file diff --git a/maps/BetaBlackthornCity.blk b/maps/BetaBlackthornCity.blk new file mode 100644 index 000000000..c6fc4f210 --- /dev/null +++ b/maps/BetaBlackthornCity.blk @@ -0,0 +1 @@ +hqqqqqqqqqqqqqqqqqqqhqorrrrrrrrrnqqqqqqqhqiaKeWaKeWahqqqqqqqhqieKaWWWaeWhqorrnqqhqiaWWKWeaWehqi !hqqhqiKWWeeaWWahqi$%hqqhqieKeaWWeeehqi$%hqqhqiaKaWeeWaahqi$%hqqlrmKeWWaWeWahqi()hqqKaWKaWaeWlrmtuhqqWWWWWWKaWWWWWWhqqhqqlrrG
\ No newline at end of file diff --git a/maps/BetaBlank.blk b/maps/BetaBlank.blk new file mode 100644 index 000000000..e53405655 --- /dev/null +++ b/maps/BetaBlank.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/BetaCave.blk b/maps/BetaCave.blk new file mode 100644 index 000000000..b103c2532 --- /dev/null +++ b/maps/BetaCave.blk @@ -0,0 +1,8 @@ +
+ + + + + + +
\ No newline at end of file diff --git a/maps/BetaCave2.blk b/maps/BetaCave2.blk new file mode 100644 index 000000000..a2722d010 --- /dev/null +++ b/maps/BetaCave2.blk @@ -0,0 +1,5 @@ +
+(+ +)* + +
\ No newline at end of file diff --git a/maps/BetaCaveTestMap.blk b/maps/BetaCaveTestMap.blk new file mode 100644 index 000000000..eba6c84c8 --- /dev/null +++ b/maps/BetaCaveTestMap.blk @@ -0,0 +1,18 @@ +
+;< ; 6< + + 589: + + + + + 5
+ +
+ + 5
+ +
+ + 5
6 +
\ No newline at end of file diff --git a/maps/BetaCeladonMansion.blk b/maps/BetaCeladonMansion.blk new file mode 100644 index 000000000..8d3e219df --- /dev/null +++ b/maps/BetaCeladonMansion.blk @@ -0,0 +1 @@ +? + , /
\ No newline at end of file diff --git a/maps/BetaCherrygroveCity.blk b/maps/BetaCherrygroveCity.blk new file mode 100644 index 000000000..440952f6f --- /dev/null +++ b/maps/BetaCherrygroveCity.blk @@ -0,0 +1,9 @@ + +aaaaaaaa + +a6 +a6YEa6Y,-6YG./a52vUa551 + +aaaaa5555 + +aaaa
\ No newline at end of file diff --git a/maps/BetaCianwoodCity.blk b/maps/BetaCianwoodCity.blk new file mode 100644 index 000000000..d946e1de7 --- /dev/null +++ b/maps/BetaCianwoodCity.blk @@ -0,0 +1 @@ +aaaaXaaTyaaX5ETy5Tv455aTvvy faXY aaXYEaaeaaa
\ No newline at end of file diff --git a/maps/BetaCinnabarIslandPokemonLabHallway.blk b/maps/BetaCinnabarIslandPokemonLabHallway.blk new file mode 100644 index 000000000..7a6502a26 --- /dev/null +++ b/maps/BetaCinnabarIslandPokemonLabHallway.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/BetaCinnabarIslandPokemonLabRoom1.blk b/maps/BetaCinnabarIslandPokemonLabRoom1.blk new file mode 100644 index 000000000..ef77b6561 --- /dev/null +++ b/maps/BetaCinnabarIslandPokemonLabRoom1.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/BetaCinnabarIslandPokemonLabRoom2.blk b/maps/BetaCinnabarIslandPokemonLabRoom2.blk new file mode 100644 index 000000000..822db175b --- /dev/null +++ b/maps/BetaCinnabarIslandPokemonLabRoom2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/BetaCinnabarIslandPokemonLabRoom3.blk b/maps/BetaCinnabarIslandPokemonLabRoom3.blk new file mode 100644 index 000000000..d9a64a5da --- /dev/null +++ b/maps/BetaCinnabarIslandPokemonLabRoom3.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/BetaElevator.blk b/maps/BetaElevator.blk new file mode 100644 index 000000000..32fb22697 --- /dev/null +++ b/maps/BetaElevator.blk @@ -0,0 +1 @@ +&$$$%$$$$$$$$$$$$$$$$$$
\ No newline at end of file diff --git a/maps/BetaEmptyHouse.blk b/maps/BetaEmptyHouse.blk new file mode 100644 index 000000000..dcec62794 --- /dev/null +++ b/maps/BetaEmptyHouse.blk @@ -0,0 +1,15 @@ + + + + + + + + + + + + + % + +
\ No newline at end of file diff --git a/maps/BetaGoldenrodCity.blk b/maps/BetaGoldenrodCity.blk new file mode 100644 index 000000000..1a156122d --- /dev/null +++ b/maps/BetaGoldenrodCity.blk @@ -0,0 +1,10 @@ + + + +F D + +JHU ! Y$# Y"HE zv%& IIIIIIIIJII55)* @-.EAAAAAAAAAA FIHIJEEvvU55Y Y@AEYDFYH FzU5 + +B
@55 + +F~D
\ No newline at end of file diff --git a/maps/BetaHerosHouse.blk b/maps/BetaHerosHouse.blk new file mode 100644 index 000000000..b5b53b4bd --- /dev/null +++ b/maps/BetaHerosHouse.blk @@ -0,0 +1 @@ + ! "
\ No newline at end of file diff --git a/maps/BetaHouse.blk b/maps/BetaHouse.blk new file mode 100644 index 000000000..187a3cd32 --- /dev/null +++ b/maps/BetaHouse.blk @@ -0,0 +1 @@ +*+,*-.12/0/
\ No newline at end of file diff --git a/maps/BetaHouse2.blk b/maps/BetaHouse2.blk new file mode 100644 index 000000000..993ea3a8d --- /dev/null +++ b/maps/BetaHouse2.blk @@ -0,0 +1 @@ + ?',9..',9
\ No newline at end of file diff --git a/maps/BetaIlexForest.blk b/maps/BetaIlexForest.blk new file mode 100644 index 000000000..3cde14007 --- /dev/null +++ b/maps/BetaIlexForest.blk @@ -0,0 +1 @@ +hqqqqqihqqqqqilrrsm
\ No newline at end of file diff --git a/maps/BetaLakeOfRage.blk b/maps/BetaLakeOfRage.blk new file mode 100644 index 000000000..d1d63a0d4 --- /dev/null +++ b/maps/BetaLakeOfRage.blk @@ -0,0 +1 @@ +\^af \a\^afG ^f\\f>^fTU^abfd?fdTvyY>dG\fd\X55Ya^d?f ^Tvy55Y<d`f\\Ty555Y`f]\?\aX555Y\\^?Tvvy555Y^<fTvy555555Y^bd\bf^X5555555Ydf\ffTy5555555Y\b\af\fX55555Ya^d<d\daX555Yfd\\G`f^^\<G^\<bad>>e\adfa
\ No newline at end of file diff --git a/maps/BetaMahoganyTown.blk b/maps/BetaMahoganyTown.blk new file mode 100644 index 000000000..6b4c62e10 --- /dev/null +++ b/maps/BetaMahoganyTown.blk @@ -0,0 +1 @@ + `N=`RZW,-G./WEZW WG ?
\ No newline at end of file diff --git a/maps/BetaNewBarkTown.blk b/maps/BetaNewBarkTown.blk new file mode 100644 index 000000000..395c91f1b --- /dev/null +++ b/maps/BetaNewBarkTown.blk @@ -0,0 +1 @@ +^]?II~IDG aaHTvEX5@~~{XD GGXHIIIIIIIaXvvvvvvvvv1
\ No newline at end of file diff --git a/maps/BetaOlivineCity.blk b/maps/BetaOlivineCity.blk new file mode 100644 index 000000000..749f05a5c --- /dev/null +++ b/maps/BetaOlivineCity.blk @@ -0,0 +1,4 @@ +FDIJHIIIF DFZFDFDFFZFFZFFDFFZFAABFZFFDF|}FTvvvvvvvvvUDF|}FXYX55YDF|}FXY X55YHIIIJ|}FXY X556vvv + + JXYX5545552 +Xzvvvvy55255552vvvy555
555550555552995555~5555:5555
\ No newline at end of file diff --git a/maps/BetaPewterMuseumOfScience1F.blk b/maps/BetaPewterMuseumOfScience1F.blk new file mode 100644 index 000000000..1eec02a37 --- /dev/null +++ b/maps/BetaPewterMuseumOfScience1F.blk @@ -0,0 +1,2 @@ + +
! &! &
\ No newline at end of file diff --git a/maps/BetaPewterMuseumOfScience2F.blk b/maps/BetaPewterMuseumOfScience2F.blk new file mode 100644 index 000000000..ac5622246 --- /dev/null +++ b/maps/BetaPewterMuseumOfScience2F.blk @@ -0,0 +1 @@ +012!
\ No newline at end of file diff --git a/maps/BetaPokecenterMainHouse.blk b/maps/BetaPokecenterMainHouse.blk new file mode 100644 index 000000000..261350738 --- /dev/null +++ b/maps/BetaPokecenterMainHouse.blk @@ -0,0 +1 @@ +
'
\ No newline at end of file diff --git a/maps/BetaPokecenterTradeStation.blk b/maps/BetaPokecenterTradeStation.blk new file mode 100644 index 000000000..555abfa07 --- /dev/null +++ b/maps/BetaPokecenterTradeStation.blk @@ -0,0 +1 @@ +'
\ No newline at end of file diff --git a/maps/BetaRocketHideout1.blk b/maps/BetaRocketHideout1.blk new file mode 100644 index 000000000..988208073 --- /dev/null +++ b/maps/BetaRocketHideout1.blk @@ -0,0 +1,5 @@ + + :?
<?
) + +
?
)
==
>>
"!
89
*>
*
89
:?:?
)
;?;?
)
?
<?<?
)
?
)
?
+
)
*
,-.,//////////-
\ No newline at end of file diff --git a/maps/BetaRocketHideout2.blk b/maps/BetaRocketHideout2.blk new file mode 100644 index 000000000..b17106cca --- /dev/null +++ b/maps/BetaRocketHideout2.blk @@ -0,0 +1,4 @@ + +
+
+
>:)
><)
>>
)89
>>
8:
::?
?<
<<?
*
?
)
*
),/////////////-
\ No newline at end of file diff --git a/maps/BetaRocketHideout3.blk b/maps/BetaRocketHideout3.blk new file mode 100644 index 000000000..b73d3afeb --- /dev/null +++ b/maps/BetaRocketHideout3.blk @@ -0,0 +1,5 @@ + +=1,////?
+=== :?5////4 ???
<?10 5//
)==
>>:) 5//////>89<) +,/////- >>>> 1 8899///= + 5///->:? 1 = + ><?
>?
?
,/////-,////-
\ No newline at end of file diff --git a/maps/BetaRoute23EarlyVersion.blk b/maps/BetaRoute23EarlyVersion.blk new file mode 100644 index 000000000..a62533dd4 --- /dev/null +++ b/maps/BetaRoute23EarlyVersion.blk @@ -0,0 +1,7 @@ + + ! + +ohi +omhi!nm7:~nm'nm'nm'nm'nm'nm'nm'nm +^ +noo
!hihi
\ No newline at end of file diff --git a/maps/BetaSproutTower1.blk b/maps/BetaSproutTower1.blk new file mode 100644 index 000000000..6c0b2ea41 --- /dev/null +++ b/maps/BetaSproutTower1.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/BetaSproutTower2.blk b/maps/BetaSproutTower2.blk new file mode 100644 index 000000000..a13cec16b --- /dev/null +++ b/maps/BetaSproutTower2.blk @@ -0,0 +1,9 @@ + +
+
+ +
+ + + +
\ No newline at end of file diff --git a/maps/BetaSproutTower3.blk b/maps/BetaSproutTower3.blk new file mode 100644 index 000000000..846bb9016 --- /dev/null +++ b/maps/BetaSproutTower3.blk @@ -0,0 +1,7 @@ + + +
+ + + +
\ No newline at end of file diff --git a/maps/BetaSproutTower5.blk b/maps/BetaSproutTower5.blk new file mode 100644 index 000000000..baaeaa926 --- /dev/null +++ b/maps/BetaSproutTower5.blk @@ -0,0 +1,9 @@ + + +
+ + +
+ + +
\ No newline at end of file diff --git a/maps/BetaSproutTower6.blk b/maps/BetaSproutTower6.blk new file mode 100644 index 000000000..ea9395657 --- /dev/null +++ b/maps/BetaSproutTower6.blk @@ -0,0 +1,4 @@ + +
+
+
\ No newline at end of file diff --git a/maps/BetaSproutTower7.blk b/maps/BetaSproutTower7.blk new file mode 100644 index 000000000..bfa5da286 --- /dev/null +++ b/maps/BetaSproutTower7.blk @@ -0,0 +1,8 @@ + + + + +
+
+ +
\ No newline at end of file diff --git a/maps/BetaSproutTower8.blk b/maps/BetaSproutTower8.blk new file mode 100644 index 000000000..254c0c565 --- /dev/null +++ b/maps/BetaSproutTower8.blk @@ -0,0 +1,5 @@ + +
+ + +
\ No newline at end of file diff --git a/maps/BetaSproutTower9.blk b/maps/BetaSproutTower9.blk new file mode 100644 index 000000000..f5737b226 --- /dev/null +++ b/maps/BetaSproutTower9.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/BetaSproutTowerCutOut1.blk b/maps/BetaSproutTowerCutOut1.blk new file mode 100644 index 000000000..21808bb71 --- /dev/null +++ b/maps/BetaSproutTowerCutOut1.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/BetaSproutTowerCutOut2.blk b/maps/BetaSproutTowerCutOut2.blk new file mode 100644 index 000000000..21808bb71 --- /dev/null +++ b/maps/BetaSproutTowerCutOut2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/BetaSproutTowerCutOut3.blk b/maps/BetaSproutTowerCutOut3.blk new file mode 100644 index 000000000..21808bb71 --- /dev/null +++ b/maps/BetaSproutTowerCutOut3.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/BetaSsAquaInsideCutOut.blk b/maps/BetaSsAquaInsideCutOut.blk new file mode 100644 index 000000000..b385b0198 --- /dev/null +++ b/maps/BetaSsAquaInsideCutOut.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/BetaTeakCity.blk b/maps/BetaTeakCity.blk new file mode 100644 index 000000000..ce448c2ef --- /dev/null +++ b/maps/BetaTeakCity.blk @@ -0,0 +1 @@ + ?eeeeeeeeeeeb ! bb$%b>$%`&;',-&'`$%`*"+#/*+aE$%dg,-b()#/tuWZWVWVWVWZ@AABGTU !FXY$%&'XYa$%*+VVZVVVVVVZaa()EatuIIJ~{@AAAAA HII
\ No newline at end of file diff --git a/maps/BetaUnknown.blk b/maps/BetaUnknown.blk new file mode 100644 index 000000000..c3063adc7 --- /dev/null +++ b/maps/BetaUnknown.blk @@ -0,0 +1 @@ +(
\ No newline at end of file diff --git a/maps/BetaVioletCity.blk b/maps/BetaVioletCity.blk new file mode 100644 index 000000000..963dbb2ed --- /dev/null +++ b/maps/BetaVioletCity.blk @@ -0,0 +1,7 @@ +??&;'TU&;'b?*"+XY*"+?=G^bXYTU]]]]]]]]]]]]]XYXYXYb`b !`GbD$%F` +&;' +bD()F`G*"+ +eeebDtuF` + +AEA +bpk`bsm`=]E` G`G ?e`b`?eeeeeeeeeef`b
\ No newline at end of file diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index cdf7b11e7..fb191e358 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -11,11 +11,59 @@ BlackthornGym2F_MapScriptHeader: ; 0x195722 ; 0x195727 UnknownScript_0x195727: ; 0x195727 - writecmdqueue $572b + writecmdqueue CmdQueue_0x19572b return ; 0x19572b -INCBIN "baserom.gbc",$19572b,$33 +CmdQueue_0x19572b: ; 0x19572b + dbw 2, StoneTable_0x195730 ; check if any stones are sitting on a warp + db 0, 0 ; filler +; 0x195730 + +StoneTable_0x195730: ; 0x195730 + db 5, 4 ; warp, person + dw UnknownScript_0x19573d + + db 3, 5 ; warp, person + dw UnknownScript_0x195742 + + db 4, 6 ; warp, person + dw UnknownScript_0x195747 + + db $ff ; end +; 0x19573d + +UnknownScript_0x19573d: ; 0x19573d + disappear 4 + 2jump UnknownScript_0x19574c +; 0x195742 + +UnknownScript_0x195742: ; 0x195742 + disappear 5 + 2jump UnknownScript_0x19574c +; 0x195747 + +UnknownScript_0x195747: ; 0x195747 + disappear 6 + 2jump UnknownScript_0x19574c +; 0x19574c + +UnknownScript_0x19574c: ; 0x19574c + pause 30 + 2call UnknownScript_0x195758 + loadfont + 2writetext UnknownText_0x1958a5 + closetext + loadmovesprites + end +; 0x195758 + +UnknownScript_0x195758: ; 0x195758 + playsound $001b + earthquake 80 + end +; 0x19575e + UnknownScript_0x19575e: ; 0x19575e jumpstd $000e diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index bf4efc687..d5218388b 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -28,7 +28,7 @@ MapCeladonDeptStore6FSignpost5Script: ; 0x71180 2writetext UnknownText_0x71250 UnknownScript_0x71184: ; 0x71184 special $0051 - loadmenudata $5203 + loadmenudata MenuDataHeader_0x71203 interpretmenu2 writebackup if_equal $1, UnknownScript_0x7119a @@ -89,8 +89,24 @@ UnknownScript_0x711fc: ; 0x711fc 2jump UnknownScript_0x71184 ; 0x71203 -; menu data -INCBIN "baserom.gbc",$71203,$47 + +MenuDataHeader_0x71203: ; 0x71203 + db $40 ; flags + db 02, 00 ; start coords + db 11, 19 ; end coords + dw MenuData2_0x7120b + db 1 ; default option +; 0x7120b + +MenuData2_0x7120b: ; 0x7120b + db $80 ; flags + db 4 ; items + db "FRESH WATER ¥200@" + db "SODA POP ¥300@" + db "LEMONADE ¥350@" + db "CANCEL@" +; 0x71249 + MapCeladonDeptStore6FSignpost0Script: ; 0x7124a jumptext UnknownText_0x7133e diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 4b390f0ab..aa2ed2cf8 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -8,7 +8,7 @@ CeladonDeptStoreElevator_MapScriptHeader: ; 0x713ab MapCeladonDeptStoreElevatorSignpost0Script: ; 0x713ad loadfont - elevator $53be + elevator Elevator_0x713be loadmovesprites iffalse UnknownScript_0x713bd pause 5 @@ -19,19 +19,18 @@ UnknownScript_0x713bd: ; 0x713bd end ; 0x713be -; elevator -UnknownText_0x713be: ; 0x713be - text_waitbutton - text_box $1504, 5, 5 - store_at $615 - text_waitbutton - store_at $715 - text_dunno2 - store_at $815 - start_asm -; 0x713d0 - -INCBIN "baserom.gbc",$713d0,$713d8 - $713d0 + +Elevator_0x713be: ; 0x713be + db 6 ; floors + db _1F, 4, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F + db _2F, 3, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F + db _3F, 3, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F + db _4F, 3, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F + db _5F, 3, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F + db _6F, 2, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F + db $ff ; end +; 0x713d8 + CeladonDeptStoreElevator_MapEventHeader: ; 0x713d8 ; filler diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 0098cd3d8..eb4fa063d 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -24,7 +24,7 @@ MapCeladonGameCornerPrizeRoomSignpost0Script: ; 0x726ef 2writetext UnknownText_0x72974 UnknownScript_0x726fd: ; 0x726fd special $004f - loadmenudata $6790 + loadmenudata MenuDataHeader_0x72790 interpretmenu2 writebackup if_equal $1, UnknownScript_0x72714 @@ -111,8 +111,24 @@ UnknownScript_0x7278a: ; 0x7278a end ; 0x72790 -; menu data -INCBIN "baserom.gbc",$72790,$38 + +MenuDataHeader_0x72790: ; 0x72790 + db $40 ; flags + db 02, 00 ; start coords + db 11, 15 ; end coords + dw MenuData2_0x72798 + db 1 ; default option +; 0x72798 + +MenuData2_0x72798: ; 0x72798 + db $80 ; flags + db 4 ; items + db "TM32 1500@" + db "TM29 3500@" + db "TM15 7500@" + db "CANCEL@" +; 0x727c8 + MapCeladonGameCornerPrizeRoomSignpost1Script: ; 0x727c8 faceplayer @@ -124,7 +140,7 @@ MapCeladonGameCornerPrizeRoomSignpost1Script: ; 0x727c8 UnknownScript_0x727d3: ; 0x727d3 2writetext UnknownText_0x72974 special $004f - loadmenudata $6877 + loadmenudata MenuDataHeader_0x72877 interpretmenu2 writebackup if_equal $1, UnknownScript_0x727ed @@ -190,8 +206,24 @@ UnknownScript_0x72849: ; 0x72849 2jump UnknownScript_0x727d3 ; 0x72877 -; menu data -INCBIN "baserom.gbc",$72877,$41 + +MenuDataHeader_0x72877: ; 0x72877 + db $40 ; flags + db 02, 00 ; start coords + db 11, 17 ; end coords + dw MenuData2_0x7287f + db 1 ; default option +; 0x7287f + +MenuData2_0x7287f: ; 0x7287f + db $80 ; flags + db 4 ; items + db "PIKACHU 2222@" + db "PORYGON 5555@" + db "LARVITAR 8888@" + db "CANCEL@" +; 0x728b8 + UnknownText_0x728b8: ; 0x728b8 db $0, "I wanted PORYGON,", $4f diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index cdebae792..24b701ef1 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -29,7 +29,7 @@ UnknownScript_0x18d030: ; 0x18d030 setbit1 $0001 2writetext UnknownText_0x18d3bc keeptextopen - loadmenudata $5215 + loadmenudata MenuDataHeader_0x18d215 interpretmenu2 writebackup if_equal $1, UnknownScript_0x18d0a9 @@ -42,7 +42,7 @@ UnknownScript_0x18d049: ; 0x18d049 setbit1 $0002 2writetext UnknownText_0x18d3d3 keeptextopen - loadmenudata $5234 + loadmenudata MenuDataHeader_0x18d234 interpretmenu2 writebackup if_equal $1, UnknownScript_0x18d0a9 @@ -52,7 +52,7 @@ UnknownScript_0x18d061: ; 0x18d061 setbit1 $0003 2writetext UnknownText_0x18d3f3 keeptextopen - loadmenudata $5258 + loadmenudata MenuDataHeader_0x18d258 interpretmenu2 writebackup if_equal $1, UnknownScript_0x18d0cb @@ -62,7 +62,7 @@ UnknownScript_0x18d079: ; 0x18d079 setbit1 $0004 2writetext UnknownText_0x18d420 keeptextopen - loadmenudata $5283 + loadmenudata MenuDataHeader_0x18d283 interpretmenu2 writebackup if_equal $1, UnknownScript_0x18d0a9 @@ -72,7 +72,7 @@ UnknownScript_0x18d091: ; 0x18d091 setbit1 $0005 2writetext UnknownText_0x18d44a keeptextopen - loadmenudata $52a5 + loadmenudata MenuDataHeader_0x18d2a5 interpretmenu2 writebackup if_equal $1, UnknownScript_0x18d0cb @@ -274,7 +274,91 @@ UnknownScript_0x18d20d: ; 0x18d20d end ; 0x18d215 -INCBIN "baserom.gbc",$18d215,$aa + +MenuDataHeader_0x18d215: ; 0x18d215 + db $40 ; flags + db 04, 08 ; start coords + db 11, 19 ; end coords + dw MenuData2_0x18d21d + db 1 ; default option +; 0x18d21d + +MenuData2_0x18d21d: ; 0x18d21d + db $81 ; flags + db 3 ; items + db "Pal@" + db "Underling@" + db "Friend@" +; 0x18d234 + + +MenuDataHeader_0x18d234: ; 0x18d234 + db $40 ; flags + db 04, 09 ; start coords + db 11, 19 ; end coords + dw MenuData2_0x18d23c + db 1 ; default option +; 0x18d23c + +MenuData2_0x18d23c: ; 0x18d23c + db $81 ; flags + db 3 ; items + db "Strategy@" + db "Raising@" + db "Cheating@" +; 0x18d258 + + +MenuDataHeader_0x18d258: ; 0x18d258 + db $40 ; flags + db 04, 05 ; start coords + db 11, 19 ; end coords + dw MenuData2_0x18d260 + db 1 ; default option +; 0x18d260 + +MenuData2_0x18d260: ; 0x18d260 + db $81 ; flags + db 3 ; items + db "Weak person@" + db "Tough person@" + db "Anybody@" +; 0x18d283 + + +MenuDataHeader_0x18d283: ; 0x18d283 + db $40 ; flags + db 04, 08 ; start coords + db 11, 19 ; end coords + dw MenuData2_0x18d28b + db 1 ; default option +; 0x18d28b + +MenuData2_0x18d28b: ; 0x18d28b + db $81 ; flags + db 3 ; items + db "Love@" + db "Violence@" + db "Knowledge@" +; 0x18d2a5 + + +MenuDataHeader_0x18d2a5: ; 0x18d2a5 + db $40 ; flags + db 04, 12 ; start coords + db 11, 19 ; end coords + dw MenuData2_0x18d2ad + db 1 ; default option +; 0x18d2ad + +MenuData2_0x18d2ad: ; 0x18d2ad + db $81 ; flags + db 3 ; items + db "Tough@" + db "Both@" + db "Weak@" +; 0x18d2bf + MovementData_0x18d2bf: ; 0x18d2bf slow_step_up diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 317253e02..d57796fbd 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -143,9 +143,7 @@ CooltrainerfCaraScript: ; 0x18c92a end ; 0x18c932 -INCBIN "baserom.gbc",$18c932,$14 - -TrainerTwinsLeaandpia1: ; 0x18c946 +TrainerTwinsLeaandpia1: ; 0x18c932 ; bit/flag number dw $5bf @@ -156,17 +154,45 @@ TrainerTwinsLeaandpia1: ; 0x18c946 dw TwinsLeaandpia1SeenText ; text when trainer beaten - ;dw TwinsLeaandpia1BeatenText - dw $4f06 + dw TwinsLeaandpia1BeatenText ; script when lost dw $0000 ; script when talk again dw TwinsLeaandpia1Script +; 0x18c93e + +TwinsLeaandpia1Script: ; 0x18c93e + talkaftercancel + loadfont + 2writetext UnknownText_0x18ced3 + closetext + loadmovesprites + end +; 0x18c946 + +TrainerTwinsLeaandpia2: ; 0x18c946 + ; bit/flag number + dw $5bf + + ; trainer group && trainer id + db TWINS, LEAANDPIA1 + + ; text when seen + dw TwinsLeaandpia2SeenText + + ; text when trainer beaten + dw TwinsLeaandpia2BeatenText + + ; script when lost + dw $0000 + + ; script when talk again + dw TwinsLeaandpia2Script ; 0x18c952 -TwinsLeaandpia1Script: ; 0x18c952 +TwinsLeaandpia2Script: ; 0x18c952 talkaftercancel loadfont 2writetext UnknownText_0x18cf0f @@ -395,7 +421,7 @@ UnknownText_0x18ce11: ; 0x18ce11 db "approval.", $57 ; 0x18ceab -UnknownText_0x18ceab: ; 0x18ceab +TwinsLeaandpia1SeenText: ; 0x18ceab db $0, "It's a stranger we", $4f db "don't know.", $57 ; 0x18cec9 @@ -409,11 +435,11 @@ UnknownText_0x18ced3: ; 0x18ced3 db "to battle LANCE.", $57 ; 0x18cef8 -TwinsLeaandpia1SeenText: ; 0x18cef8 +TwinsLeaandpia2SeenText: ; 0x18cef8 db $0, "Who are you?", $57 ; 0x18cf06 -UnknownText_0x18cf06: ; 0x18cf06 +TwinsLeaandpia2BeatenText: ; 0x18cf06 db $0, "Meanie.", $57 ; 0x18cf0f @@ -464,7 +490,7 @@ DragonsDenB1F_MapEventHeader: ; 0x18cf73 person_event $23, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, $ffff person_event $24, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, $ffff person_event $26, 21, 8, $9, $0, 255, 255, $82, 1, $4932, $ffff - person_event $26, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, $ffff + person_event $26, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, $ffff person_event $54, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, $07bf person_event $54, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, $07c0 ; 0x18d014 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index e0aa6f725..141de61b2 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -65,7 +65,7 @@ MapEarlsPokemonAcademySignpost3Script: ; 0x68a9f loadfont 2writetext UnknownText_0x68eb2 UnknownScript_0x68aa3: ; 0x68aa3 - loadmenudata $4ae1 + loadmenudata MenuDataHeader_0x68ae1 interpretmenu writebackup if_equal $1, UnknownScript_0x68abe @@ -107,8 +107,32 @@ UnknownScript_0x68ada: ; 0x68ada 2jump UnknownScript_0x68aa3 ; 0x68ae1 -; menu data -INCBIN "baserom.gbc",$68ae1,$2a + +MenuDataHeader_0x68ae1: ; 0x68ae1 + db $40 ; flags + db 00, 00 ; start coords + db 08, 11 ; end coords + dw MenuData2_0x68ae9 + db 1 ; default option +; 0x68ae9 + +MenuData2_0x68ae9: ; 0x68ae9 + db $80 ; flags + dn 3, 2 ; rows, columns + db 5 ; spacing + dbw BANK(UnknownText_0x68af2), UnknownText_0x68af2 + dbw $1a, $0000 +; 0x68af2 + +UnknownText_0x68af2: ; 0x68af2 + db "PSN@" + db "PAR@" + db "SLP@" + db "BRN@" + db "FRZ@" + db "QUIT@" +; 0x68b0b + UnknownScript_0x68b0b: ; 0x68b0b loadfont diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 7470b6602..4251f96b7 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -56,7 +56,7 @@ UnknownScript_0x198909: ; 0x198909 checkcoins 4000 if_equal $2, UnknownScript_0x1989dd 2writetext UnknownText_0x1990ce - loadmenudata $4967 + loadmenudata MenuDataHeader_0x198967 interpretmenu2 writebackup if_equal $1, UnknownScript_0x19893a @@ -89,7 +89,24 @@ UnknownScript_0x198958: ; 0x198958 2jump UnknownScript_0x1989d7 ; 0x198967 -INCBIN "baserom.gbc",$198967,$33 + +MenuDataHeader_0x198967: ; 0x198967 + db $40 ; flags + db 02, 00 ; start coords + db 11, 15 ; end coords + dw MenuData2_0x19896f + db 1 ; default option +; 0x19896f + +MenuData2_0x19896f: ; 0x19896f + db $80 ; flags + db 4 ; items + db "FLAMETHROWER@" + db "THUNDERBOLT@" + db "ICE BEAM@" + db "CANCEL@" +; 0x19899a + UnknownScript_0x19899a: ; 0x19899a 2writetext UnknownText_0x1990b4 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 2e97c5555..78098e8ac 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -11,7 +11,7 @@ MapGoldenrodDeptStore6FSignpost5Script: ; 0x563f5 2writetext UnknownText_0x564cb UnknownScript_0x563f9: ; 0x563f9 special $0051 - loadmenudata $6478 + loadmenudata MenuDataHeader_0x56478 interpretmenu2 writebackup if_equal $1, UnknownScript_0x5640f @@ -72,8 +72,24 @@ UnknownScript_0x56471: ; 0x56471 2jump UnknownScript_0x563f9 ; 0x56478 -; menu data -INCBIN "baserom.gbc",$56478,$564bf - $56478 + +MenuDataHeader_0x56478: ; 0x56478 + db $40 ; flags + db 02, 00 ; start coords + db 11, 19 ; end coords + dw MenuData2_0x56480 + db 1 ; default option +; 0x56480 + +MenuData2_0x56480: ; 0x56480 + db $80 ; flags + db 4 ; items + db "FRESH WATER ¥200@" + db "SODA POP ¥300@" + db "LEMONADE ¥350@" + db "CANCEL@" +; 0x564bf + UnknownScript_0x564bf: ; 0x564bf jumptextfaceplayer UnknownText_0x5654b diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index e6ea29231..651fcf7f6 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -8,7 +8,7 @@ GoldenrodDeptStoreElevator_MapScriptHeader: ; 0x56697 MapGoldenrodDeptStoreElevatorSignpost0Script: ; 0x56699 loadfont - elevator $66e0 + elevator Elevator_0x566e0 loadmovesprites iffalse UnknownScript_0x566df pause 5 @@ -48,7 +48,19 @@ UnknownScript_0x566df: ; 0x566df end ; 0x566e0 -INCBIN "baserom.gbc",$566e0,$566fe - $566e0 + +Elevator_0x566e0: ; 0x566e0 + db 7 ; floors + db _B1F, 2, GROUP_GOLDENROD_DEPT_STORE_B1F, MAP_GOLDENROD_DEPT_STORE_B1F + db _1F, 4, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F + db _2F, 3, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F + db _3F, 3, GROUP_GOLDENROD_DEPT_STORE_3F, MAP_GOLDENROD_DEPT_STORE_3F + db _4F, 3, GROUP_GOLDENROD_DEPT_STORE_4F, MAP_GOLDENROD_DEPT_STORE_4F + db _5F, 3, GROUP_GOLDENROD_DEPT_STORE_5F, MAP_GOLDENROD_DEPT_STORE_5F + db _6F, 2, GROUP_GOLDENROD_DEPT_STORE_6F, MAP_GOLDENROD_DEPT_STORE_6F + db $ff ; end +; 0x566fe + GoldenrodDeptStoreElevator_MapEventHeader: ; 0x566fe ; filler diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index bb7378897..2f8df16f3 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -55,7 +55,7 @@ UnknownScript_0x56c28: ; 0x56c28 2writetext UnknownText_0x56e8b UnknownScript_0x56c36: ; 056c36 special $004f - loadmenudata $6cc9 + loadmenudata MenuDataHeader_0x56cc9 interpretmenu2 writebackup if_equal $1, UnknownScript_0x56c4d @@ -142,8 +142,24 @@ UnknownScript_0x56cc3: ; 0x56cc3 end ; 0x56cc9 -; menu data -INCBIN "baserom.gbc",$56cc9,$38 + +MenuDataHeader_0x56cc9: ; 0x56cc9 + db $40 ; flags + db 02, 00 ; start coords + db 11, 15 ; end coords + dw MenuData2_0x56cd1 + db 1 ; default option +; 0x56cd1 + +MenuData2_0x56cd1: ; 0x56cd1 + db $80 ; flags + db 4 ; items + db "TM25 5500@" + db "TM14 5500@" + db "TM38 5500@" + db "CANCEL@" +; 0x56d01 + UnknownScript_0x56d01: ; 0x56d01 faceplayer @@ -155,7 +171,7 @@ UnknownScript_0x56d01: ; 0x56d01 UnknownScript_0x56d0c: ; 0x56d0c 2writetext UnknownText_0x56e8b special $004f - loadmenudata $6db0 + loadmenudata MenuDataHeader_0x56db0 interpretmenu2 writebackup if_equal $1, UnknownScript_0x56d26 @@ -221,8 +237,24 @@ UnknownScript_0x56d82: ; 0x56d82 2jump UnknownScript_0x56d0c ; 0x56db0 -; menu data -INCBIN "baserom.gbc",$56db0,$56df1 - $56db0 + +MenuDataHeader_0x56db0: ; 0x56db0 + db $40 ; flags + db 02, 00 ; start coords + db 11, 17 ; end coords + dw MenuData2_0x56db8 + db 1 ; default option +; 0x56db8 + +MenuData2_0x56db8: ; 0x56db8 + db $80 ; flags + db 4 ; items + db "ABRA 100@" + db "CUBONE 800@" + db "WOBBUFFET 1500@" + db "CANCEL@" +; 0x56df1 + UnknownScript_0x56df1: ; 0x56df1 faceplayer diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 41e412788..0e94da1e9 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -24,7 +24,7 @@ MapGoldenrodPokeComCenter2FMobileSignpost0Script: ; 0x625da closetext UnknownScript_0x625df: ; 0x625df reloadmappart - loadmenudata $6602 + loadmenudata MenuDataHeader_0x62602 interpretmenu2 writebackup if_equal $1, UnknownScript_0x625f0 @@ -51,7 +51,23 @@ UnknownScript_0x62600: ; 0x62600 end ; 0x62602 -INCBIN "baserom.gbc",$62602,$62624 - $62602 + +MenuDataHeader_0x62602: ; 0x62602 + db $40 ; flags + db 00, 00 ; start coords + db 08, 15 ; end coords + dw MenuData2_0x6260a + db 1 ; default option +; 0x6260a + +MenuData2_0x6260a: ; 0x6260a + db $80 ; flags + db 3 ; items + db "# つうしん クラブ@" ; # COM CLUB + db "モバイルセンター@" ; MOBILE CENTER + db "やめる@" ; QUIT +; 0x62624 + MapGoldenrodPokeComCenter2FMobileSignpost1Script: ; 0x62624 loadfont @@ -86,8 +102,23 @@ UnknownScript_0x6264a: ; 0x6264a end ; 0x6264c -; menu data -INCBIN "baserom.gbc",$6264c,$25 + +MenuDataHeader_0x6264c: ; 0x6264c + db $40 ; flags + db 00, 00 ; start coords + db 08, 15 ; end coords + dw MenuData2_0x62654 + db 1 ; default option +; 0x62654 + +MenuData2_0x62654: ; 0x62654 + db $80 ; flags + db 3 ; items + db "でんわ",$1f,"つかうとき@" ; Use phone + db "でんわ",$4a,"つながらないとき@" ; Don't use phone + db "やめる@" ; QUIT +; 0x62673 + MapGoldenrodPokeComCenter2FMobileSignpost2Script: ; 0x62671 jumptext UnknownText_0x62b26 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 26d531e0e..591963f1a 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -123,10 +123,6 @@ HallOfFame_MapEventHeader: ; 0x181678 ; 0x181695 -; Pokedex entries I -; 001-064 - -INCLUDE "stats/pokedex/entries_1.asm" diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 98fa1f27c..302fa9234 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -11,11 +11,71 @@ IcePathB1F_MapScriptHeader: ; 0x7e4b9 ; 0x7e4be UnknownScript_0x7e4be: ; 0x7e4be - writecmdqueue $64c2 + writecmdqueue CmdQueue_0x7e4c2 return ; 0x7e4c2 -INCBIN "baserom.gbc",$7e4c2,$7e50a - $7e4c2 +CmdQueue_0x7e4c2: ; 0x7e4c2 + dbw 2, StoneTable_0x7e4c7 ; check if any stones are sitting on a warp + db 0, 0 ; filler +; 0x7e4c7 + +StoneTable_0x7e4c7: ; 0x7e4c7 + db 3, 2 ; warp, person + dw UnknownScript_0x7e4d8 + + db 4, 3 ; warp, person + dw UnknownScript_0x7e4e0 + + db 5, 4 ; warp, person + dw UnknownScript_0x7e4e8 + + db 6, 5 ; warp, person + dw UnknownScript_0x7e4f0 + + db $ff ; end +; 0x7e4d8 + +UnknownScript_0x7e4d8: ; 0x7e4d8 + disappear 2 + clearbit1 $070d + 2jump UnknownScript_0x7e4f8 +; 0x7e4e0 + +UnknownScript_0x7e4e0: ; 0x7e4e0 + disappear 3 + clearbit1 $070e + 2jump UnknownScript_0x7e4f8 +; 0x7e4e8 + +UnknownScript_0x7e4e8: ; 0x7e4e8 + disappear 4 + clearbit1 $070f + 2jump UnknownScript_0x7e4f8 +; 0x7e4f0 + +UnknownScript_0x7e4f0: ; 0x7e4f0 + disappear 5 + clearbit1 $0710 + 2jump UnknownScript_0x7e4f8 +; 0x7e4f8 + +UnknownScript_0x7e4f8: ; 0x7e4f8 + pause 30 + 2call UnknownScript_0x7e504 + loadfont + 2writetext UnknownText_0x7e512 + closetext + loadmovesprites + end +; 0x7e504 + +UnknownScript_0x7e504: ; 0x7e504 + playsound $001b + earthquake 80 + end +; 0x7e50a + UnknownScript_0x7e50a: ; 0x7e50a jumpstd $000e @@ -30,7 +90,12 @@ MapIcePathB1FSignpostItem0: ; 0x7e50f db MAX_POTION ; 0x7e512 -INCBIN "baserom.gbc",$7e512,$1b + +UnknownText_0x7e512: ; 0x7e512 + db $0, "The boulder fell", $4f + db "through.", $57 +; 0x7e52d + IcePathB1F_MapEventHeader: ; 0x7e52d ; filler diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index f4f8aadfa..e16872dd6 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -34,7 +34,9 @@ UnknownScript_0x7abc5: ; 0x7abc5 return ; 0x7abc9 -INCBIN "baserom.gbc",$7abc9,$7abcc - $7abc9 + + db 0, 0, 0 ; filler + UnknownScript_0x7abcc: ; 0x7abcc describedecoration $1 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index a3847e4fc..ce4d58b8e 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -16,7 +16,7 @@ UnknownScript_0x9d278: ; 0x9d278 2writetext UnknownText_0x9d303 yesorno iffalse UnknownScript_0x9d2b6 - special $004b + special SPECIAL_GIVESHUCKLE iffalse UnknownScript_0x9d2b0 2writetext UnknownText_0x9d3ed keeptextopen diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 0f4408684..daa5f07e7 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -141,22 +141,37 @@ PsychicNathanScript: ; 0x58095 end ; 0x5809d -UnknownScript_0x5809d: ; 0x5809d - musicfadeout $2905, $1 -; 0x580a2 - -; probably not a script? -UnknownScript_0x580a2: ; 0x580a2 - db $e5 - itemtotext THUNDERSTONE, $42 - 2call $a900 - pokenamemem EXEGGCUTE, $47 + +TrainerSuperNerdStan: ; 0x5809d + ; bit/flag number + dw $581 + + ; trainer group && trainer id + db SUPER_NERD, STAN + + ; text when seen + dw UnknownText_0x581e5 + + ; text when trainer beaten + dw UnknownText_0x58217 + + ; script when lost + dw $0000 + + ; script when talk again + dw UnknownScript_0x580a9 +; 0x580a9 + +UnknownScript_0x580a9: ; 0x580a9 + talkaftercancel + loadfont 2writetext UnknownText_0x58250 closetext loadmovesprites end ; 0x580b1 + MapRuinsofAlphOutsideSignpost0Script: ; 0x580b1 jumptext UnknownText_0x58325 ; 0x580b4 |